Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-03-10 17:25:02 +00:00
committed by GitHub
114 changed files with 3339 additions and 31347 deletions
@@ -256,6 +256,8 @@
- `kmonad` is now hardened by default using common `systemd` settings.
If KMonad is used to execute shell commands, hardening may make some of them fail. In that case, you can disable hardening using {option}`services.kmonad.keyboards.<name>.enableHardening` option.
- `isd` was updated from 0.2.0 to 0.5.1, the new version may crash with a previously generated config, try moving or deleting `~/.config/isd/schema.json`.
- `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.:
```diff
-services.asusd.asusdConfig = '''file contents'''
+17 -14
View File
@@ -45,6 +45,19 @@ let
isNixAtLeast = versionAtLeast (getVersion nixPackage);
defaultSystemFeatures = [
"nixos-test"
"benchmark"
"big-parallel"
"kvm"
] ++ optionals (pkgs.stdenv.hostPlatform ? gcc.arch) (
# a builder can run code for `gcc.arch` and inferior architectures
[ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ]
++ map (x: "gccarch-${x}") (
systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [ ]
)
);
legacyConfMappings = {
useSandbox = "sandbox";
buildCores = "cores";
@@ -315,20 +328,9 @@ in
system-features = mkOption {
type = types.listOf types.str;
default =
[
"nixos-test"
"benchmark"
"big-parallel"
"kvm"
]
++ optionals (pkgs.stdenv.hostPlatform ? gcc.arch) (
# a builder can run code for `gcc.arch` and inferior architectures
[ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ]
++ map (x: "gccarch-${x}") (
systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [ ]
)
);
# We expose system-featuers here and in config below.
# This allows users to access the default value via `options.nix.settings.system-features`
default = defaultSystemFeatures;
defaultText = literalExpression ''[ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-<arch>" ]'';
description = ''
The set of features supported by the machine. Derivations
@@ -385,6 +387,7 @@ in
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
trusted-users = [ "root" ];
substituters = mkAfter [ "https://cache.nixos.org/" ];
system-features = defaultSystemFeatures;
};
};
}
+12 -6
View File
@@ -76,12 +76,18 @@
export TERM=$TERM
'';
security.sudo.extraConfig = lib.mkIf config.security.sudo.keepTerminfo ''
# Keep terminfo database for root and %wheel.
Defaults:root,%wheel env_keep+=TERMINFO_DIRS
Defaults:root,%wheel env_keep+=TERMINFO
'';
security =
let
extraConfig = ''
# Keep terminfo database for root and %wheel.
Defaults:root,%wheel env_keep+=TERMINFO_DIRS
Defaults:root,%wheel env_keep+=TERMINFO
'';
in
lib.mkIf config.security.sudo.keepTerminfo {
sudo = { inherit extraConfig; };
sudo-rs = { inherit extraConfig; };
};
};
}
+1 -1
View File
@@ -36,7 +36,7 @@ in
defaultOptions = lib.mkOption {
type = with lib.types; listOf str;
default = [ ];
default = [ "SETENV" ];
description = ''
Options used for the default rules, granting `root` and the
`wheel` group permission to run any command as any user.
+25 -6
View File
@@ -433,6 +433,25 @@ in
done
''}
${lib.optionalString isMariaDB ''
# If MariaDB is used in an Galera cluster, we have to check if the sync is done,
# or it will fail to init the database while joining, so we get in an broken non recoverable state
# so we wait until we have an synced state
if ${cfg.package}/bin/mysql -u ${superUser} -N -e "SHOW VARIABLES LIKE 'wsrep_on'" 2>/dev/null | ${lib.getExe' pkgs.gnugrep "grep"} -q 'ON'; then
echo "Galera cluster detected, waiting for node to be synced..."
while true; do
STATE=$(${cfg.package}/bin/mysql -u ${superUser} -N -e "SHOW STATUS LIKE 'wsrep_local_state_comment'" | ${lib.getExe' pkgs.gawk "awk"} '{print $2}')
if [ "$STATE" = "Synced" ]; then
echo "Node is synced"
break
else
echo "Current state: $STATE - Waiting for 1 second..."
sleep 1
fi
done
fi
''}
if [ -f ${cfg.dataDir}/mysql_init ]
then
# While MariaDB comes with a 'mysql' super user account since 10.4.x, MySQL does not
@@ -447,10 +466,10 @@ in
# Create initial databases
if ! test -e "${cfg.dataDir}/${database.name}"; then
echo "Creating initial database: ${database.name}"
( echo 'create database `${database.name}`;'
( echo 'CREATE DATABASE IF NOT EXISTS `${database.name}`;'
${lib.optionalString (database.schema != null) ''
echo 'use `${database.name}`;'
echo 'USE `${database.name}`;'
# TODO: this silently falls through if database.schema does not exist,
# we should catch this somehow and exit, but can't do it here because we're in a subshell.
@@ -469,7 +488,7 @@ in
${lib.optionalString (cfg.replication.role == "master") ''
# Set up the replication master
( echo "use mysql;"
( echo "USE mysql;"
echo "CREATE USER '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' IDENTIFIED WITH mysql_native_password;"
echo "SET PASSWORD FOR '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' = PASSWORD('${cfg.replication.masterPassword}');"
echo "GRANT REPLICATION SLAVE ON *.* TO '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}';"
@@ -479,9 +498,9 @@ in
${lib.optionalString (cfg.replication.role == "slave") ''
# Set up the replication slave
( echo "stop slave;"
echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"
echo "start slave;"
( echo "STOP SLAVE;"
echo "CHANGE MASTER TO MASTER_HOST='${cfg.replication.masterHost}', MASTER_USER='${cfg.replication.masterUser}', MASTER_PASSWORD='${cfg.replication.masterPassword}';"
echo "START SLAVE;"
) | ${cfg.package}/bin/mysql -u ${superUser} -N
''}
+7 -3
View File
@@ -53,10 +53,14 @@ let
p = cfg.package.override (
{
inherit phpCfg;
withPgsql = cfg.database.type == "pgsql";
withMysql = cfg.database.type == "mysql";
inherit (cfg) minifyStaticFiles;
}
// lib.optionalAttrs (cfg.database.type == "postgresql") {
withPostgreSQL = true;
}
// lib.optionalAttrs (cfg.database.type == "mysql") {
withMySQL = true;
}
// lib.optionalAttrs (lib.isAttrs cfg.minifyStaticFiles) (
with cfg.minifyStaticFiles;
{
@@ -500,7 +504,7 @@ in
};
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
environment.systemPackages = [ package ];
users = {
users =
+1 -1
View File
@@ -1052,7 +1052,7 @@ in {
stub-ld = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stub-ld.nix {};
stunnel = handleTest ./stunnel.nix {};
sudo = handleTest ./sudo.nix {};
sudo-rs = handleTest ./sudo-rs.nix {};
sudo-rs = runTest ./sudo-rs.nix;
sunshine = handleTest ./sunshine.nix {};
suricata = handleTest ./suricata.nix {};
suwayomi-server = handleTest ./suwayomi-server.nix {};
+121 -124
View File
@@ -1,140 +1,138 @@
# Some tests to ensure sudo is working properly.
{ pkgs, ... }:
let
inherit (pkgs.lib) mkIf optionalString;
password = "helloworld";
in
import ./make-test-python.nix (
{ lib, pkgs, ... }:
{
name = "sudo-rs";
meta.maintainers = pkgs.sudo-rs.meta.maintainers;
{
name = "sudo-rs";
meta.maintainers = pkgs.sudo-rs.meta.maintainers;
nodes.machine =
{ lib, ... }:
{
environment.systemPackages = [ pkgs.faketty ];
users.groups = {
foobar = { };
barfoo = { };
baz = {
gid = 1337;
};
nodes.machine =
{ lib, ... }:
{
environment.systemPackages = [ pkgs.faketty ];
users.groups = {
foobar = { };
barfoo = { };
baz = {
gid = 1337;
};
users.users = {
test0 = {
isNormalUser = true;
extraGroups = [ "wheel" ];
};
test1 = {
isNormalUser = true;
password = password;
};
test2 = {
isNormalUser = true;
extraGroups = [ "foobar" ];
password = password;
};
test3 = {
isNormalUser = true;
extraGroups = [ "barfoo" ];
};
test4 = {
isNormalUser = true;
extraGroups = [ "baz" ];
};
test5 = {
isNormalUser = true;
};
};
users.users = {
test0 = {
isNormalUser = true;
extraGroups = [ "wheel" ];
};
security.sudo-rs = {
enable = true;
wheelNeedsPassword = false;
extraRules = [
# SUDOERS SYNTAX CHECK (Test whether the module produces a valid output;
# errors being detected by the visudo checks.
# These should not create any entries
{
users = [ "notest1" ];
commands = [ ];
}
{
commands = [
{
command = "ALL";
options = [ ];
}
];
}
# Test defining commands with the options syntax, though not setting any options
{
users = [ "notest2" ];
commands = [
{
command = "ALL";
options = [ ];
}
];
}
# CONFIGURATION FOR TEST CASES
{
users = [ "test1" ];
groups = [ "foobar" ];
commands = [ "ALL" ];
}
{
groups = [
"barfoo"
1337
];
commands = [
{
command = "ALL";
options = [ "NOPASSWD" ];
}
];
}
{
users = [ "test5" ];
commands = [
{
command = "ALL";
options = [ "NOPASSWD" ];
}
];
runAs = "test1:barfoo";
}
];
test1 = {
isNormalUser = true;
password = password;
};
test2 = {
isNormalUser = true;
extraGroups = [ "foobar" ];
password = password;
};
test3 = {
isNormalUser = true;
extraGroups = [ "barfoo" ];
};
test4 = {
isNormalUser = true;
extraGroups = [ "baz" ];
};
test5 = {
isNormalUser = true;
};
};
nodes.strict =
{ ... }:
{
environment.systemPackages = [ pkgs.faketty ];
users.users = {
admin = {
isNormalUser = true;
extraGroups = [ "wheel" ];
};
noadmin = {
isNormalUser = true;
};
};
security.sudo-rs = {
enable = true;
wheelNeedsPassword = false;
security.sudo-rs = {
enable = true;
wheelNeedsPassword = false;
execWheelOnly = true;
extraRules = [
# SUDOERS SYNTAX CHECK (Test whether the module produces a valid output;
# errors being detected by the visudo checks.
# These should not create any entries
{
users = [ "notest1" ];
commands = [ ];
}
{
commands = [
{
command = "ALL";
options = [ ];
}
];
}
# Test defining commands with the options syntax, though not setting any options
{
users = [ "notest2" ];
commands = [
{
command = "ALL";
options = [ ];
}
];
}
# CONFIGURATION FOR TEST CASES
{
users = [ "test1" ];
groups = [ "foobar" ];
commands = [ "ALL" ];
}
{
groups = [
"barfoo"
1337
];
commands = [
{
command = "ALL";
options = [ "NOPASSWD" ];
}
];
}
{
users = [ "test5" ];
commands = [
{
command = "ALL";
options = [ "NOPASSWD" ];
}
];
runAs = "test1:barfoo";
}
];
};
};
nodes.strict =
{ ... }:
{
environment.systemPackages = [ pkgs.faketty ];
users.users = {
admin = {
isNormalUser = true;
extraGroups = [ "wheel" ];
};
noadmin = {
isNormalUser = true;
};
};
testScript = ''
security.sudo-rs = {
enable = true;
wheelNeedsPassword = false;
execWheelOnly = true;
};
};
testScript = # python
''
with subtest("users in wheel group should have passwordless sudo"):
machine.succeed('faketty -- su - test0 -c "sudo -u root true"')
@@ -165,5 +163,4 @@ import ./make-test-python.nix (
with subtest("non-wheel users should be unable to run sudo thanks to execWheelOnly"):
strict.fail('faketty -- su - noadmin -c "sudo --help"')
'';
}
)
}
@@ -497,6 +497,19 @@ final: prev:
meta.hydraPlatforms = [ ];
};
YankAssassin-vim = buildVimPlugin {
pname = "YankAssassin.vim";
version = "2022-03-11";
src = fetchFromGitHub {
owner = "svban";
repo = "YankAssassin.vim";
rev = "55ce478a08333c086bcccdf087453085f85854d4";
sha256 = "0w0g49knan6vmmpcdj8fvdn2bmyydpihf4jfyza6iy7gsk8kmr66";
};
meta.homepage = "https://github.com/svban/YankAssassin.vim/";
meta.hydraPlatforms = [ ];
};
YankRing-vim = buildVimPlugin {
pname = "YankRing.vim";
version = "2015-07-29";
@@ -1982,6 +1995,19 @@ final: prev:
meta.hydraPlatforms = [ ];
};
cmdalias-vim = buildVimPlugin {
pname = "cmdalias.vim";
version = "2010-10-18";
src = fetchFromGitHub {
owner = "vim-scripts";
repo = "cmdalias.vim";
rev = "fd3aea59d57f5fed1b835a0e545540c9781c4bb3";
sha256 = "1y34bmbzdmc1d404m2xiy4n0bz25wfarm7ybql9hsq8jc5pkzjjc";
};
meta.homepage = "https://github.com/vim-scripts/cmdalias.vim/";
meta.hydraPlatforms = [ ];
};
cmp-ai = buildVimPlugin {
pname = "cmp-ai";
version = "2025-01-06";
@@ -8927,6 +8953,19 @@ final: prev:
meta.hydraPlatforms = [ ];
};
neotest-mocha = buildVimPlugin {
pname = "neotest-mocha";
version = "2024-07-30";
src = fetchFromGitHub {
owner = "adrigzr";
repo = "neotest-mocha";
rev = "8239023d299a692784176f202f6a4a5e0a698ad2";
sha256 = "sha256-Fbe7xuu5Qy6GXKsvQbVcE5oG7dgKjghuX470V7sjmqA=";
};
meta.homepage = "https://github.com/adrigzr/neotest-mocha";
meta.hydraPlatforms = [ ];
};
neotest-pest = buildVimPlugin {
pname = "neotest-pest";
version = "2024-02-16";
@@ -17209,6 +17248,19 @@ final: prev:
meta.hydraPlatforms = [ ];
};
vim-jdaddy = buildVimPlugin {
pname = "vim-jdaddy";
version = "2022-03-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-jdaddy";
rev = "23b67752cb869dd9c8f3109173b69aa96a1f3acf";
sha256 = "1frkyq5zpwkwrrjcf0sscmr6q696vaaxnc0r93mk9psv5zbna4vl";
};
meta.homepage = "https://github.com/tpope/vim-jdaddy/";
meta.hydraPlatforms = [ ];
};
vim-jetpack = buildVimPlugin {
pname = "vim-jetpack";
version = "2025-02-20";
@@ -2070,6 +2070,15 @@ in
nvimSkipModule = "neotest-jest-assertions";
};
neotest-mocha = super.neotest-mocha.overrideAttrs {
dependencies = with self; [
neotest
nvim-nio
nvim-treesitter
plenary-nvim
];
};
neotest-minitest = super.neotest-minitest.overrideAttrs {
dependencies = with self; [
neotest
@@ -37,6 +37,7 @@ https://github.com/chrisbra/SudoEdit.vim/,,
https://github.com/hsitz/VimOrganizer/,,
https://github.com/VundleVim/Vundle.vim/,,
https://github.com/esneider/YUNOcommit.vim/,,
https://github.com/svban/YankAssassin.vim/,HEAD,
https://github.com/vim-scripts/YankRing.vim/,,
https://github.com/ycm-core/YouCompleteMe/,,
https://github.com/vim-scripts/a.vim/,,
@@ -151,6 +152,7 @@ https://github.com/laytan/cloak.nvim/,HEAD,
https://github.com/asheq/close-buffers.vim/,HEAD,
https://github.com/Civitasv/cmake-tools.nvim/,,
https://github.com/winston0410/cmd-parser.nvim/,,
https://github.com/vim-scripts/cmdalias.vim/,HEAD,
https://github.com/tzachar/cmp-ai/,HEAD,
https://github.com/crispgm/cmp-beancount/,HEAD,
https://github.com/hrsh7th/cmp-buffer/,,
@@ -683,6 +685,7 @@ https://github.com/alfaix/neotest-gtest/,HEAD,
https://github.com/MrcJkb/neotest-haskell/,HEAD,
https://github.com/rcasia/neotest-java/,HEAD,
https://github.com/nvim-neotest/neotest-jest/,HEAD,
https://github.com/adrigzr/neotest-mocha/,HEAD,
https://github.com/zidhuss/neotest-minitest/,HEAD,
https://github.com/theutz/neotest-pest/,HEAD,
https://github.com/olimorris/neotest-phpunit/,HEAD,
@@ -1320,6 +1323,7 @@ https://github.com/mhinz/vim-janah/,,
https://github.com/artur-shaik/vim-javacomplete2/,,
https://github.com/pangloss/vim-javascript/,,
https://github.com/jelera/vim-javascript-syntax/,,
https://github.com/tpope/vim-jdaddy/,HEAD,
https://github.com/tani/vim-jetpack/,HEAD,
https://github.com/lepture/vim-jinja/,,
https://github.com/seirl/vim-jinja-languages/,HEAD,
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "xfe";
version = "1.46.2";
version = "2.0";
src = fetchurl {
url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz";
sha256 = "sha256-6hNNda4BKCY9E02uFYJnt0JySNp/is1ZqjFlOwQcRWs=";
sha256 = "sha256-oGqBZjBL/Uc1+ZJZCVnUxwFvWAT+2mQGZgygTZuymEg=";
};
nativeBuildInputs = [
@@ -16,7 +16,7 @@
libGL,
}:
let
buildNumber = "1294";
buildNumber = "1295";
vaqua = fetchurl {
name = "VAqua9.jar";
url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";
@@ -61,15 +61,19 @@ let
in
stdenv.mkDerivation rec {
pname = "processing";
version = "4.3.1";
version = "4.3.2";
src = fetchFromGitHub {
owner = "processing";
repo = "processing4";
rev = "processing-${buildNumber}-${version}";
sha256 = "sha256-nshhPeDXhrvk+2oQ9BPqJTZV9a+OjxeQiO31JAxQ40g=";
sha256 = "sha256-jUkWnkP8up5vpaXfgFJ/jQjN1KfeX5EuYXSb+W6NEms=";
};
# Processing did not update the todo.txt file before tagging this release, so
# the "revision-check" Ant target fails.
patches = [ ./disable-revision-check.patch ];
nativeBuildInputs = [
ant
unzip
@@ -0,0 +1,13 @@
diff --git a/build/build.xml b/build/build.xml
index 8ad556c11..e61b6ae45 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -453,8 +453,6 @@
<!-- the revision.base property won't be set
if $revision wasn't found... -->
- <fail unless="revision.correct"
- message="Fix revision number in Base.java" />
</target>
+9 -6
View File
@@ -39,15 +39,18 @@ stdenv.mkDerivation rec {
SDL_gfx
];
env.NIX_CFLAGS_COMPILE = toString (makeSDLFlags [
SDL
SDL_image
SDL_ttf
SDL_gfx
]);
env.NIX_CFLAGS_COMPILE =
toString (makeSDLFlags [
SDL
SDL_image
SDL_ttf
SDL_gfx
])
+ " -lSDL";
patches = [
./parse.patch # Fixes compilation error by avoiding redundant definitions.
./sdl-error.patch # Adds required include for SDL_GetError.
];
meta = with lib; {
@@ -0,0 +1,11 @@
diff --git a/src/presenter.c b/src/presenter.c
index a082541..74bfbec 100644
--- a/src/presenter.c
+++ b/src/presenter.c
@@ -5,5 +5,6 @@
#include <stdlib.h>
#include "SDL_ttf.h"
+#include <SDL/SDL_error.h>
#include "presenter.h"
#include "execute.h"
#include "list.h"
File diff suppressed because it is too large Load Diff
@@ -66,13 +66,8 @@ in
sourceRoot = "${finalAttrs.src.name}/gephgui-wry";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tao-0.5.2" = "sha256-HyQyPRoAHUcgtYgaAW7uqrwEMQ45V+xVSxmlAZJfhv0=";
"wry-0.12.2" = "sha256-kTMXvignEF3FlzL0iSlF6zn1YTOCpyRUDN8EHpUS+yI=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-pCj4SulUVEC4QTPBrPQBn5xJ+sHPs6KfjsdVRcsRapY=";
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
@@ -8,26 +8,19 @@
libimobiledevice,
libusbmuxd,
libplist,
pkg-config,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "droidcam-obs";
version = "2.0.2";
version = "2.3.4";
src = fetchFromGitHub {
owner = "dev47apps";
repo = "droidcam-obs-plugin";
rev = version;
sha256 = "sha256-YtfWwgBhyQYx6QfrKld7p6qUf8BEV/kkQX4QcdHuaYU=";
tag = finalAttrs.version;
sha256 = "sha256-KWMLhddK561xA+EjvoG4tXRW4xoLil31JcTTfppblmA=";
};
postPatch = ''
substituteInPlace ./linux/linux.mk \
--replace "-limobiledevice" "-limobiledevice-1.0" \
--replace "-I/usr/include/obs" "-I${obs-studio}/include/obs" \
--replace "-I/usr/include/ffmpeg" "-I${ffmpeg}/include"
'';
preBuild = ''
mkdir ./build
'';
@@ -41,11 +34,22 @@ stdenv.mkDerivation rec {
ffmpeg
];
nativeBuildInputs = [
pkg-config
];
# Flag reference in regard to:
# https://github.com/dev47apps/droidcam-obs-plugin/blob/master/linux/linux.mk
makeFlags = [
"ALLOW_STATIC=no"
"JPEG_DIR=${lib.getDev libjpeg}"
"JPEG_LIB=${lib.getLib libjpeg}/lib"
"IMOBILEDEV_DIR=${libimobiledevice}"
"IMOBILEDEV_DIR=${lib.getDev libimobiledevice}"
"IMOBILEDEV_DIR=${lib.getLib libimobiledevice}"
"LIBOBS_INCLUDES=${obs-studio}/include/obs"
"FFMPEG_INCLUDES=${lib.getLib ffmpeg}"
"LIBUSBMUXD=libusbmuxd-2.0"
"LIBIMOBILEDEV=libimobiledevice-1.0"
];
installPhase = ''
@@ -61,12 +65,11 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = with lib; {
meta = {
description = "DroidCam OBS";
homepage = "https://github.com/dev47apps/droidcam-obs-plugin";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ulrikstrid ];
platforms = platforms.linux;
broken = true;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ NotAShelf ];
platforms = lib.platforms.linux;
};
}
})
+4
View File
@@ -40,6 +40,10 @@ buildGoModule rec {
];
preCheck = ''
# Some tests take longer depending on builder load.
substituteInPlace private/bufpkg/bufcheck/lint_test.go \
--replace-fail 'context.WithTimeout(context.Background(), 60*time.Second)' \
'context.WithTimeout(context.Background(), 600*time.Second)'
# For WebAssembly runtime tests
GOOS=wasip1 GOARCH=wasm go build -o $GOPATH/bin/buf-plugin-suffix.wasm \
./private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix
+6
View File
@@ -6,6 +6,7 @@
gnome,
glib,
gtk3,
gobject-introspection,
clutter,
dbus,
python3,
@@ -61,9 +62,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
gobject-introspection
intltool
libxslt
libxml2
pythonEnv
autoreconfHook
wrapGAppsHook3
vala
@@ -109,5 +112,8 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
maintainers = [ ];
platforms = platforms.linux;
# checking for a Python interpreter with version >= 2.4... none
# configure: error: no suitable Python interpreter found
broken = stdenv.buildPlatform != stdenv.hostPlatform;
};
}
+5 -5
View File
@@ -5,17 +5,17 @@
"packages": {
"": {
"dependencies": {
"@anthropic-ai/claude-code": "^0.2.32"
"@anthropic-ai/claude-code": "^0.2.35"
}
},
"node_modules/@anthropic-ai/claude-code": {
"version": "0.2.32",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.32.tgz",
"integrity": "sha512-BhVAlBGkgMbkiWPein6fADLgfZKakR9FQNYGzReSebvBxxQRy9jypYuuZgd+4p5RIYsOtyevlUltAm0KHDgs7A==",
"version": "0.2.35",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.35.tgz",
"integrity": "sha512-OTCLa2kvtbYJ2tDbKNxZ7N2kUMXGXTIzr5DW18zYSMMu5RpOLyL+A/DfKXNgcvri76ttttj7lcQRLmQ0pCqZDA==",
"hasInstallScript": true,
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.mjs"
"claude": "cli.js"
},
"engines": {
"node": ">=18.0.0"
+3 -3
View File
@@ -6,14 +6,14 @@
buildNpmPackage rec {
pname = "claude-code";
version = "0.2.32";
version = "0.2.35";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-yIj/+m1LKIN51X5zmBnayucpAzz2cdE/QXfwQapeEqI=";
hash = "sha256-j1N2Q8Na3Y8gnB0Y6KQgN7tNwK/i+H7608GMwpCNG6Q=";
};
npmDepsHash = "sha256-NkMPBbLgr6MuMWNswDsulAYR7A8M6H9EGF2rw1tC33E=";
npmDepsHash = "sha256-kv2p5acCAkY1xty+9KQWgmxQ+rJGTRZaU5tsoG8vqCY=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
+1
View File
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
"-include stdio.h"
"-Wno-error=stringop-truncation"
"-Wno-error=deprecated-declarations"
"-Wno-unused-variable"
];
meta = {
+2 -2
View File
@@ -17,13 +17,13 @@
}:
let
version = "0.200.8";
version = "0.200.9";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-2a43QrmCvLQLuWYufsUC1IE6j6uilLQkcbgCMD3hPkY=";
hash = "sha256-HIqehST3H4shxEdDyGYLkUXZVbHjHfdzyZ0vCGslozU=";
};
vendorHash = "sha256-zWHysXjBNAAZfrVGzn39pdDqQrLUc1uYVLO/U7q0g04=";
+112
View File
@@ -0,0 +1,112 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
nix-update-script,
pnpm_10,
nodejs,
rustPlatform,
cargo-tauri,
wrapGAppsHook4,
pkg-config,
glib-networking,
webkitgtk_4_1,
openssl,
}:
let
pnpm = pnpm_10;
pname = "fedistar";
version = "1.11.0";
src = fetchFromGitHub {
owner = "h3poteto";
repo = "fedistar";
tag = "v${version}";
hash = "sha256-x7PljFqxC3Zht3ZEAZTA6/BClZ0g7VH2HpQLGKqQ8qo=";
};
fedistar-frontend = stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fedistar-frontend";
inherit version src;
pnpmDeps = pnpm.fetchDeps {
inherit pname version src;
hash = "sha256-LurQqfd2r3ggqfBttZTOz2bhQ/r7pqEINkY16ZaIr8I=";
};
nativeBuildInputs = [
pnpm.configHook
pnpm
nodejs
];
buildPhase = ''
runHook preBuild
pnpm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r out/* $out/
runHook postInstall
'';
});
in
rustPlatform.buildRustPackage {
inherit
pname
version
src
fedistar-frontend
;
sourceRoot = "${src.name}/src-tauri";
useFetchCargoVendor = true;
cargoHash = "sha256-u7AHf7TJzWsnynfcvtKaxSZJKeFFmQ1nJZNWUQ8wnWc=";
postPatch = ''
substituteInPlace ./tauri.conf.json \
--replace-fail '"frontendDist": "../out",' '"frontendDist": "${fedistar-frontend}",' \
--replace-fail '"beforeBuildCommand": "pnpm build",' '"beforeBuildCommand": "",'
'';
nativeBuildInputs = [
cargo-tauri.hook
pkg-config
wrapGAppsHook4
];
buildInputs =
[ openssl ]
++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
glib-networking
webkitgtk_4_1
];
doCheck = false; # This version's tests do not pass
# A fix for a problem with Tauri (tauri-apps/tauri#9304)
preFixup = ''
gappsWrapperArgs+=(
--set-default WEBKIT_DISABLE_DMABUF_RENDERER 1
)
'';
passthru.updateScript = nix-update-script {
extraArgs = [
"--subpackage"
"fedistar-frontend"
];
};
meta = {
description = "Multi-column Fediverse client application for desktop";
homepage = "https://fedistar.net/";
mainProgram = "fedistar";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ noodlez1232 ];
changelog = "https://github.com/h3poteto/fedistar/releases/tag/v${version}";
};
}
+2 -8
View File
@@ -12,22 +12,16 @@
llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
pname = "fex";
version = "2502";
version = "2503";
src = fetchFromGitHub {
owner = "FEX-Emu";
repo = "FEX";
tag = "FEX-${version}";
hash = "sha256-w+Kqk+IQsVNbOqYDTpxDeoPyeIgqX2IfZv9zqAJEMVc=";
hash = "sha256-NnYod6DeRv3/6h8SGkGYtgC+RRuIafxoQm3j1Sqk0mU=";
fetchSubmodules = true;
};
patches = [
# This is a workaround to get FEX working with NixOS's slightly weird binfmt
# infrastructure.
./realpath.patch
];
nativeBuildInputs = [
cmake
ninja
-19
View File
@@ -1,19 +0,0 @@
diff --git a/Source/Common/FEXServerClient.cpp b/Source/Common/FEXServerClient.cpp
index 424ecf0a0..501bcbac1 100644
--- a/Source/Common/FEXServerClient.cpp
+++ b/Source/Common/FEXServerClient.cpp
@@ -209,7 +209,13 @@ int ConnectToAndStartServer(char* InterpreterPath) {
return -1;
}
- fextl::string FEXServerPath = FHU::Filesystem::ParentPath(InterpreterPath) + "/FEXServer";
+ char RealInterpreterPathBuf[PATH_MAX];
+ char *RealInterpreterPath = realpath(InterpreterPath, RealInterpreterPathBuf);
+ if (!RealInterpreterPath) {
+ LogMan::Msg::EFmt("realpath failed");
+ return -1;
+ }
+ fextl::string FEXServerPath = FHU::Filesystem::ParentPath(RealInterpreterPath) + "/FEXServer";
// Check if a local FEXServer next to FEXInterpreter exists
// If it does then it takes priority over the installed one
if (!FHU::Filesystem::Exists(FEXServerPath)) {
+2 -2
View File
@@ -8,7 +8,7 @@
makeDesktopItem,
}:
let
version = "0.9.13-beta";
version = "0.9.14-beta";
in
flutter327.buildFlutterApplication {
inherit version;
@@ -17,7 +17,7 @@ flutter327.buildFlutterApplication {
owner = "jmshrv";
repo = "finamp";
rev = version;
hash = "sha256-ww2YkWPKwwDQhnNeL1gpeIZ8X1MxIbtPnXlccR5bF3E=";
hash = "sha256-SDzKB5KLHkJ3xcJY67TNBXDiDlBOApKrh4x0OZR/K/M=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+2 -9
View File
@@ -20,15 +20,8 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-M6i62JI4HjaM0C2rSK8P5O19JeugFP5xIy1E6vE8KP4=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"fhc-0.7.1" = "sha256-gSAwpuVL+5vLkHTsh60qyza7IoxgUWBQcWl2N7md51s=";
"headless_chrome-0.9.0" = "sha256-0BMm0tmCbUL1BSdD6rJLG735FYJsmkSrPQBs2zWx414=";
"rusolver-0.9.1" = "sha256-84qe/A+FN8Q+r8tk0waOq+sBgnDpG9bwoQI+K5pE4Wc=";
"trust-dns-proto-0.20.4" = "sha256-+oAjyyTXbKir8e5kn8CUmQy5qmzQ47ryvBBdZtzj1TY=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-2CB7xmZFqej+vOx90kOPcI4FNpj1z4wnW90n7yEFpNA=";
nativeBuildInputs = [
installShellFiles
+13 -21
View File
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch2,
coreutils,
darwin,
glibcLocales,
@@ -28,9 +29,6 @@
versionCheckHook,
writableTmpDirAsHomeHook,
fetchpatch2,
applyPatches,
# used to generate autocompletions from manpages and for configuration editing in the browser
usePython ? true,
@@ -157,23 +155,11 @@ stdenv.mkDerivation (finalAttrs: {
pname = "fish";
version = "4.0.0";
src = applyPatches {
src = fetchFromGitHub {
owner = "fish-shell";
repo = "fish-shell";
tag = finalAttrs.version;
hash = "sha256-BLbL5Tj3FQQCOeX5TWXMaxCpvdzZtKe5dDQi66uU/BM=";
};
patches = [
# Fix for wrong version number in Cargo.toml
# We need to apply this here instead of in the patch phase since we need
# the patched lock file for the cargo deps fetching
(fetchpatch2 {
name = "cargo_version.diff";
url = "https://github.com/fish-shell/fish-shell/commit/1e069b0fff20b153bc7f824f9f9b820ca4117e1e.diff?full_index=1";
hash = "sha256-XFJ0fT2Zanvdqt/iwgyH2IA/kIOcOHMNdsmuzjTX5qs=";
})
];
src = fetchFromGitHub {
owner = "fish-shell";
repo = "fish-shell";
tag = finalAttrs.version;
hash = "sha256-BLbL5Tj3FQQCOeX5TWXMaxCpvdzZtKe5dDQi66uU/BM=";
};
env = {
@@ -183,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
inherit (finalAttrs) src patches;
hash = "sha256-4ol4LvabhtjiMMWwV1wrcywFePOmU0Jub1sy+Ay7mLA=";
};
@@ -204,6 +190,12 @@ stdenv.mkDerivation (finalAttrs: {
# * <https://github.com/fish-shell/fish-shell/issues/7142>
./nix-darwin-path.patch
(fetchpatch2 {
name = "cargo_version.diff";
url = "https://github.com/fish-shell/fish-shell/commit/1e069b0fff20b153bc7f824f9f9b820ca4117e1e.diff?full_index=1";
hash = "sha256-XFJ0fT2Zanvdqt/iwgyH2IA/kIOcOHMNdsmuzjTX5qs=";
})
# Fixes a build issue in kitty, see https://github.com/fish-shell/fish-shell/commit/97f0809b62a1fa77df1b9fcbbfe623b6187b5013
# The first patch is needed since it introduces the BufferedOutputter type that's
# used by the second one.
+2 -2
View File
@@ -25,7 +25,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fprintd";
version = "1.94.4";
version = "1.94.5";
outputs = [
"out"
"devdoc"
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "libfprint";
repo = "fprintd";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
hash = "sha256-aGIz50S0zfE3rV6QJp8iQz3uUVn8WAL68KU70j8GyOU=";
};
nativeBuildInputs = [
-1769
View File
File diff suppressed because it is too large Load Diff
+2 -6
View File
@@ -17,12 +17,8 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-vWd1sto89U2ZJWZZebPjrbMyBjZMs9buoPEPKocDVnY=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"google-apis-common-5.0.2" = "sha256-E4ON66waUzp4qqpVWTFBD0+M2V80YlYmsewEYZygTuE=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-x5Q9/2Op7ACtNiYeg5CuInMTiOngVCKxFWeHtPVow6A=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
-2665
View File
File diff suppressed because it is too large Load Diff
+2 -6
View File
@@ -20,12 +20,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-lEjJLmBA3dlIVxc8E+UvR7u154QGeCfEbxdgUxAS3Cw=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"clokwerk-0.4.0-rc1" = "sha256-GQDWEN2arDDRu2ft8QYdXsNhBEIhBNZTnLoLy27cbAI=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-nGib7MXLiN5PTQoSFf68ClwX5K/aSF8QT9hz20UDGdE=";
nativeBuildInputs = [
pkg-config
-278
View File
@@ -1,278 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "aho-corasick"
version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clock_ticks"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c49a90f58e73ac5f41ed0ac249861ceb5f0976db35fabc2b9c2c856916042d63"
[[package]]
name = "env_logger"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
dependencies = [
"log 0.4.17",
]
[[package]]
name = "fix-getters-rules"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6af7c515020a47f109ddbb4ae0ea662e202c361e5d8570caaca2f1d9037d1bc"
dependencies = [
"once_cell",
]
[[package]]
name = "getopts"
version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
dependencies = [
"unicode-width",
]
[[package]]
name = "gir"
version = "0.0.1"
dependencies = [
"bitflags",
"env_logger",
"fix-getters-rules",
"getopts",
"hprof",
"log 0.4.17",
"once_cell",
"regex",
"rustdoc-stripper",
"toml",
"xml-rs",
]
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hprof"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17b42e67c01ef27237e424783538a0bc45721ecd53438fab5c3f8bbf5dfd8516"
dependencies = [
"clock_ticks",
"log 0.3.9",
]
[[package]]
name = "indexmap"
version = "1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
dependencies = [
"autocfg",
"hashbrown",
]
[[package]]
name = "log"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
dependencies = [
"log 0.4.17",
]
[[package]]
name = "log"
version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if",
]
[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "nom8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]]
name = "proc-macro2"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
dependencies = [
"proc-macro2",
]
[[package]]
name = "regex"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
]
[[package]]
name = "regex-syntax"
version = "0.6.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
[[package]]
name = "rustdoc-stripper"
version = "0.1.18"
source = "git+https://github.com/GuillaumeGomez/rustdoc-stripper#08114e390ea162c7ed35dc20cbf1d38bd8bfc130"
[[package]]
name = "serde"
version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_spanned"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8"
dependencies = [
"serde",
]
[[package]]
name = "syn"
version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "toml"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]
[[package]]
name = "toml_datetime"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "729bfd096e40da9c001f778f5cdecbd2957929a24e10e5883d9392220a751581"
dependencies = [
"indexmap",
"nom8",
"serde",
"serde_spanned",
"toml_datetime",
]
[[package]]
name = "unicode-ident"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
[[package]]
name = "unicode-width"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "xml-rs"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
+2 -6
View File
@@ -18,12 +18,8 @@ rustPlatform.buildRustPackage {
sha256 = "sha256-WpTyT62bykq/uwzBFQXeJ1HxR1a2vKmtid8YAzk7J+Q=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rustdoc-stripper-0.1.18" = "sha256-b+RRXJDGULEvkIZDBzU/ZchVF63pX0S9hBupeP12CkU=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-bytICp0+1/suM+kf4VX9z/mpnsdXi3I3dPUlK3A9+V4=";
postPatch = ''
rm build.rs
File diff suppressed because it is too large Load Diff
+2 -3
View File
@@ -18,9 +18,8 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-eueB+ZrOrnySEwUpCTvC4qARCsDcHJhm088XepLTlOE=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
useFetchCargoVendor = true;
cargoHash = "sha256-3D0HjDtKwYoi9bpQnosC/TPNBjfiWi5m1CH1eGQpGg0=";
nativeBuildInputs = [ pkg-config ];
+41
View File
@@ -0,0 +1,41 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
wrapGAppsHook4,
gtk4-layer-shell,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hyprswitch";
version = "3.3.2";
src = fetchFromGitHub {
owner = "H3rmt";
repo = "hyprswitch";
tag = "v${finalAttrs.version}";
hash = "sha256-cmo544QvdacVTHPqmc6er4xnSSc63e6Z71BS0FxSklE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-DEifup2oAcqZplx2JoN3hkP1VmxwYVFS8ZqfpR80baA=";
nativeBuildInputs = [
wrapGAppsHook4
pkg-config
];
buildInputs = [
gtk4-layer-shell
];
meta = {
description = "CLI/GUI that allows switching between windows in Hyprland";
mainProgram = "hyprswitch";
homepage = "https://github.com/H3rmt/hyprswitch";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ arminius-smh ];
};
})
-2982
View File
File diff suppressed because it is too large Load Diff
+2 -10
View File
@@ -16,16 +16,8 @@ rustPlatform.buildRustPackage {
hash = "sha256-jiJ5XW7S6/pVEOPYJKurolLI3UrOyuaEP/cqm1a0rIU=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"calculate-0.7.0" = "sha256-3CI+7TZeW1sk6pBigxESK/E7G+G1/MniVIn4sqfk7+w=";
"nix-0.23.1" = "sha256-yWJYrQt9piJHhqBkH/hn9dsXR8oqzl0RKPrzx9fvqlw=";
"object-pool-0.5.3" = "sha256-LWP0b62sk2dcqnQEEvLmZVvWSVLJ722yH/zIIPL93W4=";
"redox_liner-0.5.2" = "sha256-ZjVLACkyOT6jVRWyMj0ixJwCv6IjllCLHNTERlncIpk=";
"small-0.1.0" = "sha256-QIzEfFc0EDEllf+YxVyV7j/PvC7nVWiK0YYBoZBQZ3Q=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-Gqa2aA8jr6SZexa6EejYHv/aEYcm51qvEJSUm4m1AVc=";
patches = [
# remove git revision from the build script to fix build
+4 -3
View File
@@ -7,18 +7,19 @@
python3Packages.buildPythonApplication rec {
pname = "isd";
version = "0.2.0";
version = "0.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "isd-project";
repo = "isd";
tag = "v${version}";
hash = "sha256-YOQoI9PB096C/wNF9y5nrXkpJGbO6cXQ2U6I2Ece2PM=";
hash = "sha256-z9lyPSiuUAwu5bmZlcHj5SV3mHtP+GXtuEeJzOr1c9A=";
};
build-system = with python3Packages; [
hatchling
setuptools
];
dependencies = with python3Packages; [
@@ -38,7 +39,7 @@ python3Packages.buildPythonApplication rec {
];
pythonImportsCheck = [
"isd"
"isd_tui"
];
passthru.updateScript = nix-update-script { };
+63
View File
@@ -0,0 +1,63 @@
{
lib,
flutter,
fetchFromGitHub,
makeDesktopItem,
copyDesktopItems,
mpv-unwrapped,
}:
flutter.buildFlutterApplication rec {
pname = "jellyflix";
version = "1.0.0";
src = fetchFromGitHub {
owner = "jellyflix-app";
repo = "jellyflix";
tag = version;
hash = "sha256-jqMjKpUOcL4hElEWM1mrQaoraZPj0aUNt2hGLw39inc=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
postInstall = ''
install -Dm644 $src/assets/icon/icon.png $out/share/icons/hicolor/scalable/apps/jellyflix.png
'';
nativeBuildInputs = [
copyDesktopItems
];
buildInputs = [
mpv-unwrapped
];
gitHashes = {
filter_list = "sha256-/KgFLeoBTC3yq77esDqXwqP97+BcO3msYKki86OJEj0=";
tentacle = "sha256-30a4Vn8wL0TdboSYPm1W+hRqXSsuID0gNOVnNe3KmPE=";
media_kit = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
media_kit_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
media_kit_libs_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
media_kit_libs_android_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
media_kit_libs_ios_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
media_kit_libs_macos_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
media_kit_libs_windows_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
};
desktopItems = [
(makeDesktopItem {
name = "jellyflix";
desktopName = "Jellyflix";
genericName = "Media Player";
exec = "jellyflix";
icon = "jellyflix";
})
];
meta = {
description = "Easy-to-use Jellyfin client for movies and shows";
homepage = "https://github.com/jellyflix-app/jellyflix";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ jvanbruegge ];
mainProgram = "jellyflix";
platforms = lib.platforms.linux;
};
}
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation rec {
pname = "lcov";
version = "2.2";
version = "2.3";
src = fetchFromGitHub {
owner = "linux-test-project";
repo = "lcov";
rev = "v${version}";
hash = "sha256-cZdDlOf3IgPQrUNl+wu6Gwecaj+r2xu0eqmlz67TeAI=";
hash = "sha256-Qz5Q1JRJeB0aCaYmCR8jeG7TQPkvJHtJTkBhXGM05ak=";
};
nativeBuildInputs = [ makeWrapper ];
+4 -4
View File
@@ -9,18 +9,18 @@
gusb,
pixman,
glib,
nss,
gobject-introspection,
cairo,
libgudev,
gtk-doc,
docbook-xsl-nons,
docbook_xml_dtd_43,
openssl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libfprint";
version = "1.94.8";
version = "1.94.9";
outputs = [
"out"
"devdoc"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "libfprint";
repo = "libfprint";
rev = "v${finalAttrs.version}";
hash = "sha256-PZr4ZeVnuCKYfI8CKvRqBwalxsz9Ka17kSuLflwl7mE=";
hash = "sha256-UiUdZokgi27LlyO419dd+NIcQD2RSUfdsC08sW3qzko=";
};
postPatch = ''
@@ -57,9 +57,9 @@ stdenv.mkDerivation (finalAttrs: {
gusb
pixman
glib
nss
cairo
libgudev
openssl
];
mesonFlags = [
+1 -1
View File
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
description = "Library for working with virtual machines";
description = "Wrapper library of libvirt for glib-based applications";
longDescription = ''
libvirt-glib wraps libvirt to provide a high-level object-oriented API better
suited for glib-based applications, via three libraries:
+4 -4
View File
@@ -5,8 +5,8 @@
dash,
php,
phpCfg ? null,
withPgsql ? true, # “strongly recommended” according to docs
withMysql ? false,
withPostgreSQL ? true, # “strongly recommended” according to docs
withMySQL ? false,
minifyStaticFiles ? false, # default files are often not minified
esbuild,
lightningcss,
@@ -67,14 +67,14 @@ php.buildComposerProject2 (finalAttrs: {
pdo
simplexml
])
++ lib.optionals withPgsql (
++ lib.optionals withPostgreSQL (
with all;
[
pdo_pgsql
pgsql
]
)
++ lib.optionals withMysql (
++ lib.optionals withMySQL (
with all;
[
mysqli
File diff suppressed because it is too large Load Diff
+2 -6
View File
@@ -37,12 +37,8 @@ rustPlatform.buildRustPackage {
rustPlatform.bindgenHook
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"mpeg_encoder-0.2.1" = "sha256-+BNZZ1FIr1374n8Zs1mww2w3eWHOH6ENOTYXz9RT2Ck=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-qIoH+YhyPXXIWFwgcJBly2KBSuVgaRg5kZtBazaTVJ0=";
cargoBuildFlags = [
"-p neothesia -p neothesia-cli"
-2307
View File
File diff suppressed because it is too large Load Diff
+2 -6
View File
@@ -37,12 +37,8 @@ rustPlatform.buildRustPackage rec {
pango
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"satellite-0.1.0" = "sha256-R5Tz4MpRnAEnMmkx/LhWPmwRIKpnCLIB4VxApMTBn78=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-du44N+G9/nN5YuOpkWXvr1VaSQfjCpZYJ8yDc48ATIU=";
preBuild = ''
# Used by macro pointing to resource location at compile time.
-1559
View File
File diff suppressed because it is too large Load Diff
+2 -6
View File
@@ -22,12 +22,8 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-rVqF+16esE27G7GS55RT91tD4x/GAzfVlIR0AgSknz0=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"nix-compat-0.1.0" = "sha256-xHwBlmTggcZBFSh4EOY888AbmGQxhwvheJSStgpAj48=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-OUJGxNqytwz7530ByqkanpseVJJXAea/L2GIHnuSIqk=";
nativeBuildInputs = [
installShellFiles
+6 -6
View File
@@ -1,9 +1,9 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2025-01-18
# Last updated: 2025-03-10
{
version = "3.2.15-2025.1.10";
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_amd64_01.deb";
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_250110_arm64_01.deb";
arm64_hash = "sha256-F2R5j0x2BnD9/kIsiUe+IbZpAKDOQdjxwOENzzb4RJo=";
amd64_hash = "sha256-hDfaxxXchdZons8Tb5I7bsd7xEjiKpQrJjxyFnz3Y94=";
version = "3.2.16-2025.3.7";
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250307_amd64_01.deb";
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250307_arm64_01.deb";
arm64_hash = "sha256-ZzrG0rkwtgJ9YnA+WsrLqN93fwFx0u5SGJcnNw+H4qM=";
amd64_hash = "sha256-TyfWhVeQm7ghe1Li4PvNiZ/X1JAdaZYcWv/fnChawBU=";
}
+5 -5
View File
@@ -2,7 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
crystal_1_14,
crystal,
wrapGAppsHook4,
gobject-introspection,
desktopToDarwinBundle,
@@ -20,13 +20,13 @@
writeShellScript,
}:
let
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "hugopl";
repo = "rtfm";
tag = "v${version}";
hash = "sha256-KuxGQs7TPn2Lmgk/NjfoRsBtkTY0GC/DOUlQZXCdRXE=";
hash = "sha256-qWQ2V7o7swbnXGgPOcnZ5Mg/SpjHOYpaD1HL6kgutCs=";
};
gtk-doc =
@@ -45,7 +45,7 @@ let
];
};
in
crystal_1_14.buildCrystalPackage {
crystal.buildCrystalPackage {
pname = "rtfm";
inherit version src;
@@ -57,7 +57,7 @@ crystal_1_14.buildCrystalPackage {
--replace-fail 'basedir = Path.new("/usr/share/doc")' 'basedir = Path.new(ARGV[0]? || "${gtk-doc}/share/doc")' \
--replace-fail 'webkit2gtk-4.0' 'webkitgtk-6.0'
substituteInPlace src/doc2dash/create_crystal_docset.cr \
--replace-fail 'doc_source = Path.new(ARGV[0]? || "/usr/share/doc/crystal/api")' 'doc_source = Path.new(ARGV[0]? || "${crystal_1_14}/share/doc/crystal/api")'
--replace-fail 'doc_source = Path.new(ARGV[0]? || "/usr/share/doc/crystal/api")' 'doc_source = Path.new(ARGV[0]? || "${crystal}/share/doc/crystal/api")'
substituteInPlace src/doc2dash/docset_builder.cr \
--replace-fail 'File.copy(original, real_dest)' 'File.copy(original, real_dest); File.chmod(real_dest, 0o600)'
substituteInPlace Makefile \
@@ -19,7 +19,7 @@
}:
let
deps = [
deps = lib.makeBinPath [
acpica-tools
bc
coreutils
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
# don't use the bundled turbostat binary
postPatch = ''
substituteInPlace s0ix-selftest-tool.sh --replace '"$DIR"/turbostat' 'turbostat'
substituteInPlace s0ix-selftest-tool.sh --replace-fail '"$DIR"/turbostat' 'turbostat'
'';
nativeBuildInputs = [ makeWrapper ];
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
install -Dm555 s0ix-selftest-tool.sh "$out/bin/s0ix-selftest-tool"
wrapProgram "$out/bin/s0ix-selftest-tool" --prefix PATH : ${lib.escapeShellArg deps}
wrapProgram "$out/bin/s0ix-selftest-tool" --prefix PATH : ${deps}
runHook postInstall
'';
@@ -13,13 +13,13 @@ let
arch = if stdenv.system == "x86_64-linux" then "x86_64" else "i386";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "samsung-unified-linux-driver";
version = "1.00.36";
src = fetchurl {
sha256 = "1a7ngd03x0bkdl7pszy5zqqic0plxvdxqm5w7klr6hbdskx1lir9";
url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${finalAttrs.version}.tar.gz";
};
buildInputs = [
@@ -112,16 +112,16 @@ stdenv.mkDerivation rec {
# we did this in prefixup already
dontPatchELF = true;
meta = with lib; {
meta = {
description = "Unified Linux Driver for Samsung printers and scanners";
homepage = "http://www.bchemnet.com/suldr";
downloadPage = "http://www.bchemnet.com/suldr/driver/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
# Tested on linux-x86_64. Might work on linux-i386.
# Probably won't work on anything else.
platforms = platforms.linux;
platforms = lib.platforms.linux;
maintainers = [ ];
};
}
})
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "sentry-native";
version = "0.7.20";
version = "0.8.1";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-native";
rev = version;
hash = "sha256-fHjunnLBzJK4LaAGTsFkj2kr1qYM9dx8evMewKvnX9Y=";
hash = "sha256-V8fOFn1qic00TgoXB23ZJPldjdC70JHdx+197hH8iZg=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "snowflake-cli";
version = "3.4.1";
version = "3.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "snowflakedb";
repo = "snowflake-cli";
tag = "v${version}";
hash = "sha256-W+/RW/oTFi7NyJZXlK9Yd3Gggmm+PtmOawWFSrK+SIo=";
hash = "sha256-iEvgvz6EBPzfOLe60QQi1S3FIyFWYFVn8slWEpIusAI=";
};
build-system = with python3Packages; [
@@ -13,20 +13,20 @@
buildNpmPackage rec {
pname = "super-productivity";
version = "11.1.3";
version = "12.0.0";
src = fetchFromGitHub {
owner = "johannesjo";
repo = "super-productivity";
tag = "v${version}";
hash = "sha256-GWpKz1q3pmAozlzawi2ITxo3KH0MSrJCszVQdGTeOXA=";
hash = "sha256-Bb7LjYP116+Ce6BAknCSQpnddlIC/BoMJ2r2qJRBxas=";
postFetch = ''
${lib.getExe npm-lockfile-fix} -r $out/package-lock.json
'';
};
npmDepsHash = "sha256-iP1op4R7OUA7cSW/dJCBBGcb5r6icSbx/X7mYogiMkA=";
npmDepsHash = "sha256-peDRx7tNl5GXDRzj8TZter2dXzfoEPSPunzAmDOUcSM=";
npmFlags = [ "--legacy-peer-deps" ];
makeCacheWritable = true;
+1
View File
@@ -83,6 +83,7 @@ stdenv.mkDerivation {
hardeningDisable = [
"pic"
"pie" # MBR gets too big with PIE
"stackprotector"
"fortify"
];
+54
View File
@@ -0,0 +1,54 @@
{
lib,
stdenv,
fetchFromGitHub,
boost,
lv2,
python3,
wafHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ttl2c";
version = "1.0.1";
src = fetchFromGitHub {
owner = "lvtk";
repo = "ttl2c";
rev = "b64e425f38399a0d18d1252694d6d6980c800841";
hash = "sha256-Vy3UoMnr9SIMw0pZfyuLjDHf/Gzgn5g3V0fGTIypQyM=";
};
# remove outdated vendored waf
postPatch = ''
rm waf
'';
nativeBuildInputs = [
python3
wafHook
];
buildInputs = [
boost
lv2
];
enableParallelBuilding = true;
meta = {
description = "C header generator for LV2 plugins";
mainProgram = "ttl2c";
homepage = "https://lvtk.org/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
bot-wxt1221
fliegendewurst
];
platforms = lib.platforms.unix;
badPlatforms = [
"x86_64-darwin"
"aarch64-darwin"
];
};
})
+43
View File
@@ -0,0 +1,43 @@
{
lib,
stdenv,
cmake,
fetchFromGitHub,
pkg-config,
}:
stdenv.mkDerivation rec {
pname = "unicorn-angr";
# Version must follow what angr requires
version = "2.0.1.post1";
src = fetchFromGitHub {
owner = "unicorn-engine";
repo = "unicorn";
tag = version;
hash = "sha256-Jz5C35rwnDz0CXcfcvWjkwScGNQO1uijF7JrtZhM7mI=";
};
nativeBuildInputs = [
cmake
pkg-config
];
# Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
# Some x86 tests are interrupted by signal 10
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;test_x86"
];
doCheck = true;
meta = with lib; {
description = "Lightweight multi-platform CPU emulator library";
homepage = "https://www.unicorn-engine.org";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fab ];
platforms = platforms.unix;
};
}
+4
View File
@@ -10,6 +10,7 @@
wrapGAppsHook4,
desktop-file-utils,
libadwaita,
ffmpeg,
}:
python3Packages.buildPythonApplication rec {
@@ -27,6 +28,8 @@ python3Packages.buildPythonApplication rec {
postPatch = ''
substituteInPlace src/varia-py.in \
--replace-fail 'aria2cexec = sys.argv[1]' 'aria2cexec = "${lib.getExe aria2}"'
substituteInPlace src/varia-py.in \
--replace-fail 'ffmpegexec = sys.argv[2]' 'ffmpegexec = "${lib.getExe ffmpeg}"'
'';
nativeBuildInputs = [
@@ -45,6 +48,7 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
pygobject3
aria2p
yt-dlp
];
postInstall = ''
@@ -0,0 +1,11 @@
--- a/src/global_config_manager.rs
+++ b/src/global_config_manager.rs
@@ -100,7 +100,7 @@
let object: Self = glib::Object::new();
*object.imp().flatpak_info.borrow_mut() =
- Ini::load_from_file("/.flatpak-info").expect("Could not load .flatpak-info");
+ Ini::load_from_file("/.flatpak-info").unwrap_or_else(|_| Ini::new());
match user_config_dir().as_os_str().to_str() {
Some(user_config_directory) => {
+8 -6
View File
@@ -1,7 +1,7 @@
{
fetchFromGitHub,
lib,
stdenv,
fetchFromGitHub,
appstream-glib,
desktop-file-utils,
meson,
@@ -22,21 +22,23 @@
stdenv.mkDerivation rec {
pname = "vaults";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "mpobaschnig";
repo = "Vaults";
rev = "v${version}";
hash = "sha256-USVP/7TNdpUNx1kDsCReGYIP8gHUeij2dqy8TR4R+CE=";
repo = "vaults";
tag = version;
hash = "sha256-PczDj6G05H6XbkMQBr4e1qgW5s8GswEA9f3BRxsAWv0=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
hash = "sha256-93X2BCn6Ih2DqYJNvYvUCYrC1E6wpCT5X8Hyux/8mno=";
hash = "sha256-j0A6HlApV0l7LuB7ISHp+k/bSH5Icdv+aNQ9juCCO9I=";
};
patches = [ ./not-found-flatpak-info.patch ];
postPatch = ''
patchShebangs build-aux
'';
+3 -3
View File
@@ -11,15 +11,15 @@
buildGoModule rec {
pname = "witness";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "in-toto";
repo = "witness";
rev = "v${version}";
sha256 = "sha256-KqsBeKtMLLCtGoFfYOgIy0b+fYRpV7zCHVjPzgXj6Zo=";
sha256 = "sha256-ylCUy44sX1KPfQqEldixmLcXkk+Uwca4q1gZRgxHdeg=";
};
vendorHash = "sha256-0zl+sdF6ZNAW2R9MskLvwfd1ppMtvFgkUvp5ibh23oI=";
vendorHash = "sha256-CR95CsGthdjq/dtxmIjmZlQeyKimumCP9mWr6tNrBJI=";
nativeBuildInputs = [ installShellFiles ];
+7 -8
View File
@@ -7,10 +7,10 @@
let
pname = "wootility";
version = "4.7.3";
version = "5.0.3";
src = fetchurl {
url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage";
sha256 = "sha256-5S4Yz2VymKfT1uBXYufb6MWx1aMbGn4ufT8RITJtuPc=";
url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage";
sha256 = "sha256-uDjxA8o/ZvWJzpwJFs2b6jXcaRBeNy04hkeZ3DGoXVs=";
};
in
@@ -27,11 +27,10 @@ appimageTools.wrapType2 {
wrapProgram $out/bin/wootility \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
install -Dm444 ${contents}/wootility-lekker.desktop -t $out/share/applications
install -Dm444 ${contents}/wootility-lekker.png -t $out/share/pixmaps
substituteInPlace $out/share/applications/wootility-lekker.desktop \
--replace-fail 'Exec=AppRun' 'Exec=wootility' \
--replace-warn 'Name=wootility-lekker' 'Name=Wootility'
install -Dm444 ${contents}/wootility.desktop -t $out/share/applications
install -Dm444 ${contents}/wootility.png -t $out/share/pixmaps
substituteInPlace $out/share/applications/wootility.desktop \
--replace-fail 'Exec=AppRun --no-sandbox' 'Exec=wootility'
'';
profile = ''
+3 -3
View File
@@ -8,7 +8,7 @@
}:
let
version = "10.1.9";
version = "10.1.10";
in
rustPlatform.buildRustPackage {
@@ -19,11 +19,11 @@ rustPlatform.buildRustPackage {
owner = "erebe";
repo = "wstunnel";
tag = "v${version}";
hash = "sha256-39VPPPBKUhl17PJBa7wJi0H4jghTRjy9cFgihgK+mFE=";
hash = "sha256-7HW2AtMTNE05qSBhltj+ZxJhoMJmaMynko8+wIgpqCc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-3+vq/IJ526t7UQ6FcrTKOD1umUD07amCa3b0myfbxrI=";
cargoHash = "sha256-NujasFigZ+BETg3J8fOKu5QAm68ZzP7uIXwv7bI+2uM=";
cargoBuildFlags = [ "--package wstunnel-cli" ];
+1
View File
@@ -21,6 +21,7 @@ buildGoModule rec {
description = "fetch top for gen Z with X written by bubbletea enjoyer";
homepage = "https://github.com/ssleert/zfxtop";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ wozeparrot ];
mainProgram = "zfxtop";
};
@@ -2613,14 +2613,14 @@ buildLuarocksPackage {
lzextras = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "lzextras";
version = "0.2.1-1";
version = "0.2.5-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lzextras-0.2.1-1.rockspec";
sha256 = "0xlmi6rg7nac0z4xwdj6b4rvbd5x7cgfd1wviag11ksh6h26nibf";
url = "mirror://luarocks/lzextras-0.2.5-1.rockspec";
sha256 = "0aqvly57k99fgcxhs1dfqyrf8bl7v6x75vdcjqpqsm3pkpvs1nl4";
}).outPath;
src = fetchzip {
url = "https://github.com/BirdeeHub/lzextras/archive/v0.2.1.zip";
sha256 = "0b6qp70ypkjizknhpbrfs9qx8za77ygfnpmrm7zz2pl8rx500nar";
url = "https://github.com/BirdeeHub/lzextras/archive/v0.2.5.zip";
sha256 = "1lk2k0iml8livwn1sjabn8d808alvd0axx6p9xcsb83x69g8a0dj";
};
disabled = luaOlder "5.1";
+1 -1
View File
@@ -74,7 +74,7 @@ in
argparse = prev.argparse.overrideAttrs (oa: {
doCheck = true;
checkInputs = [ final.busted ];
nativeCheckInputs = [ final.busted ];
checkPhase = ''
runHook preCheck
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "13.1.0";
version = "13.2.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "aioshelly";
tag = version;
hash = "sha256-Wh4kwyNi0ql0plymkE6XM54SQug9BRvXcI0oEMI2ajA=";
hash = "sha256-woHFSKTMsMCs/ztJQfmJ4n6bS2Pya4lp6jvjrIIzA6s=";
};
build-system = [ setuptools ];
@@ -30,7 +30,7 @@
sortedcontainers,
sqlalchemy,
sympy,
unicorn,
unicorn-angr,
unique-log-filter,
}:
@@ -48,16 +48,7 @@ buildPythonPackage rec {
hash = "sha256-rrJTYe3o/Ra8+EKAA7t0M02tWVN4Ul5ueUar7lpUvMg=";
};
postPatch = ''
# unicorn is also part of build-system
substituteInPlace pyproject.toml \
--replace-fail "unicorn==2.0.1.post1" "unicorn"
'';
pythonRelaxDeps = [
"capstone"
"unicorn"
];
pythonRelaxDeps = [ "capstone" ];
build-system = [ setuptools ];
@@ -87,7 +78,7 @@ buildPythonPackage rec {
sortedcontainers
sqlalchemy
sympy
unicorn
unicorn-angr
unique-log-filter
];
@@ -117,7 +108,5 @@ buildPythonPackage rec {
homepage = "https://angr.io/";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ fab ];
# angr is pining unicorn
broken = versionAtLeast unicorn.version "2.0.1.post1";
};
}
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "govee-local-api";
version = "2.0.1";
version = "2.1.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Galorhallen";
repo = "govee-local-api";
tag = "v${version}";
hash = "sha256-Y5818sePEg6t5EQgmG97MCXXECvJniCpNYHGN8BLXS8=";
hash = "sha256-a5x4RbZ5+ryByr6/yGJw2/dNJBR7/JTYBcvA+Eqygqc=";
};
postPatch = ''
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "inkbird-ble";
version = "0.7.1";
version = "0.8.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "inkbird-ble";
tag = "v${version}";
hash = "sha256-5qTW8uCs1wAbXuujwb/xkoNQXpA3E/FfMHs1GPFtZsk=";
hash = "sha256-NnofBiMLZ3gnpRjQwURYTTKCz1F9m6HFv2hU6xH6bVE=";
};
build-system = [ poetry-core ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-cloud";
version = "0.1.13";
version = "0.1.14";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_cloud";
inherit version;
hash = "sha256-y2Ui+9D15MHNKCXnC7lD0NiRaBbiMqXOO+OnJy8ymow=";
hash = "sha256-kHQaGbqWln+iSECEko4yaulXc2eAoVtnvDrV9S6UeC0=";
};
build-system = [ poetry-core ];
@@ -36,7 +36,7 @@
buildPythonPackage rec {
pname = "llama-index-core";
version = "0.12.22.post1";
version = "0.12.23";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
owner = "run-llama";
repo = "llama_index";
tag = "v${version}";
hash = "sha256-pvFhFkFrJd/0Y660KW03PymkfyEM+QDFRgyJoT46Dd8=";
hash = "sha256-GFzaorzjeQGreyUjRXP7v7djbSq2boLWZjwO4R2W9E4=";
};
sourceRoot = "${src.name}/${pname}";
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-embeddings-ollama";
version = "0.5.0";
version = "0.6.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_embeddings_ollama";
inherit version;
hash = "sha256-/sj6JJ7S+xORLhUR3sshwCWlMpRyiiHyW9LV8w9DWpQ=";
hash = "sha256-7GL6vymKzrNNIFpQmKLcK9eSTT2bVmwkyh69ZLw9/pA=";
};
pythonRelaxDeps = [ "ollama" ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-graph-stores-neptune";
version = "0.3.1";
version = "0.3.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_graph_stores_neptune";
inherit version;
hash = "sha256-wZRjK/ZFh5lVxya1q0vFvv+VnvGLNljMSvSeflR8Z7I=";
hash = "sha256-jSZ86qdK5KklPFtgyruPtYhJ2Yesd8C1QufhojhKO0A=";
};
build-system = [ poetry-core ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-llms-ollama";
version = "0.5.2";
version = "0.5.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_llms_ollama";
inherit version;
hash = "sha256-hhno+/neUXbbW7oN/3ENAnYh85q5oUskRHHMQBQHU40=";
hash = "sha256-FxbGOJoFDcgVLIWTZU+uyRdqrbzNExRce7D2aJz+wOs=";
};
build-system = [ poetry-core ];
+51 -51
View File
@@ -21,9 +21,9 @@ dependencies = [
[[package]]
name = "async-trait"
version = "0.1.85"
version = "0.1.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
dependencies = [
"proc-macro2",
"quote",
@@ -38,9 +38,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
version = "2.8.0"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
[[package]]
name = "bumpalo"
@@ -140,15 +140,15 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "indoc"
version = "2.0.5"
version = "2.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
[[package]]
name = "itoa"
version = "1.0.14"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "js-sys"
@@ -162,9 +162,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.169"
version = "0.2.170"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
[[package]]
name = "lock_api"
@@ -178,9 +178,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.25"
version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
[[package]]
name = "memchr"
@@ -199,9 +199,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.20.2"
version = "1.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
[[package]]
name = "parking"
@@ -230,22 +230,22 @@ checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
[[package]]
name = "portable-atomic"
version = "1.10.0"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
[[package]]
name = "proc-macro2"
version = "1.0.93"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pycrdt"
version = "0.12.8"
version = "0.12.9"
dependencies = [
"pyo3",
"yrs",
@@ -253,9 +253,9 @@ dependencies = [
[[package]]
name = "pyo3"
version = "0.23.4"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc"
checksum = "7f1c6c3591120564d64db2261bec5f910ae454f01def849b9c22835a84695e86"
dependencies = [
"cfg-if",
"indoc",
@@ -271,9 +271,9 @@ dependencies = [
[[package]]
name = "pyo3-build-config"
version = "0.23.4"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7"
checksum = "e9b6c2b34cf71427ea37c7001aefbaeb85886a074795e35f161f5aecc7620a7a"
dependencies = [
"once_cell",
"target-lexicon",
@@ -281,9 +281,9 @@ dependencies = [
[[package]]
name = "pyo3-ffi"
version = "0.23.4"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d"
checksum = "5507651906a46432cdda02cd02dd0319f6064f1374c9147c45b978621d2c3a9c"
dependencies = [
"libc",
"pyo3-build-config",
@@ -291,9 +291,9 @@ dependencies = [
[[package]]
name = "pyo3-macros"
version = "0.23.4"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7"
checksum = "b0d394b5b4fd8d97d48336bb0dd2aebabad39f1d294edd6bcd2cccf2eefe6f42"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
@@ -303,9 +303,9 @@ dependencies = [
[[package]]
name = "pyo3-macros-backend"
version = "0.23.4"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4"
checksum = "fd72da09cfa943b1080f621f024d2ef7e2773df7badd51aa30a2be1f8caa7c8e"
dependencies = [
"heck",
"proc-macro2",
@@ -316,27 +316,27 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.38"
version = "1.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
dependencies = [
"proc-macro2",
]
[[package]]
name = "redox_syscall"
version = "0.5.8"
version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
dependencies = [
"bitflags",
]
[[package]]
name = "ryu"
version = "1.0.19"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
[[package]]
name = "scopeguard"
@@ -346,18 +346,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "serde"
version = "1.0.217"
version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.217"
version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",
@@ -366,9 +366,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.138"
version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
dependencies = [
"itoa",
"memchr",
@@ -387,15 +387,15 @@ dependencies = [
[[package]]
name = "smallvec"
version = "1.13.2"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
[[package]]
name = "syn"
version = "2.0.96"
version = "2.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
dependencies = [
"proc-macro2",
"quote",
@@ -404,9 +404,9 @@ dependencies = [
[[package]]
name = "target-lexicon"
version = "0.12.16"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
[[package]]
name = "thiserror"
@@ -430,15 +430,15 @@ dependencies = [
[[package]]
name = "unicode-ident"
version = "1.0.16"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
name = "unindent"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
[[package]]
name = "wasi"
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "pycrdt";
version = "0.12.8";
version = "0.12.9";
pyproject = true;
src = fetchFromGitHub {
owner = "jupyter-server";
repo = "pycrdt";
tag = version;
hash = "sha256-DQIv1wySGMpVPKnu9dRhaV4tUJ1+E/AgfXV3R2jgU1k=";
hash = "sha256-6wIY1Wb82C0E8BA9kIrmdLPxNw4O18DPP3vrVZgSotI=";
};
postPatch = ''
@@ -1,11 +1,12 @@
{
lib,
aiohttp,
aresponses,
buildPythonPackage,
fetchFromGitHub,
freezegun,
netifaces,
pytest-aiohttp,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
urllib3,
@@ -15,7 +16,7 @@
buildPythonPackage rec {
pname = "pydaikin";
version = "2.13.8";
version = "2.14.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -24,9 +25,11 @@ buildPythonPackage rec {
owner = "fredrike";
repo = "pydaikin";
tag = "v${version}";
hash = "sha256-folK2uZN2HtSXpRuhuHV42r1KrNWZX0ai/XO2OE8UFs=";
hash = "sha256-5qkJjGfVoNVHHmr77aWajpYmyfmV/ZyO3tXY9/gj6eU=";
};
__darwinAllowLocalNetworking = true;
build-system = [ setuptools ];
dependencies = [
@@ -36,11 +39,10 @@ buildPythonPackage rec {
tenacity
];
doCheck = false; # tests fail and upstream does not seem to run them either
nativeCheckInputs = [
aresponses
freezegun
pytest-aiohttp
pytest-asyncio
pytestCheckHook
];
@@ -5,12 +5,13 @@
pytestCheckHook,
pythonOlder,
regex,
setuptools,
}:
buildPythonPackage rec {
pname = "rebulk";
version = "3.2.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,9 +20,11 @@ buildPythonPackage rec {
hash = "sha256-DTC/gPygD6nGlxhaxHXarJveX2Rs4zOMn/XV3B69/rw=";
};
propagatedBuildInputs = [ regex ];
build-system = [ setuptools ];
buildInputs = [ pytestCheckHook ];
dependencies = [ regex ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "rebulk" ];
@@ -0,0 +1,53 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
sphinx,
pytestCheckHook,
beautifulsoup4,
}:
buildPythonPackage rec {
pname = "sphinx-favicon";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "tcmetzger";
repo = "sphinx-favicon";
tag = "v${version}";
hash = "sha256-Arcjj+6WWuSfufh8oqrDyAtjp07j1JEuw2YlmFcfL3U=";
};
build-system = [
setuptools
];
dependencies = [
sphinx
];
nativeCheckInputs = [
pytestCheckHook
];
checkInputs = [
beautifulsoup4
];
disabledTests = [
# requires network to download favicons
"test_list_of_three_icons_automated_values"
];
pythonImportsCheck = [ "sphinx_favicon" ];
meta = {
description = "Sphinx extension to add custom favicons";
homepage = "https://github.com/tcmetzger/sphinx-favicon";
changelog = "https://github.com/tcmetzger/sphinx-favicon/blob/v${version}/CHANGELOG";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.newam ];
};
}
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1333";
version = "3.0.1335";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = version;
hash = "sha256-tskezZhZYQO3+/j2Li6hQduJ3cDsF3ti8OcQ/k6xceQ=";
hash = "sha256-g6wTbYPLXIN3YuHXN4Z5GLLsA9S0+gHIXT5x4GxAREE=";
};
build-system = [ setuptools ];
@@ -0,0 +1,59 @@
{
lib,
stdenv,
buildPythonPackage,
distutils,
setuptools,
unicorn-angr,
}:
buildPythonPackage rec {
pname = "unicorn-angr";
version = lib.getVersion unicorn-angr;
pyproject = true;
src = unicorn-angr.src;
sourceRoot = "${src.name}/bindings/python";
prePatch = ''
ln -s ${unicorn-angr}/lib/libunicorn.* prebuilt/
'';
# Needed on non-x86 linux
setupPyBuildFlags =
lib.optionals stdenv.hostPlatform.isLinux [
"--plat-name"
"linux"
]
# aarch64 only available from MacOS SDK 11 onwards, so fix the version tag.
# otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense.
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
"--plat-name"
"macosx_11_0"
];
build-system = [
distutils
setuptools
];
checkPhase = ''
runHook preCheck
mv unicorn unicorn.hidden
patchShebangs sample_*.py shellcode.py
sh -e sample_all.sh
runHook postCheck
'';
pythonImportsCheck = [ "unicorn" ];
meta = with lib; {
description = "Python bindings for Unicorn CPU emulator engine";
homepage = "https://www.unicorn-engine.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fab ];
};
}
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "upb-lib";
version = "0.6.0";
version = "0.6.1";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gwww";
repo = "upb-lib";
tag = version;
hash = "sha256-4RDatZXEwjNVbz1/ZNA6HY2fDHMq2dE/Huf4Ui3wU3c=";
hash = "sha256-tjmsg8t2/WEjnRHyqN2lxsAgfISV1uAnhmq2dXAG15A=";
};
build-system = [ hatchling ];
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
version = "2025.1.1";
version = "2025.3.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = "velbus-aio";
tag = version;
hash = "sha256-r6j2C+x7BX7EOFdrQ/N5/NRjHFgyxiQlq/cXnnCg73s=";
hash = "sha256-hcVKJq+3cnhHtYc27lAj92CHzW3woCxU9dJ5lvj5Kgc=";
fetchSubmodules = true;
};
@@ -7,6 +7,7 @@
coreutils,
git,
nix,
nixfmt-rfc-style,
}:
attrPath:
@@ -21,6 +22,7 @@ let
coreutils
git
nix
nixfmt-rfc-style
]
}
set -o errexit
@@ -39,6 +41,7 @@ let
export BUNDLE_FORCE_RUBY_PLATFORM=1
bundler lock --update
bundix
nixfmt gemset.nix
'';
in
[
@@ -9,12 +9,13 @@
stdenv.mkDerivation rec {
pname = "include-what-you-use";
# Also bump llvmPackages in all-packages.nix to the supported version!
version = "0.22";
# Make sure to bump `llvmPackages` in "pkgs/top-level/all-packages.nix" to the supported version:
# https://github.com/include-what-you-use/include-what-you-use?tab=readme-ov-file#clang-compatibility
version = "0.23";
src = fetchurl {
url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
hash = "sha256-hZB0tGHqS4MlpzQYwgfKM7XmVmsI5rWH65FkQWVppt0=";
hash = "sha256-AATVqRaXF6zy9IEkilv8FcfVXdwrnNx/RhsG6T1Jxz8=";
};
postPatch = ''
File diff suppressed because it is too large Load Diff
@@ -34,23 +34,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-3EVNlOAVfx/wUFn83VBKs1N5PanS4jVADUPlhCIok5M=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"capstone-0.10.0" = "sha256-x0p005W6u3QsTKRupj9HEg+dZB3xCXlKb9VCKv+LJ0U=";
"hidapi-1.4.1" = "sha256-2SBQu94ArGGwPU3wJYV0vwwVOXMCCq+jbeBHfKuE+pA=";
"hif-0.3.1" = "sha256-o3r1akaSARfqIzuP86SJc6/s0b2PIkaZENjYO3DPAUo=";
"humpty-0.1.3" = "sha256-efeb+RaAjQs9XU3KkfVo8mVK2dGyv+2xFKSVKS0vyTc=";
"idol-0.3.0" = "sha256-s6ZM/EyBE1eOySPah5GtT0/l7RIQKkeUPybMmqUpmt8=";
"idt8a3xxxx-0.1.0" = "sha256-S36fS9hYTIn57Tt9msRiM7OFfujJEf8ED+9R9p0zgK4=";
"libusb1-sys-0.5.0" = "sha256-7Bb1lpZvCb+OrKGYiD6NV+lMJuxFbukkRXsufaro5OQ=";
"pmbus-0.1.0" = "sha256-20peEHZl6aXcLhw/OWb4RHAXWRNqoMcDXXglwNP+Gpc=";
"probe-rs-0.12.0" = "sha256-/L+85K6uxzUmz/TlLLFbMlyekoXC/ClO33EQ/yYjQKU=";
"spd-0.1.0" = "sha256-X6XUx+huQp77XF5EZDYYqRqaHsdDSbDMK8qcuSGob3E=";
"tlvc-0.2.0" = "sha256-HiqDRqmKOTxz6UQSXNMOZdWdc5W+cFGuKBkNrqFvIIE=";
"vsc7448-info-0.1.0" = "sha256-otNLdfGIzuyu03wEb7tzhZVVMdS0of2sU/AKSNSsoho=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-wuXlm6a0hz5E7lOQXlkjHTkD9tqU670uEBM6Gk4o+/Q=";
meta = with lib; {
description = "Debugger for Hubris";
+1
View File
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
git
luaEnv
pkg-config
qttools
which

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