Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
@@ -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;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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 =
|
||||
|
||||
@@ -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
@@ -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 = [
|
||||
|
||||
@@ -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"
|
||||
-4451
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;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -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
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
|
||||
"-include stdio.h"
|
||||
"-Wno-error=stringop-truncation"
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-unused-variable"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -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=";
|
||||
|
||||
@@ -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}";
|
||||
};
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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)) {
|
||||
@@ -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
Generated
-3259
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
Generated
-1769
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
|
||||
Generated
-2665
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
|
||||
Generated
-278
@@ -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"
|
||||
@@ -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
|
||||
|
||||
-1519
File diff suppressed because it is too large
Load Diff
@@ -18,9 +18,8 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-eueB+ZrOrnySEwUpCTvC4qARCsDcHJhm088XepLTlOE=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-3D0HjDtKwYoi9bpQnosC/TPNBjfiWi5m1CH1eGQpGg0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
Generated
-2982
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
|
||||
@@ -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
@@ -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 ];
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -83,6 +83,7 @@ stdenv.mkDerivation {
|
||||
|
||||
hardeningDisable = [
|
||||
"pic"
|
||||
"pie" # MBR gets too big with PIE
|
||||
"stackprotector"
|
||||
"fortify"
|
||||
];
|
||||
|
||||
@@ -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) => {
|
||||
@@ -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
|
||||
'';
|
||||
|
||||
@@ -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,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 = ''
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -74,7 +74,7 @@ in
|
||||
argparse = prev.argparse.overrideAttrs (oa: {
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ final.busted ];
|
||||
nativeCheckInputs = [ final.busted ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
-4298
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";
|
||||
|
||||
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git
|
||||
luaEnv
|
||||
pkg-config
|
||||
qttools
|
||||
which
|
||||
|
||||
@@ -79,7 +79,8 @@ let base = {
|
||||
hash = "sha256-OxkPpmnYTl65ns+hKHJd5IAPUiMj0g3HUpyRpwDNut8=";
|
||||
};
|
||||
|
||||
buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ];
|
||||
nativeBuildInputs = base.nativeBuildInputs ++ [ unzip ];
|
||||
buildInputs = base.buildInputs ++ [ zlib libtommath libtomcrypt ];
|
||||
});
|
||||
|
||||
firebird = firebird_4;
|
||||
|
||||
@@ -24,16 +24,16 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x64-linux_hash = "sha256-wyGvTXsXSsfTrlWVBaqbeDhj5s6w31+Ixi0sxsHcOjA=";
|
||||
arm64-linux_hash = "sha256-iqgyCNY62FBIyjcHXDk1zZY0RzFhUA5IQ8EDzAonKRE=";
|
||||
x64-osx_hash = "sha256-h9qKe1GL2DSBAFhtztS254ILMCeIZqlCXyO0AvSA5Zo=";
|
||||
x64-linux_hash = "sha256-5pnHuYjT+O/mlGC+arIofwlAwOWOzyYa4/jK+fstkHs=";
|
||||
arm64-linux_hash = "sha256-yBZQuTNPIPCa2LqaRd9rFinJpPvJraAe4xo09mt8RD8=";
|
||||
x64-osx_hash = "sha256-VZTFsjB08/plpwv0ErwHbyIiSBGxsXAz92X2AdACN1E=";
|
||||
}
|
||||
."${arch}-${os}_hash";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ombi";
|
||||
version = "4.44.1";
|
||||
version = "4.47.1";
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
|
||||
Generated
-587
@@ -1,587 +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.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ansi_term"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
|
||||
[[package]]
|
||||
name = "bstr"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.67"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
"time",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "2.33.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
"bitflags",
|
||||
"strsim",
|
||||
"textwrap",
|
||||
"unicode-width",
|
||||
"vec_map",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clml_rs"
|
||||
version = "0.3.0"
|
||||
source = "git+https://github.com/K4rakara/clml-rs#eecf1378f4e85a9b3dc91e8a15d497a2fd75906f"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"rand",
|
||||
"regex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cmd_lib"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42443b644d30f401746fb4483fba96b13076e1ef6cb5bca7d6a14d1d8f9f2bd9"
|
||||
dependencies = [
|
||||
"cmd_lib_core",
|
||||
"cmd_lib_macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cmd_lib_core"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c50c50a1536e882455aeaff22015146ea143b9106fc8e116669dd078ec7b7fc8"
|
||||
|
||||
[[package]]
|
||||
name = "cmd_lib_macros"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2d202b0cfc28d8928ba89138c0a8248cf921b9870c6c9d60c9951092df5b62b2"
|
||||
dependencies = [
|
||||
"cmd_lib_core",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "core-foundation-sys"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-channel"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-deque"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-epoch",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.9.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-utils",
|
||||
"lazy_static",
|
||||
"memoffset",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cfg-if",
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "doc-comment"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
|
||||
|
||||
[[package]]
|
||||
name = "freshfetch"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"clap",
|
||||
"clml_rs",
|
||||
"cmd_lib",
|
||||
"cmd_lib_core",
|
||||
"lazy_static",
|
||||
"mlua",
|
||||
"regex",
|
||||
"sysinfo",
|
||||
"term_size",
|
||||
"uname",
|
||||
"users",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.1.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi 0.9.0+wasi-snapshot-preview1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.93"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lua-src"
|
||||
version = "543.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "029180f994b9b36f47d905f92569b516acf7d073778e2e781c15ee375b1ca27d"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "luajit-src"
|
||||
version = "210.1.3+restyfe08842"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36d3de8377d8e0492b646527befb7eb826a9ecd2dc8c1f81ab0e654bc03a029b"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mlua"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f2fc8e1085d53b72898c59ceee1980b5826b0c98ce99886b7518f0ead00e5cb"
|
||||
dependencies = [
|
||||
"bstr",
|
||||
"cc",
|
||||
"lazy_static",
|
||||
"lua-src",
|
||||
"luajit-src",
|
||||
"num-traits",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ntapi"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_cpus"
|
||||
version = "1.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
|
||||
dependencies = [
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_hc"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rayon"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"crossbeam-deque",
|
||||
"either",
|
||||
"rayon-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rayon-core"
|
||||
version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"crossbeam-deque",
|
||||
"crossbeam-utils",
|
||||
"lazy_static",
|
||||
"num_cpus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.4.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
|
||||
[[package]]
|
||||
name = "sysinfo"
|
||||
version = "0.15.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de94457a09609f33fec5e7fceaf907488967c6c7c75d64da6a7ce6ffdb8b5abd"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"cfg-if",
|
||||
"core-foundation-sys",
|
||||
"doc-comment",
|
||||
"libc",
|
||||
"ntapi",
|
||||
"once_cell",
|
||||
"rayon",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "term_size"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
|
||||
dependencies = [
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.1.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"wasi 0.10.0+wasi-snapshot-preview1",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "uname"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
|
||||
|
||||
[[package]]
|
||||
name = "users"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "vec_map"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.9.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
@@ -21,12 +21,8 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "1l9zngr5l12g71j85iyph4jjri3crxc2pi9q0gczrrzvs03439mn";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"clml_rs-0.3.0" = "sha256-KTAm0TCNHGeuOmqmLcZfjl2mQmWcCxWaTPOzA38qbUM=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-LKltHVig33zUSWoRgCb1BgeKiJsDnlYEuPfQfrnhafI=";
|
||||
|
||||
# freshfetch depends on rust nightly features
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
@@ -13,17 +13,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-du";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symphorien";
|
||||
repo = "nix-du";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WImnfkBU17SFQG1DzVUdsNq3hkiISNjAVZr2xGbgwHg=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RkGPXjog2XR3ISlWMQZ1rzy3SwE5IPAKP09FIZ6LwkM=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-HUyqkO9uPrfqTCljJzKfQ5sRCh4uj8XL4wSkwmc/Z8A=";
|
||||
cargoHash = "sha256-rrBFgE3Tz68gBQbz006RSdsqacSZqON78NM4FNi+wrk=";
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [
|
||||
@@ -49,5 +49,6 @@ rustPlatform.buildRustPackage rec {
|
||||
maintainers = [ maintainers.symphorien ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "nix-du";
|
||||
changelog = "https://github.com/symphorien/nix-du/blob/v${version}/CHANGELOG.md";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7930,7 +7930,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
|
||||
llvmPackages = llvmPackages_18;
|
||||
llvmPackages = llvmPackages_19;
|
||||
};
|
||||
|
||||
inherit (callPackage ../applications/misc/inochi2d { })
|
||||
|
||||
@@ -15616,6 +15616,8 @@ self: super: with self; {
|
||||
|
||||
sphinx-external-toc = callPackage ../development/python-modules/sphinx-external-toc { };
|
||||
|
||||
sphinx-favicon = callPackage ../development/python-modules/sphinx-favicon { };
|
||||
|
||||
sphinx-fortran = callPackage ../development/python-modules/sphinx-fortran { };
|
||||
|
||||
sphinx-hoverxref = callPackage ../development/python-modules/sphinx-hoverxref { };
|
||||
|
||||
Reference in New Issue
Block a user