Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-04-06 00:28:40 +00:00
committed by GitHub
177 changed files with 4337 additions and 2105 deletions
+2
View File
@@ -325,3 +325,5 @@ gnuradioMinimal.override {
### Additions and Improvements {#sec-nixpkgs-release-26.05-lib-additions-improvements}
- The builder `php.buildComposerProject2` for PHP applications has been improved for better reliability and stability.
- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a `webRoot` option and a some new settings for managing variable content and filepaths.
@@ -1,4 +1,4 @@
# Tests in: ../../../../tests/modular-service-etc/test.nix
# Tests in: ../../nixos/tests/modular-service-etc/test.nix
# This file is a function that returns a module.
pkgs:
{
@@ -1,4 +1,4 @@
# Tests in: ../../../../tests/modular-service-etc/test.nix
# Tests in: ../../nixos/tests/modular-service-etc/test.nix
# Non-modular context provided by the modular services integration.
{ pkgs }:
@@ -16,8 +16,8 @@ in
# https://nixos.org/manual/nixos/unstable/#modular-services
_class = "service";
imports = [
../../../../../modules/generic/meta-maintainers.nix
../../../misc/assertions.nix
../../modules/generic/meta-maintainers.nix
../../nixos/modules/misc/assertions.nix
(lib.modules.importApply ./config-data.nix { inherit pkgs; })
];
options = {
@@ -1,7 +1,7 @@
# Run:
# nix-instantiate --eval nixos/modules/system/service/portable/test.nix
# nix-instantiate --eval lib/services/test.nix
let
lib = import ../../../../../lib;
lib = import ../.;
inherit (lib) mkOption types;
+1 -1
View File
@@ -9646,7 +9646,7 @@
name = "Galois";
};
ggg = {
email = "gggkiller2@gmail.com";
email = "github@ggg.dev";
github = "GGG-KILLER";
githubId = 5892127;
name = "GGG";
+6 -1
View File
@@ -52,6 +52,8 @@ lrexlib-pcre,,,,,,
lrexlib-posix,,,,,,
lsp-progress.nvim,,,,,5.1,gepbird
lsqlite3,,,,,,
ltreesitter-ts,,,,,,
ltreesitter,,,,,,
lua-cjson,,,,,,
lua-cmsgpack,,,,,,
lua-curl,,,,,,
@@ -95,6 +97,7 @@ luaprompt,,,,,,Freed-Wu
luarepl,,,,,,
luarocks,,,,,,mrcjkb teto
luarocks-build-rust-mlua,,,,,,mrcjkb
luarocks-build-tree-sitter-cli,,,,,,
luarocks-build-treesitter-parser,,,,,,mrcjkb
luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb
luasec,,,,,,flosse
@@ -156,16 +159,18 @@ sqlite,,,,,,
std._debug,,,,,,
std.normalize,,,,,,
stdlib,,,,41.2.2,,
teal-language-server,,,,0.0.5-1,,
teal-language-server,,,,,,
telescope-manix,,,,,,
telescope.nvim,,,,,5.1,
tiktoken_core,,,,,,natsukium
tl,,,,,,mephistophiles
toml-edit,,,,,5.1,mrcjkb
tree-sitter-cli,,,,,,
tree-sitter-http,,,,0.0.33-1,,
tree-sitter-norg,,,,,5.1,mrcjkb
tree-sitter-orgmode,,,,,5.1,
utf8,,,,,,
tree-sitter-teal,,,,,,
vstruct,,,,,,
vusted,,,,,,
xml2lua,,,,,,teto
1 name rockspec ref server version luaversion maintainers
52 lrexlib-posix
53 lsp-progress.nvim 5.1 gepbird
54 lsqlite3
55 ltreesitter-ts
56 ltreesitter
57 lua-cjson
58 lua-cmsgpack
59 lua-curl
97 luarepl
98 luarocks mrcjkb teto
99 luarocks-build-rust-mlua mrcjkb
100 luarocks-build-tree-sitter-cli
101 luarocks-build-treesitter-parser mrcjkb
102 luarocks-build-treesitter-parser-cpp mrcjkb
103 luasec flosse
159 std._debug
160 std.normalize
161 stdlib 41.2.2
162 teal-language-server 0.0.5-1
163 telescope-manix
164 telescope.nvim 5.1
165 tiktoken_core natsukium
166 tl mephistophiles
167 toml-edit 5.1 mrcjkb
168 tree-sitter-cli
169 tree-sitter-http 0.0.33-1
170 tree-sitter-norg 5.1 mrcjkb
171 tree-sitter-orgmode 5.1
172 utf8
173 tree-sitter-teal
174 vstruct
175 vusted
176 xml2lua teto
-1
View File
@@ -225,7 +225,6 @@ with lib.maintainers;
members = [
mdarocha
corngood
ggg
raphaelr
jamiemagee
anpin
+1 -1
View File
@@ -134,7 +134,7 @@ let
inherit
(evalModules {
modules = [
(modules.importApply ../../modules/system/service/portable/service.nix {
(modules.importApply ../../../lib/services/service.nix {
pkgs = throw "nixos docs / portableServiceOptions: Do not reference pkgs in docs";
})
];
+1 -1
View File
@@ -34,5 +34,5 @@
};
# impl of assertions is in
# - <nixpkgs/nixos/modules/system/activation/top-level.nix>
# - <nixpkgs/nixos/modules/system/service/portable/lib.nix>
# - <nixpkgs/lib/services/lib.nix>
}
+4 -1
View File
@@ -116,7 +116,10 @@ let
&& (t == "directory" -> baseNameOf n != "tests")
&& (t == "file" -> hasSuffix ".nix" n)
);
prefixRegex = "^" + lib.strings.escapeRegex (toString pkgs.path) + "($|/(modules|nixos)($|/.*))";
prefixRegex =
"^"
+ lib.strings.escapeRegex (toString pkgs.path)
+ "($|/(modules|nixos|lib/services)($|/.*)|/lib)";
filteredModules = builtins.path {
name = "source";
inherit (pkgs) path;
@@ -46,6 +46,20 @@ in
package = lib.mkPackageOption pkgs "collectd" { };
finalPackage = lib.mkOption {
readOnly = true;
default = minimalPackage;
defaultText = lib.literalExpression ''
if config.services.collectd.buildMinimalPackage then
cfg.package.override {
enabledPlugins = [ "syslog" ] ++ builtins.attrNames cfg.plugins;
}
else
cfg.package
'';
description = "The final package being used after applying plugins and minimalPackage.";
};
buildMinimalPackage = lib.mkOption {
default = false;
description = ''
@@ -86,7 +86,7 @@ in
`.config/transmission-daemon/settings.json`
(each time the service starts).
See [Transmission's Wiki](https://github.com/transmission/transmission/wiki/Editing-Configuration-Files)
See [Transmission's documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options)
for documentation of settings not explicitly covered by this module.
'';
default = { };
+154 -40
View File
@@ -10,6 +10,7 @@ let
any
attrValues
flatten
getExe
literalExpression
mapAttrs
mapAttrs'
@@ -24,6 +25,9 @@ let
optionalAttrs
types
;
inherit (lib.strings)
removePrefix
;
inherit (pkgs)
mariadb
stdenv
@@ -41,23 +45,42 @@ let
name = "drupal-${hostName}";
src = cfg.package;
buildInputs = [ pkgs.rsync ];
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r * $out/
rsync -aq * $out/ --exclude=${removePrefix "/" cfg.webRoot}/sites --exclude=sites
runHook postInstall
'';
postInstall = ''
ln -s ${cfg.filesDir} $out/share/php/${cfg.package.pname}/sites/default/files
ln -s ${cfg.stateDir}/sites/default/settings.php $out/share/php/${cfg.package.pname}/sites/default/settings.php
ln -s ${cfg.stateDir}/sites $out/share/php/${cfg.package.pname}${cfg.webRoot}
ln -s ${cfg.modulesDir} $out/share/php/${cfg.package.pname}/modules
ln -s ${cfg.themesDir} $out/share/php/${cfg.package.pname}/themes
'';
});
sites =
hostName: cfg:
stdenv.mkDerivation (finalAttrs: {
pname = "drupal-sites-${hostName}";
name = "drupal-sites-${hostName}";
src = cfg.package;
buildInputs = with pkgs; [ rsync ];
installPhase = ''
runHook preInstall
mkdir -p $out/sites
rsync -a ./share/php/${cfg.package.pname}${cfg.webRoot}/sites/* $out/sites/
runHook postInstall
'';
});
drupalSettings =
hostName: cfg:
pkgs.writeTextFile {
@@ -87,6 +110,75 @@ let
'';
};
# Required .htaccess for private files directory
# See: https://www.drupal.org/docs/getting-started/installing-drupal/securing-drupal-file-directories
privateFilesHtAccess = pkgs.writeTextFile {
name = "private-files-htaccess";
text = ''
# Turn off all options we don't need.
Options -Indexes -ExecCGI -Includes -MultiViews
# Set the catch-all handler to prevent scripts from being executed.
SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
<Files *>
# Override the handler again if we're run later in the evaluation list.
SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
</Files>
# If we know how to do it safely, disable the PHP engine entirely.
<IfModule mod_php.c>
php_flag engine off
</IfModule>
'';
};
stateDirManage =
hostName: cfg:
pkgs.writeShellApplication {
name = "drupal-state-init-${hostName}";
excludeShellChecks = [ "SC2194" ];
runtimeInputs = with pkgs; [ rsync ];
text = ''
echo "Updating the sites directory for ${hostName}..."
rsync -auq "${sites hostName cfg}/sites/" "${cfg.stateDir}/sites/" \
--exclude "*/files" \
--delete-before
if [ ! -d "${cfg.filesDir}" ]; then
echo "Preparing files directory..."
mkdir -p "${cfg.filesDir}"
chown -R ${user}:${webserver.group} ${cfg.filesDir}
fi
case ${cfg.filesDir} in
${cfg.stateDir}/sites*) echo "Files directory is in sites directory. Skipping optional link!";;
*) ln -sf "${cfg.filesDir}" "${cfg.stateDir}/sites/default/files";;
esac
if [ ! -f "${cfg.privateFilesDir}/.htaccess" ]; then
echo "Linking .htaccess file for private files directory..."
ln -s "${privateFilesHtAccess}" "${cfg.privateFilesDir}/.htaccess"
fi
echo "Preparing settings.php for ${hostName}..."
settings_file="${cfg.stateDir}/sites/default/settings.php"
if [ ! -f "$settings_file" ]; then
default_settings_file="${cfg.stateDir}/sites/default/default.settings.php";
cp "$default_settings_file" "$settings_file"
fi
cat < ${appendSettings hostName} >> "$settings_file"
chmod 644 "$settings_file"
# Link the NixOS-managed settings file to the state directory.
ln -sf ${drupalSettings hostName cfg} ${cfg.stateDir}/sites/default/settings.nixos-${hostName}.php
# Set or reset file permissions so that the web user and webserver owns them.
chown -R ${user}:${webserver.group} ${cfg.stateDir}
'';
};
siteOpts =
{
options,
@@ -106,6 +198,9 @@ let
defaultText = "/var/lib/drupal/<name>/sites/default/files";
description = ''
The location of the Drupal files directory.
Many of the files in this directory are variable, so they must be located
in a location writeable by users of the webgroup.
'';
};
@@ -120,7 +215,22 @@ let
type = types.path;
default = "/var/lib/drupal/${name}/config/sync";
defaultText = "/var/lib/drupal/<name>/config/sync";
description = "The location of the Drupal config sync directory.";
description = ''
The location of the user-managed Drupal config sync directory.
Drupal will both read from and write to this directory when executing
configuration management operations.
'';
};
webRoot = mkOption {
type = types.str;
default = "";
description = ''
An optional path string with a leading slash
indicating the location of the Drupal webroot relative to the
project root directory, if one exists.
'';
example = "/web";
};
extraConfig = mkOption {
@@ -140,21 +250,41 @@ let
type = types.path;
default = "/var/lib/drupal/${name}";
defaultText = "/var/lib/drupal/<name>";
description = "The location of the Drupal site state directory.";
description = ''
The location of the user-managed Drupal site state directory.
This directory will contain the settings and configuration files for
your Drupal instance. It may also contain your files directory if the
`filesDir` option remains unchanged.
Many of the files in this directory are variable, so they must be located
in a location writeable by users of the webgroup.
'';
};
modulesDir = mkOption {
type = types.path;
default = "/var/lib/drupal/${name}/modules";
defaultText = "/var/lib/drupal/<name>/modules";
description = "The location for users to install Drupal modules.";
description = ''
The location for users to manually install Drupal modules.
Note: in most instances, it is preferable to install modules using
composer, or to package them with your source code repository, if
you are using a custom Drupal.
'';
};
themesDir = mkOption {
type = types.path;
default = "/var/lib/drupal/${name}/themes";
defaultText = "/var/lib/drupal/<name>/themes";
description = "The location for users to install Drupal themes.";
description = ''
The location for users to manually install Drupal themes.
Note: in most instances, it is preferable to install themes using
composer, or to package them with your source code repository, if
you are using a custom Drupal.
'';
};
phpOptions = mkOption {
@@ -357,6 +487,8 @@ in
"d '${cfg.themesDir}' 0750 ${user} ${webserver.group} - -"
"Z '${cfg.themesDir}' 0750 ${user} ${webserver.group} - -"
"d '${cfg.privateFilesDir}' 0750 ${user} ${webserver.group} - -"
"d '${cfg.filesDir}' 0750 ${user} ${webserver.group} - -"
"Z '${cfg.filesDir}' 0750 ${user} ${webserver.group} - -"
"d '${cfg.configSyncDir}' 0750 ${user} ${webserver.group} - -"
]) eachSite
);
@@ -382,42 +514,15 @@ in
User = "root";
RemainAfterExit = true;
ExecStart = writeShellScript "drupal-state-init-${hostName}" ''
set -e
if [ ! -d "${cfg.stateDir}/sites" ]; then
echo "Preparing sites directory..."
cp -r "${cfg.package}/share/php/${cfg.package.pname}/sites" "${cfg.stateDir}"
fi
if [ ! -d "${cfg.filesDir}" ]; then
echo "Preparing files directory..."
mkdir -p "${cfg.filesDir}"
chown -R ${user}:${webserver.group} ${cfg.filesDir}
fi
settings_file="${cfg.stateDir}/sites/default/settings.php"
default_settings="${cfg.package}/share/php/${cfg.package.pname}/sites/default/default.settings.php"
if [ ! -f "$settings_file" ]; then
echo "Preparing settings.php for ${hostName}..."
cp "$default_settings" "$settings_file"
cat < ${appendSettings hostName} >> "$settings_file"
chmod 644 "$settings_file"
fi
# Link the NixOS-managed settings file to the state directory.
ln -sf ${drupalSettings hostName cfg} ${cfg.stateDir}/sites/default/settings.nixos-${hostName}.php
# Set or reset file permissions so that the web user and webserver owns them.
chown -R ${user}:${webserver.group} ${cfg.stateDir}
'';
ExecStart = getExe (stateDirManage hostName cfg);
};
# Rerun this service if certain settings were updated
reloadTriggers = [
cfg.extraConfig
cfg.privateFilesDir
cfg.filesDir
cfg.stateDir
cfg.configSyncDir
];
})
@@ -434,9 +539,9 @@ in
enable = true;
virtualHosts = mapAttrs (hostName: cfg: {
serverName = mkDefault hostName;
root = "${pkg hostName cfg}/share/php/${cfg.package.pname}";
root = "${pkg hostName cfg}/share/php/${cfg.package.pname}${cfg.webRoot}";
extraConfig = ''
index index.php;
index index.php index.htm index.html;
'';
locations = {
"~ '\\.php$|^/update\\.php'" = {
@@ -515,11 +620,19 @@ in
};
"~ ^/sites/.*/files/styles/" = {
extraConfig = ''
alias ${cfg.filesDir}/;
try_files $uri @rewrite;
'';
};
"^~ /sites/.*/files/" = {
extraConfig = ''
alias ${cfg.filesDir}/;
try_files $uri @rewrite;
'';
};
"~ ^(/[a-z\\-]+)?/system/files/" = {
extraConfig = ''
alias ${cfg.privateFilesDir}/;
try_files $uri /index.php?$query_string;
'';
};
@@ -535,8 +648,9 @@ in
hostName: cfg:
(nameValuePair hostName {
extraConfig = ''
root * ${pkg hostName cfg}/share/php/${cfg.package.pname}
root * ${pkg hostName cfg}/share/php/${cfg.package.pname}${cfg.webRoot}
file_server
root /sites/*/files ${cfg.filesDir}
encode zstd gzip
php_fastcgi unix/${config.services.phpfpm.pools."drupal-${hostName}".socket}
+3 -3
View File
@@ -43,7 +43,7 @@ Many services implement automatic reloading or reloading on e.g. `SIGUSR1`, but
### Service Manager Integration
- **Portable base**: The `configData` interface is declared in `portable/config-data.nix`, making it available to all service manager implementations.
- **Portable base**: The `configData` interface is declared in `lib/services/config-data.nix`, making it available to all service manager implementations.
- **Systemd integration**: The systemd implementation (`systemd/system.nix`) maps `configData` entries to `environment.etc` entries under `/etc/system-services/`.
@@ -66,11 +66,11 @@ The modular service infrastructure avoids exposing `pkgs` as a module argument t
### Implementation
- **Portable layer**: Service modules in `portable/` do not receive `pkgs` as a module argument. Any required derivations must be provided by the caller.
- **Portable layer**: Service modules in `lib/services/` do not receive `pkgs` as a module argument. Any required derivations must be provided by the caller.
- **Systemd integration**: The `systemd/system.nix` module imports `config-data.nix` as a function, providing `pkgs` in lexical closure:
```nix
(import ../portable/config-data.nix { inherit pkgs; })
(import lib/services/config-data.nix { inherit pkgs; })
```
- **Service modules**:
@@ -15,7 +15,7 @@ let
mapAttrsToList
;
portable-lib = import ../portable/lib.nix { inherit lib; };
portable-lib = import ../../../../../lib/services/lib.nix { inherit lib; };
dash =
before: after:
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
version = "29.0.3";
hash = "sha256-+MNm0IYbvq2OdqOyhXwfMAhzp/V4jR0Qpf461KIP6Ho=";
version = "30.0.4";
hash = "sha256-5y7LTkiR7dnSHbL80pqsTb57rnLyEbIrHT4xzseVj84=";
};
meta = {
@@ -1729,8 +1729,8 @@ let
mktplcRef = {
name = "foam-vscode";
publisher = "foam";
version = "0.33.0";
hash = "sha256-xeZp75qnxnW2LNtRz0IUzrBjBe5Po3VHGTta+6VCLvQ=";
version = "0.35.0";
hash = "sha256-5tjSXwjiNMC8NlGAa0NQ5uWw+wTEPePL1GgRhnBAtUo=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
@@ -3766,8 +3766,8 @@ let
mktplcRef = {
name = "prisma";
publisher = "Prisma";
version = "31.6.0";
hash = "sha256-jbcAB3IeUrdWTVV+8ssMumHd5aeXJH6tivWGezJ7amU=";
version = "31.8.0";
hash = "sha256-xSkT6VlRrC36jnuB16V+eDozDutrv2ksqxatU/KIgS0=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
@@ -5221,8 +5221,8 @@ let
mktplcRef = {
name = "gitblame";
publisher = "waderyan";
version = "13.0.0";
sha256 = "sha256-I6b4GDM8Ogf+ZH2lD2g4fUkQY9ktuO1xqxfSH6vAMVk=";
version = "13.0.1";
sha256 = "sha256-N0UgWdwGj3NW4x0Ea+jKL5Jvp0YE+HfK5tkUjmynPuY=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog";
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "explorer";
publisher = "vitest";
version = "1.50.0";
hash = "sha256-Fl9HtEavM1Cyxf5IMBN7/12s+JGF3MfLRFeut2pEp+s=";
version = "1.50.1";
hash = "sha256-qMUslEBzYK7nH9k+UBygEt+PjOHwDg/hLvfmbYR++tc=";
};
meta = {
changelog = "https://github.com/vitest-dev/vscode/releases";
@@ -13,13 +13,13 @@
}:
mkLibretroCore {
core = "ppsspp";
version = "0-unstable-2026-03-27";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "3e69145712550dfa44f3f1a92a5efe64774db1f9";
hash = "sha256-iRtL6VdQcDOAJ2b/YBjlLX+A24BwnBkNiNo7aYAzVdU=";
rev = "030c7a9e6b1a22bf8ee1db40f4d4b7402095bce1";
hash = "sha256-qy9S6/ThIA4YtO6J5R4RdPq4BvHDmwq7Y063gXXTuiQ=";
fetchSubmodules = true;
};
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "2048";
version = "0-unstable-2025-12-13";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-2048";
rev = "e70c3f82d2b861c64943aaff7fcc29a63013997d";
hash = "sha256-ZNJUaXIQi9VnmmCikhCtXfhbTZ7rfJ1wm/582gaZCmk=";
rev = "1892de39d80ec37e1fac79729cd91917b21f1349";
hash = "sha256-lNcDdkiWiXhvwwpzMnceTDY+mJl1JTZfGCY+WIOvrP8=";
};
meta = {
@@ -6,13 +6,13 @@
}:
mkLibretroCore {
core = "vice-${type}";
version = "0-unstable-2026-03-09";
version = "0-unstable-2026-04-02";
src = fetchFromGitHub {
owner = "libretro";
repo = "vice-libretro";
rev = "8818c3a39146b9a26df23a1e4880b4420f93a255";
hash = "sha256-Nw+F2hn97F1rKB2UOh/MMNrqmNj87XzRPgEptYoTe7o=";
rev = "8cf6a20017b1f331d5d3ac63b49a5fa75440073a";
hash = "sha256-KnqSx/wv5YTV4MnjEsgIIMnus3m5Rat4go8GzPNUZHs=";
};
makefile = "Makefile";
@@ -616,13 +616,13 @@
"vendorHash": "sha256-IDsGPzNsVPIHWEyhfIkaNaPOrhnk/4XI1UsrIPwcq/M="
},
"hashicorp_local": {
"hash": "sha256-DMYj2hPASzMDtVZNWcUyzMlGfTw1J/bp19tZUl3bjic=",
"hash": "sha256-VYzy+/BniYU++pw9koLWotEJzsIzOjpLX4aRSRupV58=",
"homepage": "https://registry.terraform.io/providers/hashicorp/local",
"owner": "hashicorp",
"repo": "terraform-provider-local",
"rev": "v2.7.0",
"rev": "v2.8.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-UOT5dxWa3PAzEHKXKYFadh9KWJ2ZKfN5uyFB3tyvHAY="
"vendorHash": "sha256-3qnfKHionSfT2efCl0TcHWFFgrh1bPE6Maqg4MCRq0g="
},
"hashicorp_nomad": {
"hash": "sha256-lTO1ZLB0N+WLdMDegIP1NcAC++/vsBV7EB5BDxj588I=",
@@ -842,13 +842,13 @@
"vendorHash": "sha256-BxMhu2gcRuOlYWgx5ZOUBGdfB28+87SG1T/KAPDyei8="
},
"linode_linode": {
"hash": "sha256-i2zAB/3cDOex7j2WciKlRlYfOyhkixEHYbTkoCG1u9s=",
"hash": "sha256-nrNyOcaC5wKJijfubBBuEBKA6dT6Ajo33MR4P80j29k=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v3.10.0",
"rev": "v3.11.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-HzBj7TSjiv/Ov10KOt5V4oQaKK7CKjBjxpSrhmOl1lQ="
"vendorHash": "sha256-91mdCcM5BSNdgW1/mMbuNtAxc4TH1abW8xbRcbHAnNc="
},
"loafoe_htpasswd": {
"hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=",
@@ -1166,13 +1166,13 @@
"vendorHash": "sha256-InCRL4k6v0avmnNja+b6Ozg5+injxa8EmrRHIWrq4Ag="
},
"sap_btp": {
"hash": "sha256-v6zo4JPcXCzjVLEk3ByPEXDaL450MUqcaMZioapsId0=",
"hash": "sha256-3UuetY6pIfZ2glG9tZOaF/Xe/MC4Mq0iVUdi8fNaEsQ=",
"homepage": "https://registry.terraform.io/providers/SAP/btp",
"owner": "SAP",
"repo": "terraform-provider-btp",
"rev": "v1.20.1",
"rev": "v1.21.3",
"spdx": "Apache-2.0",
"vendorHash": "sha256-QO+qM7tv75KbpJ08LDhaUCLtYogQ8dhKM3wNuR+aAhQ="
"vendorHash": "sha256-1I2HQwFkbCawi11MJQzhvjvzjUvSzietRV9yCc6JtmI="
},
"scaleway_scaleway": {
"hash": "sha256-alsM14F6NbpkO1RVDgHPoIUoakv4PHeObVdwQMwADZA=",
File diff suppressed because it is too large Load Diff
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "obs-command-source";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "norihiro";
repo = "obs-command-source";
rev = version;
sha256 = "sha256-yrzY4pHSupkkdRlx725oSVtQTH1Ci9zFolHN3i2Vm28=";
sha256 = "sha256-z5TKVA0WI/pqfca1VCXfDvYHxDG2EoD6PFCV7pSXe7c=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "air";
version = "1.64.5";
version = "1.65.0";
src = fetchFromGitHub {
owner = "air-verse";
repo = "air";
tag = "v${finalAttrs.version}";
hash = "sha256-vaNXG+bS+RB0Qi0kI9lBGyr8FcUxm5igG982+cOZwqw=";
hash = "sha256-pqvnX/PiipZM8jLBN6zN/yVnuCCk+aTII5AH0N4nHEM=";
};
vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw=";
+3 -3
View File
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "amdgpu_top";
version = "0.11.2";
version = "0.11.3";
src = fetchFromGitHub {
owner = "Umio-Yasuno";
repo = "amdgpu_top";
tag = "v${finalAttrs.version}";
hash = "sha256-yw73bKO91O05WBQNwjcQ+AqxYgGXXC7XJzUnMx5/IWc=";
hash = "sha256-k+/y8YaEP8DJuW8n/Xq/Ea9DWG79Cux+PgZbSP4m3pQ=";
};
cargoHash = "sha256-hQrgAyi7740bY5knICWACZhDYoZwPs/dO/PgVC4Krx0=";
cargoHash = "sha256-+eMItSemE69UGfGF9CeKyEvUxvhiZjkJJPeZoVfa+dk=";
buildInputs = [
libdrm
@@ -0,0 +1,224 @@
From bb95a9794abc077ef29066ab6e769fee564c5592 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Thu, 12 Feb 2026 14:57:40 +0100
Subject: [PATCH 1/2] Use $PATH to find programs
Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
cleanup.sh | 3 ---
repackimg.sh | 30 ++++++++++++++----------------
unpackimg.sh | 32 +++++++++++++++-----------------
3 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/cleanup.sh b/cleanup.sh
index 159d04c..b262c73 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -23,9 +23,6 @@ case $1 in
*) cd "$aik";;
esac;
-chmod -R 755 "$bin" "$aik"/*.sh;
-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
-
if [ -d ramdisk ] && [ "$(stat $statarg ramdisk | head -n 1)" = "root" -o ! "$(find ramdisk 2>&1 | cpio -o >/dev/null 2>&1; echo $?)" -eq "0" ]; then
sudo=sudo;
fi;
diff --git a/repackimg.sh b/repackimg.sh
index 185a180..d5e7bc4 100755
--- a/repackimg.sh
+++ b/repackimg.sh
@@ -49,8 +49,6 @@ case $1 in
--local) shift;;
*) cd "$aik";;
esac;
-chmod -R 755 "$bin" "$aik"/*.sh;
-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
if [ -z "$(ls split_img/* 2>/dev/null)" -o ! -e ramdisk ]; then
echo "No files found to be packed/built.";
@@ -135,8 +133,8 @@ else
xz) repackcmd="xz $level -Ccrc32";;
lzma) repackcmd="xz $level -Flzma";;
bzip2) compext=bz2;;
- lz4) repackcmd="$bin/$arch/lz4 $level";;
- lz4-l) repackcmd="$bin/$arch/lz4 $level -l"; compext=lz4;;
+ lz4) repackcmd="lz4 $level";;
+ lz4-l) repackcmd="lz4 $level -l"; compext=lz4;;
cpio) repackcmd="cat"; compext="";;
*) abort; exit 1;;
esac;
@@ -263,7 +261,7 @@ if [ -f split_img/*-mtktype ]; then
echo "Generating MTK headers...";
echo " ";
echo "Using ramdisk type: $mtktype";
- "$bin/$arch/mkmtkhdr" --kernel "$kernel" --$mtktype "$ramdisk" >/dev/null;
+ mkmtkhdr --kernel "$kernel" --$mtktype "$ramdisk" >/dev/null;
if [ ! $? -eq "0" ]; then
abort;
exit 1;
@@ -293,18 +291,18 @@ echo " ";
echo "Using format: $imgtype";
echo " ";
case $imgtype in
- AOSP_VNDR) "$bin/$arch/mkbootimg" --vendor_ramdisk "$ramdisk" "${dtb[@]}" --vendor_cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --tags_offset $tagsoff --dtb_offset $dtboff --os_version "$osver" --os_patch_level "$oslvl" --header_version $hdrver --vendor_boot $outname;;
- AOSP) "$bin/$arch/mkbootimg" --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" "${dtb[@]}" "${recoverydtbo[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --dtb_offset "$dtboff" --os_version "$osver" --os_patch_level "$oslvl" --header_version "$hdrver" $hashtype "${dt[@]}" -o $outname;;
- AOSP-PXA) "$bin/$arch/pxa-mkbootimg" --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --unknown $unknown "${dt[@]}" -o $outname;;
- ELF) "$bin/$arch/elftool" pack -o $outname header="$header" "$kernel" "$ramdisk",ramdisk "${rpm[@]}" "${cmd[@]}" >/dev/null;;
- KRNL) "$bin/$arch/rkcrc" -k "$ramdisk" $outname;;
+ AOSP_VNDR) mkbootimg --vendor_ramdisk "$ramdisk" "${dtb[@]}" --vendor_cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --tags_offset $tagsoff --dtb_offset $dtboff --os_version "$osver" --os_patch_level "$oslvl" --header_version $hdrver --vendor_boot $outname;;
+ AOSP) mkbootimg --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" "${dtb[@]}" "${recoverydtbo[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --dtb_offset "$dtboff" --os_version "$osver" --os_patch_level "$oslvl" --header_version "$hdrver" $hashtype "${dt[@]}" -o $outname;;
+ AOSP-PXA) pxa-mkbootimg --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --unknown $unknown "${dt[@]}" -o $outname;;
+ ELF) elftool pack -o $outname header="$header" "$kernel" "$ramdisk",ramdisk "${rpm[@]}" "${cmd[@]}" >/dev/null;;
+ KRNL) rkcrc -k "$ramdisk" $outname;;
OSIP)
mkdir split_img/.temp 2>/dev/null;
for i in bootstub cmdline.txt hdr kernel parameter sig; do
cp -f split_img/*-*$(basename $i .txt | sed -e 's/hdr/header/') split_img/.temp/$i 2>/dev/null;
done;
cp -f "$ramdisk" split_img/.temp/ramdisk.cpio.gz;
- "$bin/$arch/mboot" -d split_img/.temp -f $outname;
+ mboot -d split_img/.temp -f $outname;
;;
U-Boot)
part0="$kernel";
@@ -312,7 +310,7 @@ case $imgtype in
Multi) part1=(:"$ramdisk");;
RAMDisk) part0="$ramdisk";;
esac;
- "$bin/$arch/mkimage" -A $uarch -O $os -T $type -C $comp -a $addr -e $ep -n "$name" -d "$part0""${part1[@]}" $outname >/dev/null;
+ mkimage -A $uarch -O $os -T $type -C $comp -a $addr -e $ep -n "$name" -d "$part0""${part1[@]}" $outname >/dev/null;
;;
*) echo " "; echo "Unsupported format."; abort; exit 1;;
esac;
@@ -341,13 +339,13 @@ if [ -f split_img/*-sigtype ]; then
AVBv2) echo "AVBv2 detected, no need to sign.";;
BLOB)
awk 'BEGIN { printf "-SIGNED-BY-SIGNBLOB-\00\00\00\00\00\00\00\00" }' > image-new.img;
- "$bin/$arch/blobpack" blob.tmp $blobtype unsigned-new.img >/dev/null;
+ blobpack blob.tmp $blobtype unsigned-new.img >/dev/null;
cat blob.tmp >> image-new.img;
rm -f blob.tmp;
;;
- CHROMEOS) "$bin/$arch/futility" vbutil_kernel --pack image-new.img --keyblock "$bin/chromeos/kernel.keyblock" --signprivate "$bin/chromeos/kernel_data_key.vbprivk" --version 1 --vmlinuz unsigned-new.img --bootloader "$bin/chromeos/empty" --config "$bin/chromeos/empty" --arch arm --flags 0x1;;
+ CHROMEOS) futility vbutil_kernel --pack image-new.img --keyblock "$bin/chromeos/kernel.keyblock" --signprivate "$bin/chromeos/kernel_data_key.vbprivk" --version 1 --vmlinuz unsigned-new.img --bootloader "$bin/chromeos/empty" --config "$bin/chromeos/empty" --arch arm --flags 0x1;;
DHTB)
- "$bin/$arch/dhtbsign" -i unsigned-new.img -o image-new.img >/dev/null;
+ dhtbsign -i unsigned-new.img -o image-new.img >/dev/null;
rm -f split_img/*-tailtype 2>/dev/null;
;;
NOOK*) cat split_img/*-master_boot.key unsigned-new.img > image-new.img;;
@@ -366,7 +364,7 @@ if [ -f split_img/*-lokitype ]; then
echo " ";
mv -f image-new.img unlokied-new.img;
if [ -f aboot.img ]; then
- "$bin/$arch/loki_tool" patch $lokitype aboot.img unlokied-new.img image-new.img >/dev/null;
+ loki_tool patch $lokitype aboot.img unlokied-new.img image-new.img >/dev/null;
if [ ! $? -eq "0" ]; then
echo "Patching failed.";
abort;
diff --git a/unpackimg.sh b/unpackimg.sh
index 9b74f3d..a81eaf0 100755
--- a/unpackimg.sh
+++ b/unpackimg.sh
@@ -53,8 +53,6 @@ esac;
if [ ! "$local" ]; then
cd "$aik";
fi;
-chmod -R 755 "$bin" "$aik"/*.sh;
-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
img="$1";
[ -f "$cur/$1" ] && img="$cur/$1";
@@ -109,10 +107,10 @@ if [ "$(echo $imgtest | awk '{ print $2 }' | cut -d, -f1)" = "signing" ]; then
case $sigtype in
BLOB)
cp -f "$img" "$file";
- "$bin/$arch/blobunpack" "$file" | tail -n+5 | cut -d" " -f2 | dd bs=1 count=3 > "$file-blobtype" 2>/dev/null;
+ blobunpack "$file" | tail -n+5 | cut -d" " -f2 | dd bs=1 count=3 > "$file-blobtype" 2>/dev/null;
mv -f "$file."* "$file";
;;
- CHROMEOS) "$bin/$arch/futility" vbutil_kernel --get-vmlinuz "$img" --vmlinuz-out "$file";;
+ CHROMEOS) futility vbutil_kernel --get-vmlinuz "$img" --vmlinuz-out "$file";;
DHTB) dd bs=4096 skip=512 iflag=skip_bytes conv=notrunc if="$img" of="$file" 2>/dev/null;;
NOOK)
dd bs=1048576 count=1 conv=notrunc if="$img" of="$file-master_boot.key" 2>/dev/null;
@@ -123,7 +121,7 @@ if [ "$(echo $imgtest | awk '{ print $2 }' | cut -d, -f1)" = "signing" ]; then
dd bs=262144 skip=1 conv=notrunc if="$img" of="$file" 2>/dev/null;
;;
SIN*)
- "$bin/$arch/sony_dump" . "$img" >/dev/null;
+ sony_dump . "$img" >/dev/null;
mv -f "$file."* "$file";
rm -f "$file-sigtype";
;;
@@ -165,7 +163,7 @@ case $(echo $imgtest | awk '{ print $3 }') in
echo " ";
echo "Warning: A dump of your device's aboot.img is required to re-Loki!";
echo " ";
- "$bin/$arch/loki_tool" unlok "$img" "$file" >/dev/null;
+ loki_tool unlok "$img" "$file" >/dev/null;
img="$file";
;;
AMONET)
@@ -220,26 +218,26 @@ case $imgtype in
AOSP_VNDR) vendor=vendor_;;
esac;
case $imgtype in
- AOSP|AOSP_VNDR) "$bin/$arch/unpackbootimg" -i "$img";;
- AOSP-PXA) "$bin/$arch/pxa-unpackbootimg" -i "$img";;
+ AOSP|AOSP_VNDR) unpackbootimg -i "$img";;
+ AOSP-PXA) pxa-unpackbootimg -i "$img";;
ELF)
mkdir elftool_out;
- "$bin/$arch/elftool" unpack -i "$img" -o elftool_out >/dev/null;
+ elftool unpack -i "$img" -o elftool_out >/dev/null;
mv -f elftool_out/header "$file-header" 2>/dev/null;
rm -rf elftool_out;
- "$bin/$arch/unpackelf" -i "$img";
+ unpackelf -i "$img";
;;
KRNL) dd bs=4096 skip=8 iflag=skip_bytes conv=notrunc if="$img" of="$file-ramdisk" 2>&1 | tail -n+3 | cut -d" " -f1-2;;
OSIP)
- "$bin/$arch/mboot" -u -f "$img";
+ mboot -u -f "$img";
[ ! $? -eq "0" ] && error=1;
for i in bootstub cmdline.txt hdr kernel parameter ramdisk.cpio.gz sig; do
mv -f $i "$file-$(basename $i .txt | sed -e 's/hdr/header/' -e 's/ramdisk.cpio.gz/ramdisk/')" 2>/dev/null || true;
done;
;;
U-Boot)
- "$bin/$arch/dumpimage" -l "$img";
- "$bin/$arch/dumpimage" -l "$img" > "$file-header";
+ dumpimage -l "$img";
+ dumpimage -l "$img" > "$file-header";
grep "Name:" "$file-header" | cut -c15- > "$file-name";
grep "Type:" "$file-header" | cut -c15- | cut -d" " -f1 > "$file-arch";
grep "Type:" "$file-header" | cut -c15- | cut -d" " -f2 > "$file-os";
@@ -248,10 +246,10 @@ case $imgtype in
grep "Address:" "$file-header" | cut -c15- > "$file-addr";
grep "Point:" "$file-header" | cut -c15- > "$file-ep";
rm -f "$file-header";
- "$bin/$arch/dumpimage" -p 0 -o "$file-kernel" "$img";
+ dumpimage -p 0 -o "$file-kernel" "$img";
[ ! $? -eq "0" ] && error=1;
case $(cat "$file-type") in
- Multi) "$bin/$arch/dumpimage" -p 1 -o "$file-ramdisk" "$img";;
+ Multi) dumpimage -p 1 -o "$file-ramdisk" "$img";;
RAMDisk) mv -f "$file-kernel" "$file-ramdisk";;
*) touch "$file-ramdisk";;
esac;
@@ -318,8 +316,8 @@ case $ramdiskcomp in
xz) ;;
lzma) ;;
bzip2) compext=bz2;;
- lz4) unpackcmd="$bin/$arch/lz4 -dcq";;
- lz4-l) unpackcmd="$bin/$arch/lz4 -dcq"; compext=lz4;;
+ lz4) unpackcmd="lz4 -dcq";;
+ lz4-l) unpackcmd="lz4 -dcq"; compext=lz4;;
cpio) unpackcmd="cat"; compext="";;
empty) compext=empty;;
*) compext="";;
--
2.52.0
@@ -0,0 +1,85 @@
From 6328bc3ddd491f0589e943deeabdfa4dda40f4c7 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Thu, 12 Feb 2026 18:11:37 +0100
Subject: [PATCH 2/2] Do not change directory
Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
cleanup.sh | 4 ++--
repackimg.sh | 4 ++--
unpackimg.sh | 8 ++------
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/cleanup.sh b/cleanup.sh
index b262c73..d7a3188 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -3,7 +3,7 @@
# osm0sis @ xda-developers
case $1 in
- --help) echo "usage: cleanup.sh [--local] [--quiet]"; exit 1;
+ --help) echo "usage: cleanup.sh [--quiet]"; exit 1;
esac;
case $(uname -s) in
@@ -20,7 +20,7 @@ bin="$aik/bin";
case $1 in
--local) shift;;
- *) cd "$aik";;
+ *) ;;
esac;
if [ -d ramdisk ] && [ "$(stat $statarg ramdisk | head -n 1)" = "root" -o ! "$(find ramdisk 2>&1 | cpio -o >/dev/null 2>&1; echo $?)" -eq "0" ]; then
diff --git a/repackimg.sh b/repackimg.sh
index d5e7bc4..15374c4 100755
--- a/repackimg.sh
+++ b/repackimg.sh
@@ -5,7 +5,7 @@
abort() { echo "Error!"; }
case $1 in
- --help) echo "usage: repackimg.sh [--local] [--original] [--origsize] [--level <0-9>] [--avbkey <name>] [--forceelf]"; exit 1;
+ --help) echo "usage: repackimg.sh [--original] [--origsize] [--level <0-9>] [--avbkey <name>] [--forceelf]"; exit 1;
esac;
case $(uname -s) in
@@ -47,7 +47,7 @@ esac;
case $1 in
--local) shift;;
- *) cd "$aik";;
+ *) ;;
esac;
if [ -z "$(ls split_img/* 2>/dev/null)" -o ! -e ramdisk ]; then
diff --git a/unpackimg.sh b/unpackimg.sh
index a81eaf0..e330766 100755
--- a/unpackimg.sh
+++ b/unpackimg.sh
@@ -6,8 +6,8 @@ cleanup() { "$aik/cleanup.sh" $local --quiet; }
abort() { echo "Error!"; }
case $1 in
- --help) echo "usage: unpackimg.sh [--local] [--nosudo] <file>"; exit 1;;
- --local) local="--local"; shift;;
+ --help) echo "usage: unpackimg.sh [--nosudo] <file>"; exit 1;;
+ --local) shift;;
esac;
case $1 in
--nosudo) nosudo=1; shift;;
@@ -50,10 +50,6 @@ case $plat in
;;
esac;
-if [ ! "$local" ]; then
- cd "$aik";
-fi;
-
img="$1";
[ -f "$cur/$1" ] && img="$cur/$1";
if [ ! "$img" ]; then
--
2.52.0
@@ -0,0 +1,93 @@
{
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
blobtools,
dhtbsign,
elftool,
futility,
loki-tool,
lz4,
mboot,
mkbootimg-osm0sis,
mkmtkhdr,
pxa-mkbootimg,
rkflashtool,
sony-dump,
ubootTools,
unpackelf,
}:
stdenv.mkDerivation {
pname = "android-image-kitchen";
version = "0-unstable-2025-10-17";
src = fetchFromGitHub {
owner = "SebaUbuntu";
repo = "AIK-Linux-mirror";
rev = "1c1411bd685bbc5fb4112484af2ad07cb6807f30";
hash = "sha256-auwAXWzUAFS8USTTH9h5nPzmoGOZf53GkLA+KNGl8uc=";
};
patches = [
./0001-Use-PATH-to-find-programs.patch
./0002-Do-not-change-directory.patch
];
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
substituteInPlace {cleanup,repackimg,unpackimg}.sh \
--replace-fail "bin=\"\$aik/bin\";" "bin=$out/share"
'';
installPhase = ''
runHook preInstall
for i in cleanup repackimg unpackimg; do
install -Dm 555 "$i.sh" "$out/bin/aik-$i"
done
# Remove prebuilt binaries
rm -rf bin/{linux,macos}
# Copy rest of the required files
mkdir -p $out/share
cp -rT bin $out/share
runHook postInstall
'';
postInstall = ''
for i in $out/bin/aik-{cleanup,repackimg,unpackimg}; do
wrapProgram $i --prefix PATH : ${
lib.makeBinPath [
blobtools
dhtbsign
elftool
futility
loki-tool
lz4
mboot
mkbootimg-osm0sis
mkmtkhdr
pxa-mkbootimg
rkflashtool
sony-dump
ubootTools
unpackelf
]
}
done
'';
meta = {
description = "Unpack & repack Android boot files";
homepage = "https://github.com/SebaUbuntu/AIK-Linux-mirror";
# No license specified in the repository
license = lib.licenses.free;
maintainers = with lib.maintainers; [ ungeskriptet ];
teams = [ lib.teams.android ];
mainProgram = "aik-unpackimg";
};
}
+2 -2
View File
@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "argocd";
version = "3.3.5";
version = "3.3.6";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
tag = "v${finalAttrs.version}";
hash = "sha256-sih7HrF9qwSI7j8A76iZl54CcO5aI09dt65YdupZ08c=";
hash = "sha256-84GlX9m1+Af9EPPdvLJcZIqhw7a1DBj1xKmUpNnngbk=";
};
ui = stdenv.mkDerivation {
@@ -0,0 +1,16 @@
diff --git a/audiosource b/audiosource
index e2f034c..b6efc34 100755
--- a/audiosource
+++ b/audiosource
@@ -82,9 +82,9 @@ install() {
echo '[+] Installing Audio Source'
- adb install -rtg "$AUDIOSOURCE_APK" || {
+ adb install -r -t -g "$AUDIOSOURCE_APK" || {
adb uninstall "$AUDIOSOURCE_PKG"
- adb install -tg "$AUDIOSOURCE_APK"
+ adb install -t -g "$AUDIOSOURCE_APK"
}
}
+7 -5
View File
@@ -13,18 +13,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "audiosource";
version = "1.4";
version = "1.5";
src = fetchFromGitHub {
owner = "gdzx";
repo = "audiosource";
tag = "v${finalAttrs.version}";
hash = "sha256-SlX8gjs7X5jfoeU6pyk4n8f6oMJgneGVt0pmFs48+mQ=";
hash = "sha256-npN7V1svKaxCfsZBvmfm7T/UJsAQ4hQM3RN+tpK5cms=";
};
patches = [
# Removes build-related logic from the script that is unused in the package and fixes a small bug with adb args on new Android versions
./unused-logic-removal-and-args-fix.patch
# Removes build-related logic from the script that is unused in the package
./unused-logic-removal.patch
# Fixes a small bug with adb args on new Android versions
./adb-args-fix.patch
];
postPatch = ''
@@ -62,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.apk = fetchurl {
url = "https://github.com/gdzx/audiosource/releases/download/v${finalAttrs.version}/audiosource.apk";
hash = "sha256-vDIF+NZ3JgTT67Dem4qeajWsA5m/MFt2nRDpWUqC9aU=";
hash = "sha256:cd48532829f41060d3c9909daa5563a669394eb9dd00baf303b6db1b5b2db1fa";
};
meta = {
@@ -1,5 +1,5 @@
diff --git a/audiosource b/audiosource
index b06127a..0bccddf 100755
index e2f034c..787076e 100755
--- a/audiosource
+++ b/audiosource
@@ -2,15 +2,7 @@
@@ -16,18 +16,25 @@ index b06127a..0bccddf 100755
-
-AUDIOSOURCE_APK=${AUDIOSOURCE_APK:-"$AUDIOSOURCE_DEFAULT_APK"}
+AUDIOSOURCE_APK=${AUDIOSOURCE_APK:-"@apkPath@"}
AUDIOSOURCE_PKG='fr.dzx.audiosource'
ANDROID_SERIAL=${ANDROID_SERIAL:-}
PYSOCAT="$(cat <<EOF
@@ -81,22 +73,12 @@ install() {
@@ -57,14 +49,6 @@ if __name__ == '__main__':
EOF
)"
echo '[+] Installing Audio Source'
- adb install -rtg "$AUDIOSOURCE_APK" || {
+ adb install -r -t -g "$AUDIOSOURCE_APK" || {
adb uninstall fr.dzx.audiosource
- adb install -tg "$AUDIOSOURCE_APK"
+ adb install -t -g "$AUDIOSOURCE_APK"
-build() {
- if [ "$AUDIOSOURCE_PROFILE" = 'release' ]; then
- ./gradlew assembleRelease
- else
- ./gradlew assembleDebug
- fi
-}
-
install() {
if ! command -v adb &> /dev/null; then
echo "Error: adb not found"
@@ -88,16 +72,6 @@ install() {
}
}
@@ -44,7 +51,7 @@ index b06127a..0bccddf 100755
_unload() {
for id in `pactl list modules short | sed -n "/module-pipe-source\tsource_name=$AUDIOSOURCE_NAME/p" | cut -f1`; do
pactl unload-module "$id"
@@ -146,7 +128,7 @@ volume() {
@@ -189,7 +163,7 @@ volume() {
main_help() {
cat <<-EOF
@@ -53,15 +60,15 @@ index b06127a..0bccddf 100755
Options:
@@ -154,15 +136,13 @@ main_help() {
@@ -197,7 +171,6 @@ main_help() {
Commands:
- build Build Audio Source APK (default: debug)
- install Install Audio Source to Android device (default: debug)
+ install Install Audio Source to Android device
run Run Audio Source and start forwarding
volume LEVEL Set volume to LEVEL (for example, 250%)
- build Build Audio Source APK
install Install Audio Source to Android device
run [-r] Run Audio Source and start forwarding
(-r will automatically restart)
@@ -205,8 +178,7 @@ main_help() {
Environment:
@@ -71,7 +78,7 @@ index b06127a..0bccddf 100755
AUDIOSOURCE_NAME Name of the PulseAudio source (default: android-<serial-hash>)
ANDROID_SERIAL Device serial number to connect to (default: unset)
EOF
@@ -200,7 +180,7 @@ main() {
@@ -244,7 +216,7 @@ main() {
shift
case "$cmd" in
@@ -1,24 +0,0 @@
diff --git a/go.mod b/go.mod
index 9bc55db..4bddb07 100644
--- a/go.mod
+++ b/go.mod
@@ -19,5 +19,6 @@ require (
github.com/smallfish/simpleyaml v0.0.0-20170527020626-116d8e577389 // indirect
github.com/starkandwayne/goutils v0.0.0-20190115202530-896b8a6904be
github.com/urfave/cli v1.19.1
+ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect
gopkg.in/yaml.v2 v2.3.0
)
diff --git a/go.sum b/go.sum
index 7641199..d983a95 100644
--- a/go.sum
+++ b/go.sum
@@ -138,6 +138,8 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o=
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80=
+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -0,0 +1,24 @@
--- /nix/store/vi2p09s1xk39c6r8p8r0rm0p5c7nka62-source/processor/processor_test.go 1970-01-01 08:00:01
+++ source-orig/processor/processor_test.go 2026-03-27 11:41:40
@@ -496,7 +496,7 @@
cfg.Merge[0].With.Files = []string{"fake1", "fake2"}
cfg.ForEach.In = "integration/yamls/addons/"
cfg.ForEach.SubDirs = true
- cfg.ForEach.Except = "fake2"
+ cfg.ForEach.Except = []string{"fake2"}
cfg.ForEach.ForAll = "integration/yamls/"
spruceConfig = []aviator.Spruce{cfg}
@@ -507,10 +507,10 @@
Expect(err).ToNot(HaveOccurred())
cc := spruceClient.MergeWithOptsCallCount()
- Expect(cc).To(Equal(8))
+ Expect(cc).To(Equal(9))
mergeOpts := spruceClient.MergeWithOptsArgsForCall(0)
- Expect(len(mergeOpts.Files)).To(Equal(4))
+ Expect(len(mergeOpts.Files)).To(Equal(5))
})
})
})
+17 -5
View File
@@ -2,31 +2,43 @@
lib,
buildGoModule,
fetchFromGitHub,
testers,
}:
buildGoModule (finalAttrs: {
pname = "aviator";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "herrjulz";
repo = "aviator";
rev = "v${finalAttrs.version}";
sha256 = "sha256-Oa4z8n+q7LKWMnwk+xj9UunzOa3ChaPBCTo828yYJGQ=";
hash = "sha256-jqAGwPqxxCkBpSMebikdUGh54hlSLeqAyf7BOBtjiNA=";
};
patches = [
./bump-golang-x-sys.patch
# Fix test failures caused by type mismatch in ForEach.Except field
# The Except field was changed from string to []string
./fix-except-type.patch
];
deleteVendor = true;
vendorHash = "sha256-AJyxCE4DdAXRS+2sY4Zzu8NTEFKJoV1bopfOqOFKZfI=";
vendorHash = "sha256-rYOphvI1ZE8X5UExfgxHnWBn697SDkNnmxeY7ihIZ1s=";
ldflags = [
"-s"
"-w"
];
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
};
meta = {
description = "Merge YAML/JSON files in a in a convenient fashion";
mainProgram = "aviator";
homepage = "https://github.com/herrjulz/aviator";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ risson ];
mainProgram = "aviator";
};
})
+6 -11
View File
@@ -2,32 +2,27 @@
lib,
stdenvNoCC,
fetchFromGitHub,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "behdad-fonts";
version = "0.0.3";
src = fetchFromGitHub {
owner = "font-store";
repo = "BehdadFont";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-gKfzxo3/bCMKXl2d6SP07ahIiNrUyrk/SN5XLND2lWY=";
};
installPhase = ''
runHook preInstall
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/behrad-fonts {} \;
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://github.com/font-store/BehdadFont";
description = "Persian/Arabic Open Source Font";
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = [ ];
maintainers = with lib.maintainers; [ pancaek ];
};
}
})
+2 -8
View File
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchFromGitHub,
installFonts,
}:
stdenvNoCC.mkDerivation {
pname = "besley";
@@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation {
hash = "sha256-N6QU3Pd6EnIrdbRtDT3mW5ny683DBWo0odADJBSdA2E=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts/truetype
cp fonts/*/*.otf $out/share/fonts/truetype
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://indestructibletype.com/Besley.html";
+2 -2
View File
@@ -12,14 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bird";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitLab {
domain = "gitlab.nic.cz";
owner = "labs";
repo = "bird";
rev = "v${finalAttrs.version}";
hash = "sha256-J+I+FJvPOOnjif2jy0ko+BuEcXd3kFjmlDtQpHL2cNc=";
hash = "sha256-FkrVrjT4Q9zLeauP2GOX38a7a4q7h2aQbEe/kmfKB3A=";
};
nativeBuildInputs = [
+12 -3
View File
@@ -14,23 +14,31 @@
buildNpmPackage (finalAttrs: {
pname = "bitwarden-cli";
version = "2026.2.0";
version = "2026.3.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
tag = "cli-v${finalAttrs.version}";
hash = "sha256-BiL9ugimdDKIzIoehGqdBfJkTOjbOMl8XV+0g/aGS/k=";
hash = "sha256-ecaCHk04N9h0RP8gK0o+MLgYS6Linsqi7AaC86hwQ3U=";
};
postPatch = ''
# remove code under unfree license
rm -r bitwarden_license
# Upstream cli-v2026.3.0 bumps @napi-rs/cli to 3.5.1 in the desktop workspace,
# but the root lockfile still points that entry at 3.2.0.
substituteInPlace package-lock.json \
--replace-fail \
$' "apps/desktop/node_modules/@napi-rs/cli": {\n "version": "3.2.0",\n "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-3.2.0.tgz",\n "integrity": "sha512-heyXt/9OBPv/WrTFW2+PxIMzH6MCeqP9ZsvOg0LN6pLngBnszcxFsdhCAh5I6sddzQsvru53zj59GUzvmpWk8Q==",' \
$' "apps/desktop/node_modules/@napi-rs/cli": {\n "version": "3.5.1",\n "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-3.5.1.tgz",\n "integrity": "sha512-XBfLQRDcB3qhu6bazdMJsecWW55kR85l5/k0af9BIBELXQSsCFU0fzug7PX8eQp6vVdm7W/U3z6uP5WmITB2Gw==",'
'';
nodejs = nodejs_22;
npmDepsFetcherVersion = 2;
npmDepsHash = "sha256-S34Lxr9dH9wjBmpDYA530z2/HiY4D4b/3rswWDqsrFU=";
npmDepsHash = "sha256-JVRwU5MUQ8YzhCW7ODiyVqbgq7/PxgMV9dlw7i32MfI=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
perl
@@ -109,6 +117,7 @@ buildNpmPackage (finalAttrs: {
maintainers = with lib.maintainers; [
xiaoxiangmoe
dotlambda
caverav
];
};
})
+3 -3
View File
@@ -12,13 +12,13 @@
buildNpmPackage rec {
pname = "blockbench";
version = "5.1.1";
version = "5.1.2";
src = fetchFromGitHub {
owner = "JannisX11";
repo = "blockbench";
tag = "v${version}";
hash = "sha256-bvstexoBQylLmTMzAhId+1HvC3iiL3tPahGhwZ5Yroo=";
hash = "sha256-fU38Exv83cKaPFA26zmwYZlkscCbAEz/7Gch5j/qHjk=";
};
patches = [
@@ -36,7 +36,7 @@ buildNpmPackage rec {
copyDesktopItems
];
npmDepsHash = "sha256-1CCYk3cKFdLhx8oC5XreFCf5sL/7eKjOfXCmHt7hZrM=";
npmDepsHash = "sha256-0FdPTyoVNrsx0LJYcpfZPKZwUKzyJaU6XNnm2bY9F/s=";
makeCacheWritable = true;
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+2 -2
View File
@@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
URL: ${finalAttrs.meta.homepage}
Version: ${finalAttrs.version}
Cflags: -I \''${includedir}
Libs: -L \''${libdir} -lblst
Cflags: -I\''${includedir}
Libs: -L\''${libdir} -lblst
Libs.private:
EOF
+5 -4
View File
@@ -2,6 +2,7 @@
stdenvNoCC,
lib,
fetchFromGitHub,
installFonts,
}:
stdenvNoCC.mkDerivation {
@@ -15,9 +16,9 @@ stdenvNoCC.mkDerivation {
sha256 = "1sx2gv19pgdyccb38sx3qnwszksmva7pqa1c8m35s6cipgjhhgb4";
};
installPhase = ''
install -m444 -Dt $out/share/fonts/truetype *Bront.ttf
'';
preInstall = "rm {DejaVuSansMono,UbuntuMono}.ttf";
nativeBuildInputs = [ installFonts ];
meta = {
description = "Bront Fonts";
@@ -28,6 +29,6 @@ stdenvNoCC.mkDerivation {
ufl
];
platforms = lib.platforms.all;
maintainers = [ ];
maintainers = with lib.maintainers; [ pancaek ];
};
}
+3 -14
View File
@@ -2,31 +2,20 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "catimg";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "posva";
repo = "catimg";
rev = finalAttrs.version;
sha256 = "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s";
tag = "v${finalAttrs.version}";
hash = "sha256-TkUrDVg/EJQ3cAWosRDJ09pmOB0NANW7c/MFyH//Iok=";
};
patches = [
# Update CMake minimum required version for CMake 4 compatibility
# https://github.com/NixOS/nixpkgs/issues/449801
# https://github.com/posva/catimg/pull/73
(fetchpatch {
url = "https://github.com/posva/catimg/commit/155786229230e2ddc2dd97e4e0219d1e2aa66099.patch";
hash = "sha256-eDXYa8eGvhC7NGL6V+R3Ui5FBtx/APGUC6Sw9rv2ho4=";
})
];
nativeBuildInputs = [ cmake ];
env = lib.optionalAttrs (stdenv.hostPlatform.libc == "glibc") {
@@ -0,0 +1,41 @@
{
lib,
stdenvNoCC,
fetchzip,
nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "claude-usage-tracker";
version = "3.0.3";
src = fetchzip {
url = "https://github.com/hamed-elfayome/Claude-Usage-Tracker/releases/download/v${finalAttrs.version}/Claude-Usage.zip";
hash = "sha256-Yc4SukriyiLI/8U+rdhc3Jh/mD2V/0EF57rsVV0J3s4=";
stripRoot = false;
};
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r "Claude Usage.app" $out/Applications/
runHook postInstall
'';
dontBuild = true;
dontFixup = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Native macOS menu bar app for tracking Claude AI usage limits in real-time. Built with Swift/SwiftUI.";
homepage = "https://github.com/hamed-elfayome/Claude-Usage-Tracker";
changelog = "https://github.com/hamed-elfayome/Claude-Usage-Tracker/releases/tag/v${finalAttrs.version}";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
platforms = [ "aarch64-darwin" ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ myzel394 ];
};
})
-59
View File
@@ -1,59 +0,0 @@
{
lib,
stdenv,
bzip2,
cmake,
fetchurl,
fftw,
llvmPackages,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cmtk";
version = "3.3.2";
src = fetchurl {
name = "cmtk-source.tar.gz";
url = "https://www.nitrc.org/frs/download.php/13188/CMTK-${finalAttrs.version}-Source.tar.gz//?i_agree=1&download_now=1";
hash = "sha256-iE164NCOSOypZLLZfZy9RTyrS+YnY9ECqfb4QhlsMS4=";
};
postPatch = ''
substituteInPlace apps/vtkxform.cxx --replace-fail \
"float xyzFloat[3] = { xyz[0], xyz[1], xyz[2] };" \
"float xyzFloat[3] = { (float)xyz[0], (float)xyz[1], (float)xyz[2] };"
'';
nativeBuildInputs = [ cmake ];
buildInputs = [
bzip2
fftw
zlib
]
++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Dfinite=isfinite")
];
meta = {
description = "Computational Morphometry Toolkit";
mainProgram = "cmtk";
longDescription = ''
A software toolkit for computational morphometry of
biomedical images, CMTK comprises a set of command line tools and a
back-end general-purpose library for processing and I/O
'';
maintainers = [ ];
platforms = lib.platforms.all;
license = lib.licenses.gpl3Plus;
homepage = "https://www.nitrc.org/projects/cmtk/";
};
})
+2 -2
View File
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "code";
version = "0.6.83";
version = "0.6.90";
src = fetchFromGitHub {
owner = "just-every";
repo = "code";
tag = "v${finalAttrs.version}";
hash = "sha256-5BQDIb+wcDuz3aAkhBIimjxJY6vgQufiX+GWvSZ5yIs=";
hash = "sha256-jJBsE29PeK3YymPueuMoL8P3B3hLgP4hXUfPraNBY3s=";
};
sourceRoot = "${finalAttrs.src.name}/code-rs";
File diff suppressed because it is too large Load Diff
+3 -10
View File
@@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "collabora-online";
version = "24.04.17-3";
version = "25.04.9-4";
src = fetchFromGitHub {
owner = "CollaboraOnline";
repo = "online";
tag = "cp-${finalAttrs.version}";
hash = "sha256-KJ5E5jvV0MrWdpU4pU+9Y4ngRJ/kk3lcBntbWdQZFqY=";
hash = "sha256-+9dGNNduWq4+jxlVd49PDllIyI7vfYmFlly/t70eNtg=";
};
nativeBuildInputs = [
@@ -68,12 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./fix-file-server-regex.patch
# https://github.com/CollaboraOnline/online/pull/11464/
(fetchpatch {
name = "fix-testPreProcessedFileSubstitution";
url = "https://github.com/CollaboraOnline/online/commit/76a4b64297d721d66603dc63f525324475036917.patch";
hash = "sha256-PGys1dpHLFsUKKA1YyxkJpbBbc2prySdGH/CZni90kI=";
})
];
postPatch = ''
@@ -81,7 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
patchShebangs browser/util/*.py coolwsd-systemplate-setup scripts/*
substituteInPlace configure.ac --replace-fail '/usr/bin/env python3' python3
substituteInPlace coolwsd-systemplate-setup --replace-fail /bin/pwd pwd
'';
# Copy dummy self-signed certificates provided for testing.
@@ -96,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
cp ${./package-lock.json} package-lock.json
'';
hash = "sha256-LzXU1WdayfXhkDOlKEtZ/pgYfFPNPml5TNXS9sJp2yI=";
hash = "sha256-c78C5yt/RH4jmjZpaBskV+1u4wTTVJoWjFqq6eNUVOA=";
};
npmRoot = "browser";
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cpeditor";
version = "7.0.1";
version = "7.0.2";
src = fetchFromGitHub {
owner = "cpeditor";
repo = "cpeditor";
tag = finalAttrs.version;
hash = "sha256-t7nn3sO45dOQq5OMWhaseO9XHicQ/1fjukXal5yPMgY";
hash = "sha256-rdGdbMJ3j01RAS/xPZ9zimL0mv8ZW3vYXht6jNFyheI=";
fetchSubmodules = true;
};
+1 -1
View File
@@ -211,7 +211,7 @@ stdenv.mkDerivation rec {
curl
mit
];
maintainers = with lib.maintainers; [ ggg ];
maintainers = [ ];
platforms = lib.platforms.unix;
mainProgram = "curl-impersonate";
};
+11 -2
View File
@@ -2,6 +2,8 @@
lib,
rustPlatform,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -11,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
src = fetchFromGitHub {
name = "datafusion-cli-source";
owner = "apache";
repo = "arrow-datafusion";
repo = "datafusion";
tag = finalAttrs.version;
hash = "sha256-DYNKYE8+rh/hkHpWnBl9C7licTst7WxNOV812vPXiQs=";
};
@@ -37,11 +39,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
# timeout
doCheck = false;
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "CLI for Apache Arrow DataFusion";
mainProgram = "datafusion-cli";
homepage = "https://arrow.apache.org/datafusion";
changelog = "https://github.com/apache/arrow-datafusion/blob/${finalAttrs.version}/datafusion/CHANGELOG.md";
changelog = "https://github.com/apache/datafusion/blob/${finalAttrs.src.tag}/datafusion/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ happysalada ];
};
+42
View File
@@ -0,0 +1,42 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation {
pname = "dhtbsign";
version = "0-unstable-2022-11-10";
src = fetchFromGitHub {
owner = "osm0sis";
repo = "dhtbsign";
rev = "2b2711dff153485c549240423d9c908a2912f4b2";
hash = "sha256-51zmuQ817Mqx8Hwnx/t4fC9G5huiLGIv+99nRP16mSg=";
};
strictDeps = true;
env.NIX_CFLAGS_COMPILE = toString (
lib.optional stdenv.cc.isGNU [
# Required with newer GCC
"-Wno-error=stringop-overflow"
]
);
# Unstream has an install target, but installs dhtbsign as `$out/bin`
# instead of `$out/bin/dhtbsign`
installPhase = ''
runHook preInstall
install -Dm555 dhtbsign -t $out/bin
runHook postInstall
'';
meta = {
homepage = "https://github.com/osm0sis/dhtbsign";
description = "Tool to write the DHTB header for Samsung Spreadtrum devices";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ ungeskriptet ];
teams = [ lib.teams.android ];
mainProgram = "dhtbsign";
};
}
+2 -2
View File
@@ -108,12 +108,12 @@ in
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python.pkgs.buildPythonApplication rec {
pname = "diffoscope";
version = "315";
version = "316";
pyproject = true;
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
hash = "sha256-Zw2goFgD47vZ/AQ1TEXqdlWxkY9p6digduAp78EHtnc=";
hash = "sha256-6YLeNNWVMbvL2xymsdsxUPnknOScqGc1egl8VKtWXz4=";
};
outputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "dsearch";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "AvengeMedia";
repo = "danksearch";
tag = "v${finalAttrs.version}";
hash = "sha256-2o4oJgATtrhHUihmQlFhZBhx8qXFnxsgiXzfGairHhQ=";
hash = "sha256-8Ka2sH6l7lnkXV832o0tMK3i9A4zSYFtaYZL6LNgWvc=";
};
vendorHash = "sha256-cBBfIil7IYAXlQN8OyoJwsNxyYC0pruloaJrZZGovU4=";
vendorHash = "sha256-nvAgDX8dS3ZwAGTdPvNK1/XzlY28/QjRSW8cmqhp9io=";
ldflags = [
"-w"
+2 -2
View File
@@ -12,11 +12,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "eigenwallet";
version = "4.1.0";
version = "4.2.4";
src = fetchurl {
url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
hash = "sha256-zUVsw4tEzM1xIKzwn/moaRKpwqFAvcl1jHb8EpfNLuQ=";
hash = "sha256-2AZJ8YSRxnlWtEkG8X9Zxt+xC/2YkTGg3kDorDjQYxY=";
};
nativeBuildInputs = [
+40
View File
@@ -0,0 +1,40 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation {
pname = "elftool";
version = "0-unstable-2022-11-10";
src = fetchFromGitHub {
owner = "osm0sis";
repo = "elftool";
rev = "363653ee89d7b4e1cd5e1f2c878d71acd75fc072";
hash = "sha256-nMJhMzzvXtrezZbKdsBq24/El2n7ubiBd5XEYFg3C00=";
};
strictDeps = true;
# Needed to fix `collect2: error: ld returned 1 exit status`
env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
makeFlags = [ "CC=c++" ];
installPhase = ''
runHook preInstall
install -Dm555 elftool -t $out/bin
runHook postInstall
'';
meta = {
homepage = "https://github.com/osm0sis/elftool";
description = "Program for packing and unpacking boot images from Sony mobile devices";
# No license specified in the repository
license = lib.licenses.free;
sourceProvenance = with lib.sourceTypes; [ fromSource ];
maintainers = with lib.maintainers; [ ungeskriptet ];
teams = [ lib.teams.android ];
mainProgram = "elftool";
};
}
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "emptty";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "tvrzna";
repo = "emptty";
rev = "v${finalAttrs.version}";
hash = "sha256-JP9PElmwSHk8rcP7NF1PsZETul978UZR+MUulT3BtYs=";
hash = "sha256-EwXGaTwdL2jOLk+DR35mffhkPa1UVvfZ1Gx1KefbeGc=";
};
buildInputs = [
+2 -7
View File
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
}:
let
@@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation {
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://dotcolon.net/font/ferrum/";
+10 -5
View File
@@ -12,13 +12,13 @@
}:
let
version = "2.61.2";
version = "2.62.2";
src = fetchFromGitHub {
owner = "filebrowser";
repo = "filebrowser";
rev = "v${version}";
hash = "sha256-/8bBYRzWJ00FpcLMB8M6hkyMUEM/0PM8jsvR+m7jfpc=";
hash = "sha256-yjy3RMgC38oktxMpvw78w5VVCUE/1+Lv37G/RJaQte0=";
};
frontend = buildNpmPackage rec {
@@ -41,7 +41,7 @@ let
;
fetcherVersion = 3;
pnpm = pnpm_10;
hash = "sha256-2e3Gr5/pdOsT3cSTdOz5mAjZaWB1C3qGDikpoa5BoII=";
hash = "sha256-0n2HxluqIcCzo1QA5D/YRCk5+mbTntLA8PFxZAC3YA8=";
};
installPhase = ''
@@ -59,7 +59,7 @@ buildGoModule {
pname = "filebrowser";
inherit version src;
vendorHash = "sha256-aY3OIr0Kbno38Y/PZ03JK5wCCD4HRdnznJ3OaaH/WVA=";
vendorHash = "sha256-YM/aIx1gDhFAKNNZmXvG3AVd4xSNC8AHIya4Gyeq9/Y=";
excludedPackages = [ "tools" ];
@@ -72,7 +72,12 @@ buildGoModule {
];
passthru = {
updateScript = nix-update-script { };
updateScript = nix-update-script {
extraArgs = [
"--subpackage"
"frontend"
];
};
inherit frontend;
tests = {
inherit (nixosTests) filebrowser;
+40 -3
View File
@@ -4,17 +4,21 @@
fetchFromGitHub,
fetchpatch,
cmake,
versionCheckHook,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "flatcc";
version = "0.6.1";
strictDeps = true;
src = fetchFromGitHub {
owner = "dvidelabs";
repo = "flatcc";
rev = "v${finalAttrs.version}";
sha256 = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ=";
tag = "v${finalAttrs.version}";
hash = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ=";
};
patches = [
@@ -42,18 +46,51 @@ stdenv.mkDerivation (finalAttrs: {
"test/monster_test_cpp/CMakeLists.txt"
];
})
]
++ lib.optionals stdenv.cc.isClang [
# Fix clang compilation
# https://github.com/dvidelabs/flatcc/pull/273
(fetchpatch {
name = "fix-c23-fallthrough.patch";
url = "https://github.com/dvidelabs/flatcc/commit/7c199e3b191a6f714694035f1eba40112e71675c.patch";
hash = "sha256-kGupiMVa2r+hsQnknatRK+EfscNjJD0T75NY1ELkJ5U=";
})
# Fix implicit int conversion on negation for int8/int16
# https://github.com/dvidelabs/flatcc/commit/5df663837c93eb7516890c27574dcc4b042890cb
(fetchpatch {
name = "fix-pprintint-implicit-int-conversion.patch";
url = "https://github.com/dvidelabs/flatcc/commit/5df663837c93eb7516890c27574dcc4b042890cb.patch";
hash = "sha256-pntpatUDkZbj5pEViA8jDvXP+9KNdfhUDQCUd598Lxg=";
excludes = [ "CHANGELOG.md" ];
})
];
postPatch = ''
substituteInPlace include/flatcc/portable/grisu3_print.h \
--replace-fail \
'static char hexdigits[16] = "0123456789ABCDEF";' \
"static char hexdigits[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};"
'';
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DFLATCC_INSTALL=on"
(lib.cmakeBool "FLATCC_INSTALL" true)
];
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "FlatBuffers Compiler and Library in C for C";
mainProgram = "flatcc";
homepage = "https://github.com/dvidelabs/flatcc";
changelog = "https://github.com/dvidelabs/flatcc/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = [ lib.licenses.asl20 ];
maintainers = with lib.maintainers; [ onny ];
};
+55
View File
@@ -0,0 +1,55 @@
{
lib,
stdenv,
fetchgit,
openssl,
pkg-config,
nss,
}:
let
url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference";
branch = "release-R145-16552.B";
in
stdenv.mkDerivation {
pname = "futility";
version = "0-${branch}";
src = fetchgit {
inherit url;
rev = "refs/heads/${branch}";
hash = "sha256-LctTKkf8nTVcrErMiAkvSCYkZnBoTYjqxWj0xADi0Q4=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
openssl
nss
];
postPatch = ''
patchShebangs ./scripts
substituteInPlace ./scripts/getversion.sh \
--replace-fail "unknown" "${branch}"
'';
makeFlags = [
"UB_DIR=$(out)/bin"
"USE_FLASHROM=0"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ "HAVE_MACOS=1" ];
buildFlags = "futil";
installTargets = "futil_install";
meta = {
homepage = url;
description = "ChromeOS firmware utility";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ ungeskriptet ];
teams = [ lib.teams.android ];
mainProgram = "futility";
badPlatforms = lib.platforms.darwin;
};
}
@@ -0,0 +1,13 @@
diff --git a/data/ui/image_stack.blp b/data/ui/image_stack.blp
index 478bc8c..021388b 100644
--- a/data/ui/image_stack.blp
+++ b/data/ui/image_stack.blp
@@ -94,7 +94,7 @@ template $GradiaImageStack: Adw.Bin {
icon-name: "sidebar-show-symbolic";
tooltip-text: _("Open Sidebar");
action-name: "win.sidebar-shown";
- action-target: true;
+ action-target: "true";
visible: false;
styles [
+4
View File
@@ -55,6 +55,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
tesseract
];
patches = [
./0001-fix-image_stack-action-target-type.patch
];
postPatch = ''
substituteInPlace meson.build \
--replace "/app/bin/tesseract" "${lib.getExe tesseract}"
+5 -9
View File
@@ -9,23 +9,24 @@
stdenv.mkDerivation (finalAttrs: {
pname = "greed";
version = "4.3";
version = "4.5";
src = fetchFromGitLab {
owner = "esr";
repo = "greed";
tag = finalAttrs.version;
hash = "sha256-NmX0hYHODe55N0edhdfdm0a/Yqm/UwkU/RREjYl3ePc=";
hash = "sha256-S2K6nn4WS1gOvhlYK/UH1hfA0pzij4w5SeP004WVZik=";
};
postPatch = ''
substituteInPlace Makefile \
--replace-fail "-lcurses" "-lncurses" \
--replace-fail "BIN=/usr/games" "BIN=$out/bin" \
--replace-fail "/usr/share" "$out/share" \
--replace-fail "/usr/games/lib/greed.hs" "/var/lib/greed/greed.hs"
'';
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
makeFlags = [ "PREFIX=$(out)" ];
buildInputs = [
ncurses
];
@@ -34,11 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
asciidoctor
];
preInstall = ''
mkdir -p $out/bin
mkdir -p $out/share/man/man6
'';
passthru = {
updateScript = gitUpdater { };
};
+3 -3
View File
@@ -94,12 +94,12 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hey-mail";
version = "1.2.17";
rev = "28";
version = "1.3.1";
rev = "29";
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/lfWUNpR7PrPGsDfuxIhVxbj0wZHoH7bK_${finalAttrs.rev}.snap";
hash = "sha512-X4iJ8r0VFHD+dtFkyABUEFeoI3CSpmT70JjgJGsW7nqzCLriF4eekdHKJgySusnLW250RlEVtEO5wKMW+2bqCQ==";
hash = "sha512-mDMFD5G+TWpcCDNphvHegwlVGebw4aauShq7wJRF7F+iXX7E65+S00JpYWHu8PhUQeoVK4DkA4JkLfMq0D2lHA==";
};
nativeBuildInputs = [
+38 -8
View File
@@ -1,28 +1,58 @@
{
fetchFromGitHub,
lib,
python3Packages,
fetchPypi,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "hpp2plantuml";
version = "0.8.6";
format = "wheel";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
format = "wheel";
hash = "sha256-9FggDDOxWr4z1DBbvYLyvgs3CCguFjq3I4E9ULwL0+Q=";
src = fetchFromGitHub {
owner = "thibaultmarin";
repo = "hpp2plantuml";
tag = "v${finalAttrs.version}";
hash = "sha256-8OmZfXPkRO8lgxTH6eedaiYLn0HGf+T7L+AxoA2amkQ=";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [
setuptools
];
dependencies = with python3Packages; [
jinja2
cppheaderparser
];
buildInputs = with python3Packages; [
sphinx
numpydoc
];
# argparse is part of the Python standard library since Python 3.2;
# the PyPI package is only a backport for older Python versions.
# robotpy-cppheaderparser is deprecated and not packaged in nixpkgs;
# we use the original cppheaderparser instead which provides the same
# CppHeaderParser Python module but has known incompatibilities (nested classes, template formatting)
# causing some functionality to break — see disabledTests below.
pythonRemoveDeps = [
"argparse"
"robotpy-cppheaderparser"
];
pythonImportsCheck = [ "hpp2plantuml" ];
nativeCheckInputs = with python3Packages; [ pytest ];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
# These tests fail because upstream expects robotpy-cppheaderparser (a fork)
# but we use the original cppheaderparser which has slightly different
# behaviour (template formatting and parent field type differences).
disabledTests = [
"test_list_entries"
"test_full_files"
"test_main_function"
];
meta = {
description = "Convert C++ header files to PlantUML";
+3 -9
View File
@@ -2,6 +2,7 @@
lib,
fetchzip,
stdenvNoCC,
installFonts,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
@@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -Dm644 Hubot\ Sans/TTF/*.ttf -t $out/share/fonts/truetype/
install -Dm644 Hubot\ Sans/OTF/*.otf -t $out/share/fonts/opentype/
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
description = "Variable font from GitHub";
@@ -37,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
of a typeface to be incorporated into one single file, and are supported
by all major browsers.
'';
maintainers = [ ];
maintainers = with lib.maintainers; [ pancaek ];
platforms = lib.platforms.all;
};
})
+2 -2
View File
@@ -151,13 +151,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "inspircd";
version = "4.9.0";
version = "4.10.0";
src = fetchFromGitHub {
owner = "inspircd";
repo = "inspircd";
rev = "v${finalAttrs.version}";
sha256 = "sha256-DoXf0F7tjfQZRFMrVECrlRlJLt7PymjwHSg9+4RLH00=";
sha256 = "sha256-VmMfGpX6TcCuXuJmTptE51TL8cwavceDcOBeW0ipC4o=";
};
outputs = [
+2 -2
View File
@@ -29,11 +29,11 @@ let
in
stdenv.mkDerivation rec {
pname = "intune-portal";
version = "1.2511.7-noble";
version = "1.2603.31-noble";
src = fetchurl {
url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
hash = "sha256-MHvAmkemx28ZNcVloFNxJ03YbxrgVPvB7OOMYR6Oyo8=";
hash = "sha256-0braaXnRa04CUQdJx0ZFwe5qfjsJNzTtGqaKQV5Z6Yw=";
};
nativeBuildInputs = [ dpkg ];
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "isolate";
version = "2.2";
version = "2.3";
src = fetchFromGitHub {
owner = "ioi";
repo = "isolate";
rev = "v${finalAttrs.version}";
hash = "sha256-AacKIRS/Ah1KoE+bz+lK2GPbS3F3ifBGXvvCFWMd7hs=";
hash = "sha256-z/23k6F9XHbJDFld9tjIafUZzbUDEWAnbLvAoaEAilQ=";
};
nativeBuildInputs = [
+6 -11
View File
@@ -2,31 +2,26 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "jigmo";
version = "20250912";
src = fetchzip {
url = "https://kamichikoichi.github.io/jigmo/Jigmo-${version}.zip";
url = "https://kamichikoichi.github.io/jigmo/Jigmo-${finalAttrs.version}.zip";
hash = "sha256-Z9WYPqNjHqnYjRndxtHsQ9XhFshMR50hVkQsXgUMKE8=";
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype/
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
description = "Japanese Kanji font set which is the official successor to Hanazono Mincho";
homepage = "https://kamichikoichi.github.io/jigmo/";
license = lib.licenses.cc0;
maintainers = [ ];
maintainers = with lib.maintainers; [ pancaek ];
platforms = lib.platforms.all;
};
}
})
+5 -10
View File
@@ -2,24 +2,19 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "jost";
version = "3.5";
src = fetchzip {
url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip";
url = "https://github.com/indestructible-type/Jost/releases/download/${finalAttrs.version}/Jost.zip";
hash = "sha256-ne81bMhmTzNZ/GGIzb7nCYh19vNLK+hJ3cP/zDxtiGM=";
};
installPhase = ''
runHook preInstall
install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://github.com/indestructible-type/Jost";
@@ -27,4 +22,4 @@ stdenvNoCC.mkDerivation rec {
license = lib.licenses.ofl;
maintainers = [ lib.maintainers.ar1a ];
};
}
})
+4 -3
View File
@@ -17,7 +17,7 @@
withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
}:
let
version = "1.48.1";
version = "1.49.0";
in
rustPlatform.buildRustPackage {
inherit version;
@@ -34,10 +34,10 @@ rustPlatform.buildRustPackage {
owner = "casey";
repo = "just";
tag = version;
hash = "sha256-w4u9grbK+L1q497qr04oARNonVuoiUs2d9eTC115T+s=";
hash = "sha256-4vUcKHoQto4TQce4y4/MwdES0+PPlSjNvzLW77FodWs=";
};
cargoHash = "sha256-bcepiMLdo8YNpkYGLoLUCcZ0f3l5tpMaRDUPhO86FEY=";
cargoHash = "sha256-5hhwzkNgF+i5aCUoVh1VNfkNJFttyy5cLhBwu8uHmAQ=";
nativeBuildInputs =
lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage {
export USER=just-user
export USERNAME=just-user
export JUST_CHOOSER="${coreutils}/bin/cat"
export XDG_RUNTIME_DIR=$(mktemp -d)
# Prevent string.rs from being changed
cp tests/string.rs $TMPDIR/string.rs
+4 -4
View File
@@ -14,23 +14,23 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "kiro-cli";
version = "1.28.1";
version = "1.29.3";
src =
let
darwinDmg = fetchurl {
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
hash = "sha256-kqt+iOQeXJZKMTGMOWgad2GzBEy5nEFAyZ6Lvwlo5uA=";
hash = "sha256-JjdZfkcWZhnGaVvTwgm1GdenM3OLhfVRYpuZ9Y/t/+E=";
};
in
{
x86_64-linux = fetchurl {
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz";
hash = "sha256-WxSzjaHyZp7fbFdDcEwMmJWyjZ8iDJwp4O8aQudjhLY=";
hash = "sha256-DD3eQ9lpV+M0d40AxnLP6dOw/fvdeuAcPWwpUMonuNk=";
};
aarch64-linux = fetchurl {
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
hash = "sha256-XEVO9sOu4ctFYV53Ntp1J/19Pi2iIAGXqzx909ANzpw=";
hash = "sha256-3c3zSSZNwY13Vr2k4raKaTp05XX4gh5LrAAvMU22UMM=";
};
x86_64-darwin = darwinDmg;
aarch64-darwin = darwinDmg;
+63 -63
View File
@@ -167,16 +167,16 @@
},
{
"name": "illuminate/collections",
"version": "v13.2.0",
"version": "v13.3.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
"reference": "adf06b38984b02ce29297b1489f0c757c56bff15"
"reference": "389c5008087f8c48d35b85585b4315107b5a0f9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/collections/zipball/adf06b38984b02ce29297b1489f0c757c56bff15",
"reference": "adf06b38984b02ce29297b1489f0c757c56bff15",
"url": "https://api.github.com/repos/illuminate/collections/zipball/389c5008087f8c48d35b85585b4315107b5a0f9e",
"reference": "389c5008087f8c48d35b85585b4315107b5a0f9e",
"shasum": ""
},
"require": {
@@ -222,11 +222,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-03-23T14:32:36+00:00"
"time": "2026-03-30T19:06:46+00:00"
},
{
"name": "illuminate/conditionable",
"version": "v13.2.0",
"version": "v13.3.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/conditionable.git",
@@ -272,16 +272,16 @@
},
{
"name": "illuminate/contracts",
"version": "v13.2.0",
"version": "v13.3.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
"reference": "6728b11fd8748dea0206e0b21c993cb8ae7ce426"
"reference": "8796cc5f30124b81210ae2f3b2ae0f69ad4fc7f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/6728b11fd8748dea0206e0b21c993cb8ae7ce426",
"reference": "6728b11fd8748dea0206e0b21c993cb8ae7ce426",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/8796cc5f30124b81210ae2f3b2ae0f69ad4fc7f8",
"reference": "8796cc5f30124b81210ae2f3b2ae0f69ad4fc7f8",
"shasum": ""
},
"require": {
@@ -316,11 +316,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-03-20T15:16:26+00:00"
"time": "2026-03-26T17:13:01+00:00"
},
{
"name": "illuminate/filesystem",
"version": "v13.2.0",
"version": "v13.3.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/filesystem.git",
@@ -387,16 +387,16 @@
},
{
"name": "illuminate/macroable",
"version": "v13.2.0",
"version": "v13.3.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
"reference": "fca71b5b0b1291a69a0383b886b9835410f45358"
"reference": "f108cb3a8680f26e23c6ce7367c64525412d85b0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/macroable/zipball/fca71b5b0b1291a69a0383b886b9835410f45358",
"reference": "fca71b5b0b1291a69a0383b886b9835410f45358",
"url": "https://api.github.com/repos/illuminate/macroable/zipball/f108cb3a8680f26e23c6ce7367c64525412d85b0",
"reference": "f108cb3a8680f26e23c6ce7367c64525412d85b0",
"shasum": ""
},
"require": {
@@ -429,11 +429,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-02-25T16:07:55+00:00"
"time": "2026-03-28T19:16:13+00:00"
},
{
"name": "illuminate/reflection",
"version": "v13.2.0",
"version": "v13.3.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/reflection.git",
@@ -484,16 +484,16 @@
},
{
"name": "illuminate/support",
"version": "v13.2.0",
"version": "v13.3.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "4ae94d59ea40bc6293ef3c087fc53a1f35619576"
"reference": "f31e168e236a90d96d7894cd1f107b1ba095de69"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/4ae94d59ea40bc6293ef3c087fc53a1f35619576",
"reference": "4ae94d59ea40bc6293ef3c087fc53a1f35619576",
"url": "https://api.github.com/repos/illuminate/support/zipball/f31e168e236a90d96d7894cd1f107b1ba095de69",
"reference": "f31e168e236a90d96d7894cd1f107b1ba095de69",
"shasum": ""
},
"require": {
@@ -559,7 +559,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-03-21T01:01:22+00:00"
"time": "2026-03-30T13:32:27+00:00"
},
{
"name": "laravel/prompts",
@@ -879,16 +879,16 @@
},
{
"name": "symfony/clock",
"version": "v8.0.0",
"version": "v8.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/clock.git",
"reference": "832119f9b8dbc6c8e6f65f30c5969eca1e88764f"
"reference": "b55a638b189a6faa875e0ccdb00908fb87af95b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/clock/zipball/832119f9b8dbc6c8e6f65f30c5969eca1e88764f",
"reference": "832119f9b8dbc6c8e6f65f30c5969eca1e88764f",
"url": "https://api.github.com/repos/symfony/clock/zipball/b55a638b189a6faa875e0ccdb00908fb87af95b3",
"reference": "b55a638b189a6faa875e0ccdb00908fb87af95b3",
"shasum": ""
},
"require": {
@@ -932,7 +932,7 @@
"time"
],
"support": {
"source": "https://github.com/symfony/clock/tree/v8.0.0"
"source": "https://github.com/symfony/clock/tree/v8.0.8"
},
"funding": [
{
@@ -952,20 +952,20 @@
"type": "tidelift"
}
],
"time": "2025-11-12T15:46:48+00:00"
"time": "2026-03-30T15:14:47+00:00"
},
{
"name": "symfony/console",
"version": "v7.4.7",
"version": "v7.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "e1e6770440fb9c9b0cf725f81d1361ad1835329d"
"reference": "1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/e1e6770440fb9c9b0cf725f81d1361ad1835329d",
"reference": "e1e6770440fb9c9b0cf725f81d1361ad1835329d",
"url": "https://api.github.com/repos/symfony/console/zipball/1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707",
"reference": "1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707",
"shasum": ""
},
"require": {
@@ -1030,7 +1030,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v7.4.7"
"source": "https://github.com/symfony/console/tree/v7.4.8"
},
"funding": [
{
@@ -1050,7 +1050,7 @@
"type": "tidelift"
}
],
"time": "2026-03-06T14:06:20+00:00"
"time": "2026-03-30T13:54:39+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -1121,16 +1121,16 @@
},
{
"name": "symfony/finder",
"version": "v8.0.6",
"version": "v8.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c"
"reference": "8da41214757b87d97f181e3d14a4179286151007"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/441404f09a54de6d1bd6ad219e088cdf4c91f97c",
"reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c",
"url": "https://api.github.com/repos/symfony/finder/zipball/8da41214757b87d97f181e3d14a4179286151007",
"reference": "8da41214757b87d97f181e3d14a4179286151007",
"shasum": ""
},
"require": {
@@ -1165,7 +1165,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v8.0.6"
"source": "https://github.com/symfony/finder/tree/v8.0.8"
},
"funding": [
{
@@ -1185,7 +1185,7 @@
"type": "tidelift"
}
],
"time": "2026-01-29T09:41:02+00:00"
"time": "2026-03-30T15:14:47+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -1684,16 +1684,16 @@
},
{
"name": "symfony/process",
"version": "v7.4.5",
"version": "v7.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "608476f4604102976d687c483ac63a79ba18cc97"
"reference": "60f19cd3badc8de688421e21e4305eba50f8089a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/608476f4604102976d687c483ac63a79ba18cc97",
"reference": "608476f4604102976d687c483ac63a79ba18cc97",
"url": "https://api.github.com/repos/symfony/process/zipball/60f19cd3badc8de688421e21e4305eba50f8089a",
"reference": "60f19cd3badc8de688421e21e4305eba50f8089a",
"shasum": ""
},
"require": {
@@ -1725,7 +1725,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v7.4.5"
"source": "https://github.com/symfony/process/tree/v7.4.8"
},
"funding": [
{
@@ -1745,7 +1745,7 @@
"type": "tidelift"
}
],
"time": "2026-01-26T15:07:59+00:00"
"time": "2026-03-24T13:12:05+00:00"
},
{
"name": "symfony/service-contracts",
@@ -1836,16 +1836,16 @@
},
{
"name": "symfony/string",
"version": "v8.0.6",
"version": "v8.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4"
"reference": "ae9488f874d7603f9d2dfbf120203882b645d963"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/6c9e1108041b5dce21a9a4984b531c4923aa9ec4",
"reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4",
"url": "https://api.github.com/repos/symfony/string/zipball/ae9488f874d7603f9d2dfbf120203882b645d963",
"reference": "ae9488f874d7603f9d2dfbf120203882b645d963",
"shasum": ""
},
"require": {
@@ -1902,7 +1902,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v8.0.6"
"source": "https://github.com/symfony/string/tree/v8.0.8"
},
"funding": [
{
@@ -1922,20 +1922,20 @@
"type": "tidelift"
}
],
"time": "2026-02-09T10:14:57+00:00"
"time": "2026-03-30T15:14:47+00:00"
},
{
"name": "symfony/translation",
"version": "v8.0.6",
"version": "v8.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "13ff19bcf2bea492d3c2fbeaa194dd6f4599ce1b"
"reference": "27c03ae3940de24ba2f71cfdbac824f2aa1fdf2f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/13ff19bcf2bea492d3c2fbeaa194dd6f4599ce1b",
"reference": "13ff19bcf2bea492d3c2fbeaa194dd6f4599ce1b",
"url": "https://api.github.com/repos/symfony/translation/zipball/27c03ae3940de24ba2f71cfdbac824f2aa1fdf2f",
"reference": "27c03ae3940de24ba2f71cfdbac824f2aa1fdf2f",
"shasum": ""
},
"require": {
@@ -1995,7 +1995,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v8.0.6"
"source": "https://github.com/symfony/translation/tree/v8.0.8"
},
"funding": [
{
@@ -2015,7 +2015,7 @@
"type": "tidelift"
}
],
"time": "2026-02-17T13:07:04+00:00"
"time": "2026-03-30T15:14:47+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -2413,11 +2413,11 @@
},
{
"name": "phpstan/phpstan",
"version": "2.1.44",
"version": "2.1.46",
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/4a88c083c668b2c364a425c9b3171b2d9ea5d218",
"reference": "4a88c083c668b2c364a425c9b3171b2d9ea5d218",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a193923fc2d6325ef4e741cf3af8c3e8f54dbf25",
"reference": "a193923fc2d6325ef4e741cf3af8c3e8f54dbf25",
"shasum": ""
},
"require": {
@@ -2462,7 +2462,7 @@
"type": "github"
}
],
"time": "2026-03-25T17:34:21+00:00"
"time": "2026-04-01T09:25:14+00:00"
},
{
"name": "phpunit/php-code-coverage",
+3 -3
View File
@@ -7,19 +7,19 @@
}:
php.buildComposerProject2 (finalAttrs: {
pname = "laravel";
version = "5.24.10";
version = "5.25.2";
src = fetchFromGitHub {
owner = "laravel";
repo = "installer";
tag = "v${finalAttrs.version}";
hash = "sha256-JPfsj20kLsefav6NiKA7QRADIzvKCCkFxNIeym7MYIY=";
hash = "sha256-tQBJ156KYcCVwf+xNzCL+4rh/ru1imTiD4Uu8vD16sw=";
};
nativeBuildInputs = [ makeWrapper ];
composerLock = ./composer.lock;
vendorHash = "sha256-UefQzIwq6w9CL6zMHsco/Yyei9hqxNqdb6XMdCU+MXo=";
vendorHash = "sha256-nasF4IHxGvOQHVJ6S6+a8DA5iSvDvyH3Oxw8Zw4MdAY=";
# Adding npm (nodejs) and php composer to path
postInstall = ''
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "leetgo";
version = "1.4.16";
version = "1.4.17";
src = fetchFromGitHub {
owner = "j178";
repo = "leetgo";
rev = "v${finalAttrs.version}";
hash = "sha256-rhMEeVkH9Z0pvtOtxooZKaiIQYyc067vqdSB9SIvqxg=";
hash = "sha256-FxXU1A9pnVMzD0fTo2QgZvZYC40UwHlJja69WCCXD0k=";
};
vendorHash = "sha256-nKGLjpxtjcoR1mO1/ZhDoLubzfkws2nE5qvk2jqYGf4=";
vendorHash = "sha256-ODSzzEj7r8itbsEeXutLyXxGZ/7q7BZbGQ1kRN4RSfc=";
nativeBuildInputs = [ installShellFiles ];
+6 -6
View File
@@ -7,12 +7,12 @@
let
pname = "lmstudio";
version_aarch64-linux = "0.4.8-1";
hash_aarch64-linux = "sha256-3Hk67hRlGdL3ODqgL9CaG+WZpKmGW7fLoxxvB3J/gc0=";
version_aarch64-darwin = "0.4.8-1";
hash_aarch64-darwin = "sha256-14yQI67dv3R1EqyCzoHfprD2+Vuj5YHRn36tb3U/htw=";
version_x86_64-linux = "0.4.8-1";
hash_x86_64-linux = "sha256-gbLq6nY3Jdo2nZYWbh0XEVojrqkO5noZLV/lw4TaEs8=";
version_aarch64-linux = "0.4.9-1";
hash_aarch64-linux = "sha256-fQgXmhkbqTjbW/pyPvyZsIxtkQanpgh1DkzyrbFH6t8=";
version_aarch64-darwin = "0.4.9-1";
hash_aarch64-darwin = "sha256-MuvYJ5mVC6Usz37DF/TG4M8gOHsKG2uN9qzq+dXNa7M=";
version_x86_64-linux = "0.4.9-1";
hash_x86_64-linux = "sha256-+vn8gExfdfbYUBVzc59kCDlw7nEbFIyGR0fF9sFFodo=";
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
+47
View File
@@ -0,0 +1,47 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation {
pname = "loki-tool";
version = "0-unstable-2016-06-27";
src = fetchFromGitHub {
owner = "djrbliss";
repo = "loki";
rev = "784e86f981b7b1c30bd0d6b401f071e47e738eb8";
hash = "sha256-yeLTQP8TYDkaMmynRxmATPi2/5VxkUZsYd44UQwz4PY=";
};
strictDeps = true;
# Static build does not work on darwin due to linker issues
postPatch = ''
substituteInPlace Makefile --replace-fail \
"CFLAGS += -g -static -Wall" "CFLAGS += -g -Wall"
'';
# Default build target tries to compile binary for Android
buildPhase = ''
runHook preBuild
make CC=cc loki_tool
runHook postBuild
'';
# Upstream has no install target
installPhase = ''
runHook preInstall
install -Dm555 loki_tool -t $out/bin
runHook postInstall
'';
meta = {
homepage = "https://github.com/djrbliss/loki";
description = "Tool for custom firmware on AT&T/Verizon Samsung and LG devices";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ ungeskriptet ];
teams = [ lib.teams.android ];
mainProgram = "loki_tool";
};
}
+5 -5
View File
@@ -3,6 +3,7 @@
stdenvNoCC,
fetchFromGitHub,
nix-update-script,
installFonts,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
@@ -21,13 +22,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
passthru.updateScript = nix-update-script { };
nativeBuildInputs = [ installFonts ];
# installFonts adds a hook to `postInstall` that installs fonts
# into the correct directories
installPhase = ''
runHook preInstall
install -Dm444 -t $out/share/fonts/truetype $src/fonts/ttf/*.ttf
install -Dm444 -t $out/share/fonts/opentype $src/fonts/otf/*.otf
install -Dm444 -t $out/share/fonts/variable $src/fonts/variable/*.ttf
runHook postInstall
'';
+3 -3
View File
@@ -33,16 +33,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ludusavi";
version = "0.30.0";
version = "0.31.0";
src = fetchFromGitHub {
owner = "mtkennerly";
repo = "ludusavi";
tag = "v${finalAttrs.version}";
hash = "sha256-tN0z9kSiSnbto8SyZE3y3pGBJObBksoRxAIKC5OBAxc=";
hash = "sha256-S2yN0WLG2tUxkqR9xe466VE+QgDQcSNgyNjvjTjTY7Q=";
};
cargoHash = "sha256-1zoG0UymnEMHMnVaboSDqYMZsObuuzxtwsjCfjeZaa0=";
cargoHash = "sha256-nRqyzRl10xRMLR5hxSaaMxBArgScoV2/iCvMkN9zH/4=";
dontWrapGApps = true;
+3 -3
View File
@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mago";
version = "1.13.3";
version = "1.18.1";
src = fetchFromGitHub {
owner = "carthage-software";
repo = "mago";
tag = finalAttrs.version;
hash = "sha256-t1KowYGQgrsVroPUpUq8dZYPwVhGVImnzmbnUOlzPAY=";
hash = "sha256-Y18ab4Xh/R54H91sWVqKVDxc1OmVrQh/LB2eMmIjs04=";
forceFetchGit = true; # Does not download all files otherwise
};
cargoHash = "sha256-UIz+q9u8gKXP+ewp8uXew5/cAMWOr3VGWWLjV/fip9M=";
cargoHash = "sha256-Jq/11J3diOe/z0W6smnmmbdeFdX1vOO3sn+KZ/Z/6M8=";
env = {
# Get openssl-sys to use pkg-config
+35
View File
@@ -0,0 +1,35 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation {
pname = "mboot";
version = "0-unstable-2022-11-10";
src = fetchFromGitHub {
owner = "osm0sis";
repo = "mboot";
rev = "39f59a4f1b6a754c8953172fb80cb2ea1221ed20";
hash = "sha256-xpVokOb4cenrrlORNIl58NuOSnaVyCIxRbyunRpix1U=";
};
strictDeps = true;
# Unstream has an install target, but installs mboot as `$out/bin`
# instead of `$out/bin/mboot`
installPhase = ''
runHook preInstall
install -Dm555 mboot -t $out/bin
runHook postInstall
'';
meta = {
homepage = "https://github.com/osm0sis/mboot";
description = "Tool to pack and unpack Intel Android boot files";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ ungeskriptet ];
teams = [ lib.teams.android ];
mainProgram = "mboot";
};
}
+2 -7
View File
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
}:
let
@@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation {
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://dotcolon.net/font/medio/";
+2 -7
View File
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
}:
let
@@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation {
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://dotcolon.net/font/melete/";
@@ -2,9 +2,10 @@
stdenvNoCC,
lib,
fetchFromGitHub,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation {
pname = "merriweather-sans";
version = "1.008";
@@ -18,12 +19,13 @@ stdenvNoCC.mkDerivation rec {
# TODO: it would be nice to build this from scratch, but lots of
# Python dependencies to package (fontmake, gftools)
installPhase = ''
install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
# TODO: install variable version?
'';
# TODO: packaging with python allow update and usage of variable/otf fonts
nativeBuildInputs = [ installFonts ];
outputs = [
"out"
"webfont"
];
meta = {
homepage = "https://github.com/SorkinType/Merriweather-Sans";
+12 -12
View File
@@ -2,29 +2,29 @@
stdenvNoCC,
lib,
fetchFromGitHub,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "merriweather";
version = "2.005";
version = "2.200";
src = fetchFromGitHub {
owner = "SorkinType";
repo = "Merriweather";
rev = "4fd88c9299009d1c1d201e7da3ff75cf1de5153a";
sha256 = "1ndycja2jzhcfbqbm0p6ka2zl1i1pdbkf0crw2lp3pi4k89wlm29";
rev = "6e3263d6241aeb747ebfcdd4af3ff8bd1013bb49";
sha256 = "sha256-mpVJpxI98VxHpZMFFyTHjxTPcUTB1kK8XCGa32znMcQ=";
};
# TODO: it would be nice to build this from scratch, but lots of
# Python dependencies to package (fontmake, gftools)
installPhase = ''
install -m444 -Dt $out/share/fonts/opentype/${pname} fonts/otf/*.otf
install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
# TODO: install variable version?
'';
nativeBuildInputs = [ installFonts ];
outputs = [
"out"
"webfont"
];
meta = {
homepage = "https://github.com/SorkinType/Merriweather";
@@ -33,4 +33,4 @@ stdenvNoCC.mkDerivation rec {
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ emily ];
};
}
})
+2 -4
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
installFonts,
}:
stdenv.mkDerivation {
@@ -15,10 +16,7 @@ stdenv.mkDerivation {
sha256 = "sha256-8xwVOlOP1SresbReNh1ce2Eu12KdIwdJSg6LKM+k2ng=";
};
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp $src/*.ttf $out/share/fonts/truetype
'';
nativeBuildInputs = [ installFonts ];
meta = {
description = "Meslo Nerd Font patched for Powerlevel10k";
@@ -25,11 +25,11 @@
}:
stdenv.mkDerivation rec {
pname = "microsoft-identity-broker";
version = "2.5.0";
version = "3.0.1";
src = fetchurl {
url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_${version}-noble_amd64.deb";
hash = "sha256-zid9kjjz3mBfJFfiYUoqlIyQSsR041JN3Ib+JFSSEbE=";
hash = "sha256-cbG+HJ1nuOyxR/sd1P69QTEUaklywbJOP7o6K7l6SEs=";
};
nativeBuildInputs = [
+5 -3
View File
@@ -9,16 +9,16 @@
buildGo126Module (finalAttrs: {
pname = "miniflux";
version = "2.2.18";
version = "2.2.19";
src = fetchFromGitHub {
owner = "miniflux";
repo = "v2";
tag = finalAttrs.version;
hash = "sha256-r5MFYdWV17u2ogxN01w9FpP/ErgqQmTEl5Nizg9FzCY=";
hash = "sha256-/zAO6LgT4BKGaLJNgfm2c0VCtpc/9jQmM6zmfnpJtYo=";
};
vendorHash = "sha256-F1FbenWzokNnF6xiZeqpu5HWs1PZo0WtlZX/ePTvBTE=";
vendorHash = "sha256-zQURNCImYB66agRnorqLzvQKNNZb1o9ZVOVuETjQ0RE=";
nativeBuildInputs = [ installShellFiles ];
@@ -31,6 +31,8 @@ buildGo126Module (finalAttrs: {
"-X miniflux.app/v2/internal/version.Version=${finalAttrs.version}"
];
__darwinAllowLocalNetworking = true;
postInstall = ''
mv $out/bin/miniflux.app $out/bin/miniflux
installManPage miniflux.1
+9 -9
View File
@@ -1,21 +1,21 @@
{
"version": "3.194.0",
"version": "3.198.0",
"assets": {
"x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.194.0/mirrord_linux_x86_64",
"hash": "sha256-6coP0EiDrTv0HNk+55C37d+eKhsOm25rQy42mRkoTy0="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.198.0/mirrord_linux_x86_64",
"hash": "sha256-JrfS4KGARmNGAWDLzmCkafjyPgk3NHIALEWMpoBmbWc="
},
"aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.194.0/mirrord_linux_aarch64",
"hash": "sha256-k8/kkhYYk+eHdekIwi2wFmn6mX7WiKuKtaOC3soBT6U="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.198.0/mirrord_linux_aarch64",
"hash": "sha256-As0ybf+UQ4+q0lCkpM+6VkvTWMt8mtfMKmrPm3eZIcY="
},
"aarch64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.194.0/mirrord_mac_universal",
"hash": "sha256-VwcqBf3Jq9H3wgNz5o/7oJ5Pz0nXBRkzDA7D51hIWe0="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.198.0/mirrord_mac_universal",
"hash": "sha256-uvAvNF1KKIfvjzgwmwVacXA/bEwHolCCqFoou5L8pXw="
},
"x86_64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.194.0/mirrord_mac_universal",
"hash": "sha256-VwcqBf3Jq9H3wgNz5o/7oJ5Pz0nXBRkzDA7D51hIWe0="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.198.0/mirrord_mac_universal",
"hash": "sha256-uvAvNF1KKIfvjzgwmwVacXA/bEwHolCCqFoou5L8pXw="
}
}
}
@@ -0,0 +1,40 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation {
pname = "mkbootimg-osm0sis";
version = "2022.11.09-unstable-2025-03-10";
src = fetchFromGitHub {
owner = "osm0sis";
repo = "mkbootimg";
rev = "17cea80bd5af64e45cdf9e263cad7555030e0e86";
hash = "sha256-5ilpgQS5ctMpxTJRa8Wty1B0mNN+77/fS2FThNfAKZk=";
};
strictDeps = true;
env.NIX_CFLAGS_COMPILE = toString (
lib.optional stdenv.cc.isGNU [
# Required with newer GCC
"-Wstringop-overflow=0"
]
);
installPhase = ''
runHook preInstall
install -Dm555 {mk,unpack}bootimg -t $out/bin
runHook postInstall
'';
meta = {
homepage = "https://github.com/osm0sis/mkbootimg";
description = "C rewrite of Android's boot image tools";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ ungeskriptet ];
teams = [ lib.teams.android ];
mainProgram = "mkbootimg";
};
}
+35
View File
@@ -0,0 +1,35 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation {
pname = "mkmtkhdr";
version = "0-unstable-2022-11-10";
src = fetchFromGitHub {
owner = "osm0sis";
repo = "mkmtkhdr";
rev = "be292c5295feb8158603c8575850208ea6218a78";
hash = "sha256-eXC4OpjDCziahhhH73cOUkTsm1VFJE6wTtSk6RD5tqA=";
};
strictDeps = true;
# Unstream has an install target, but installs mkmtkhdr as `$out/bin`
# instead of `$out/bin/mkmtkhdr`
installPhase = ''
runHook preInstall
install -Dm555 mkmtkhdr -t $out/bin
runHook postInstall
'';
meta = {
homepage = "https://github.com/osm0sis/mkmtkhdr";
description = "Tool to write MTK headers for split zImages and ramdisks";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ungeskriptet ];
teams = [ lib.teams.android ];
mainProgram = "mkmtkhdr";
};
}
+2 -4
View File
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchFromGitHub,
installFonts,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
@@ -15,10 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sha256 = "sha256-L1KlduItf1jBrw08NwbJvZFemLY8JHRXq2UDl9Wlq70=";
};
installPhase = ''
install -D -m444 -t $out/share/fonts/opentype fonts/static/otf/*.otf
install -D -m444 -t $out/share/fonts/truetype fonts/static/ttf/*.ttf fonts/variable/*.ttf
'';
nativeBuildInputs = [ installFonts ];
meta = {
description = "Variable font from GitHub";
+6 -8
View File
@@ -1,4 +1,8 @@
{ stdenvNoCC, fetchzip }:
{
stdenvNoCC,
fetchzip,
installFonts,
}:
stdenvNoCC.mkDerivation {
pname = "mph-2b-damase";
@@ -9,13 +13,7 @@ stdenvNoCC.mkDerivation {
hash = "sha256-4x78D+c3ZBxfhTQQ4+gyxvrsuztHF2ItXLh4uA0PxvU=";
};
installPhase = ''
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = { };
}
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mprisence";
version = "1.4.5";
version = "1.5.1";
src = fetchFromGitHub {
owner = "lazykern";
repo = "mprisence";
tag = "v${finalAttrs.version}";
hash = "sha256-xQA9wxEweoxguVhuTfG6RVODKUuaTWEsrQh5Me05eCw=";
hash = "sha256-0DJfYU71VFA5+jEz5Wq0HEyk5KFXv7tOgxpfTWMWemc=";
};
cargoHash = "sha256-KF/PYocZDgryXyhFj2eD5o0Tlxmgxd27SqqW54e/qdw=";
cargoHash = "sha256-OoZq7vm4tnxysur69Yv+jvudab2gh8r5WnO2taF9U8A=";
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -10,17 +10,17 @@
buildGoModule (finalAttrs: {
pname = "museum";
version = "1.3.24";
version = "1.3.28";
src = fetchFromGitHub {
owner = "ente-io";
repo = "ente";
sparseCheckout = [ "server" ];
tag = "photos-v${finalAttrs.version}";
hash = "sha256-ltWY/T4QSN9Si8s4XRvvcL9yB1+lLx+zM5Ahb9DAzQE=";
hash = "sha256-No4raRi4QVpoQUVcZE2RMQsCGPHikagHyx6mvsxsV8k=";
};
vendorHash = "sha256-r/zAAWyLe6VYztsZuYlwg0jozGf8cScUKIcIdtZ0LvQ=";
vendorHash = "sha256-KGwrXQdGbA5+Nn20s7a7U45t3D7i8Ti9en+nR16vzDs=";
sourceRoot = "${finalAttrs.src.name}/server";

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