Merge staging-next into staging
This commit is contained in:
@@ -447,14 +447,6 @@ in
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
"systemd-journal.plugin" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";
|
||||
capabilities = "cap_dac_read_search,cap_syslog+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
"slabinfo.plugin" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";
|
||||
capabilities = "cap_dac_override+ep";
|
||||
@@ -490,6 +482,15 @@ in
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (cfg.package.withSystemdJournal) {
|
||||
"systemd-journal.plugin" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";
|
||||
capabilities = "cap_dac_read_search,cap_syslog+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
};
|
||||
|
||||
security.pam.loginLimits = [
|
||||
|
||||
@@ -83,6 +83,10 @@ in
|
||||
8008
|
||||
8009
|
||||
];
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.nettools
|
||||
];
|
||||
};
|
||||
|
||||
client =
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2025-07-18";
|
||||
version = "0-unstable-2025-07-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "9491dab32de7d70c51a3d9fec6e17d1ea7e52a3f";
|
||||
hash = "sha256-x0gBSSjbM/neIwjA7qmi5gvSGmeyaRNmDs2z9awakXY=";
|
||||
rev = "ae41c16e10a1996e71ac7dd9a5484b725b8d1a51";
|
||||
hash = "sha256-mBlk4tjMd67dOw/+oYC0ly7u2Soqva4MxiODGXPjBrM=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "puae";
|
||||
version = "0-unstable-2025-07-10";
|
||||
version = "0-unstable-2025-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-uae";
|
||||
rev = "c59492b07f7c586064692110e8138c83ed8bc7c7";
|
||||
hash = "sha256-ijcajte446DSjD2vJ7PNdD6Zr9Wj39kEw844g1VARJw=";
|
||||
rev = "3fc66ee4b562910a17e2e2f3bad74572a8bcc134";
|
||||
hash = "sha256-rCdrM4511Q0OFwCsHZpYtg/4J1A4hwDc5WjwY0HDj8k=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
bison,
|
||||
flex,
|
||||
fontforge,
|
||||
gettext,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
nixosTests,
|
||||
@@ -92,16 +93,19 @@ stdenv.mkDerivation (
|
||||
# Fixes "Compiler cannot create executables" building wineWow with mingwSupport
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
flex
|
||||
fontforge
|
||||
makeWrapper
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals supportFlags.mingwSupport (
|
||||
mingwGccs ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin
|
||||
);
|
||||
nativeBuildInputs =
|
||||
with supportFlags;
|
||||
[
|
||||
bison
|
||||
flex
|
||||
fontforge
|
||||
makeWrapper
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optional gettextSupport gettext
|
||||
++ lib.optionals mingwSupport (
|
||||
mingwGccs ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin
|
||||
);
|
||||
|
||||
buildInputs = toBuildInputs pkgArches (
|
||||
with supportFlags;
|
||||
@@ -115,7 +119,6 @@ stdenv.mkDerivation (
|
||||
++ lib.optional stdenv.hostPlatform.isLinux pkgs.libcap
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue
|
||||
++ lib.optional cupsSupport pkgs.cups
|
||||
++ lib.optional gettextSupport pkgs.gettext
|
||||
++ lib.optional dbusSupport pkgs.dbus
|
||||
++ lib.optional cairoSupport pkgs.cairo
|
||||
++ lib.optional odbcSupport pkgs.unixODBC
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
fetchpatch,
|
||||
stdenv,
|
||||
libnotify,
|
||||
python-telegram,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "tg";
|
||||
version = "0.19.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paul-nameless";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-apHd26XnOz5nak+Kz8PJPsonQfTWDyPz7Mi/tWf7zwM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix sending messages
|
||||
# https://github.com/paul-nameless/tg/pull/306
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mindtheegab/tg/commit/13e2b266989d2d757a394b0fb8cb7fd6ccc2b70c.patch";
|
||||
hash = "sha256-Wja6xBOlPuACzhbT8Yl3F8qSh3Kd9G1lnr9VarbPrfM=";
|
||||
})
|
||||
];
|
||||
|
||||
# Fix notifications on platforms other than darwin by providing notify-send
|
||||
postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
sed -i 's|^NOTIFY_CMD = .*|NOTIFY_CMD = "${libnotify}/bin/notify-send {title} {message} -i {icon_path}"|' tg/config.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ python-telegram ];
|
||||
|
||||
doCheck = false; # No tests
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal client for telegram";
|
||||
mainProgram = "tg";
|
||||
homepage = "https://github.com/paul-nameless/tg";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "android-backup-extractor";
|
||||
version = "0-unstable-2025-01-15-62310d4";
|
||||
version = "0-unstable-2025-01-15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nelenkov/android-backup-extractor/releases/download/latest/abe-62310d4.jar";
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "artim-dark";
|
||||
pname = "aritim-dark";
|
||||
version = "unstable-2021-12-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "arubaotp-seed-extractor";
|
||||
version = "0-unstable-22-12-2022";
|
||||
version = "0-unstable-2022-12-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andry08";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bashunit";
|
||||
version = "0.22.2";
|
||||
version = "0.22.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TypedDevs";
|
||||
repo = "bashunit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-neQ7/euCGn0u9ph4Z3vGsptayZ47cY0iG6FFRkwBFG0=";
|
||||
hash = "sha256-CN3BmsAFRQSkcS97XkKsL9+lChxb7V05iw8xoq0QVZE=";
|
||||
forceFetchGit = true; # needed to include the tests directory for the check phase
|
||||
};
|
||||
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bettercap";
|
||||
version = "2.41.0";
|
||||
version = "2.41.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bettercap";
|
||||
repo = "bettercap";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qQNsdKUiTSXkvfIguR1Rjs3A1WW4G1ernqRWTKBjIVI=";
|
||||
sha256 = "sha256-NvCAG5+oZ5Xf2gbFKNlLXNxkvvK10py+qksJ5te2aGI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OxcBk22TvlcnHqJ0VzuewZtWLm/DPo6Cdq7RKabOg8w=";
|
||||
vendorHash = "sha256-1kgjMPsj8z2Cl0YWe/1zY0Zuiza0X+ZAIgsMqPhCrMw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "bounty";
|
||||
version = "0.1.0-unstable-25-01-29";
|
||||
version = "0.1.0-unstable-2025-02-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghbountybot";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "breeze-hacked-cursor-theme";
|
||||
version = "0-unstable-2024-1-28";
|
||||
version = "0-unstable-2024-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clayrisser";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ceptre";
|
||||
version = "0-unstable-2024-8-26";
|
||||
version = "0-unstable-2024-08-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisamaphone";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "crowdsec";
|
||||
version = "1.6.9";
|
||||
version = "1.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crowdsecurity";
|
||||
repo = "crowdsec";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Gu4Ds9o4CsimMoKqJV2weAQYH34Z7GN3rPbhbtoVuHU=";
|
||||
hash = "sha256-fHnd/pnmVAPvCtae4aRS66tXmMp6DgNagqWNrT9hcw8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xUzYHVhqyMUQQH5ICkwgaDiFi/L4exROjvJNWS2j9ZU=";
|
||||
vendorHash = "sha256-ImrXOD3kIlNsEZOTeMA6UFvMZCnfMOTZOXtY3ger8YI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -3,17 +3,19 @@
|
||||
clang,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
versionCheckHook,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dae";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daeuniverse";
|
||||
repo = "dae";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RpbWZEoGrCq3Py0hu6YDie6ErDTLS3oabqScPzhCtm0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
@@ -33,7 +35,7 @@ buildGoModule rec {
|
||||
|
||||
make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector -Wno-unused-command-line-argument" \
|
||||
NOSTRIP=y \
|
||||
VERSION=${version} \
|
||||
VERSION=${finalAttrs.version} \
|
||||
OUTPUT=$out/bin/dae
|
||||
|
||||
runHook postBuild
|
||||
@@ -45,25 +47,32 @@ buildGoModule rec {
|
||||
postInstall = ''
|
||||
install -Dm444 install/dae.service $out/lib/systemd/system/dae.service
|
||||
substituteInPlace $out/lib/systemd/system/dae.service \
|
||||
--replace /usr/bin/dae $out/bin/dae
|
||||
--replace-fail "/usr/bin/dae" "$out/bin/dae"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dae;
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) dae;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Linux high-performance transparent proxy solution based on eBPF";
|
||||
homepage = "https://github.com/daeuniverse/dae";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
oluceps
|
||||
pokon548
|
||||
luochen1990
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "dae";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,19 +9,19 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "emmet-language-server";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olrtg";
|
||||
repo = "emmet-language-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2ptIdZPGLjKsdFJKjt5LZ8JQNNBU5KR62Yw78qzfRxg=";
|
||||
hash = "sha256-Lojy7y7RnPZPV9x0Mb4Rjm18RHwx6ejEpCo8wmXIOMw=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-hh5PEtmSHPs6QBgwWHS0laGU21e82JckIP3mB/P9/vE=";
|
||||
hash = "sha256-sMOC5MQmJKwXZoUZnOmBy2I83SNMdrPc6WQKmeVGiCc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fex";
|
||||
version = "2506";
|
||||
version = "2507.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FEX-Emu";
|
||||
repo = "FEX";
|
||||
tag = "FEX-${finalAttrs.version}";
|
||||
|
||||
hash = "sha256-wzUAyNCfMlABBd3yzFZkPUiy7spuHrekTqVoyUB9jxI=";
|
||||
hash = "sha256-F6rMEPmw2UxWw+XWsUXrrUjvrDcIA1W+spkcq3tdUMI=";
|
||||
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foma";
|
||||
version = "0.10.0alpha-unstable-03-13-2024";
|
||||
version = "0.10.0alpha-unstable-2024-03-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhulden";
|
||||
|
||||
@@ -17,17 +17,17 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "forgejo-runner";
|
||||
version = "7.0.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "code.forgejo.org";
|
||||
owner = "forgejo";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vt0uPGJdydy4cM1AEBeXQu4aNRggqaITS3eAmimVPRU=";
|
||||
hash = "sha256-ORFmCvKFbNQ1MGHifNhPmrPDep+WE603+xkIqMF/w6g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hE03QkXSPyl7IVEnXi/wWwQZOVcdyyGdEmGiOwLK6Zg=";
|
||||
vendorHash = "sha256-4TX1ol2WwvZ4WYIzLFfVlYkcT5eLduESc+jg4Ysas2o=";
|
||||
|
||||
# See upstream Makefile
|
||||
# https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
version ? "0.9.11.1",
|
||||
hash ? "sha256-7p09J4nyjsnprk8DZM8nKG+G7h6m9wtZPrz0DIIKa8I=",
|
||||
version ? "0.9.11.2",
|
||||
hash ? "sha256-Go2KGEUu93jAxwFQ/yEOvePQpSjFW+dJxQ1tWQXr2fY=",
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index bb8d370..7c5b7ac 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -35,6 +35,10 @@ anyhow = "1.0.89"
|
||||
insta.opt-level = 3
|
||||
similar.opt-level = 3
|
||||
|
||||
+# work around https://github.com/NixOS/nixpkgs/issues/427072
|
||||
+[profile.release.package.hyper]
|
||||
+opt-level = 0
|
||||
+
|
||||
[lints.clippy]
|
||||
pedantic = { level = "warn", priority = -1 }
|
||||
cargo = { level = "warn", priority = -1 }
|
||||
@@ -22,6 +22,15 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-G9M+1OWp2jlDeSDFagH/YOCdxGQbcru1KFyKEUcMe7g=";
|
||||
|
||||
patches =
|
||||
lib.optional (stdenv.hostPlatform.system == "x86_64-darwin")
|
||||
# work around rust 1.88 compiler / linker bug for x86_64-darwin. This is
|
||||
# applied conditionally because it will introduce a performance penalty on
|
||||
# other host platforms. NOTE: Please check the patch applies if you update
|
||||
# the package on a different platform (e.g x86_64-linux).
|
||||
# see: https://github.com/NixOS/nixpkgs/issues/427072
|
||||
./fix-cargo-1_88-reqwest.patch;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "iso-flags";
|
||||
version = "0-unstable-18012020";
|
||||
version = "0-unstable-2020-01-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joielechong";
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
check
|
||||
];
|
||||
|
||||
mesonFlags = lib.optional finalAttrs.doCheck (lib.strings.mesonBool "test" true);
|
||||
mesonFlags = [ (lib.strings.mesonBool "test" finalAttrs.finalPackage.doCheck) ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
pcre2,
|
||||
sqlite,
|
||||
@@ -25,25 +24,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lnav";
|
||||
version = "0.12.4";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tstack";
|
||||
repo = "lnav";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XS3/km2sJwRnWloLKu9X9z07+qBFRfUsaRpZVYjoclI=";
|
||||
hash = "sha256-1TS954ysXqSuMEGdzc2b9HTJ+ic0qfyc35j8RFzjLWA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes lnav in tmux by patching vendored dependency notcurses
|
||||
# https://github.com/tstack/lnav/issues/1390
|
||||
# remove on next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tstack/lnav/commit/5e0bfa483714f05397265a690960d23ae22e1838.patch";
|
||||
hash = "sha256-dArPJik9KVI0KQjGw8W11oqGrbsBCNOr93gaH3yDPpo=";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
separateDebugInfo = true;
|
||||
@@ -89,7 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex=^v(\\d+(?:\\.\\d+)*)$" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/tstack/lnav";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau";
|
||||
version = "0.683";
|
||||
version = "0.684";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luau-lang";
|
||||
repo = "luau";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-FOqqAX4Fyznx95ssaJ225U5BSjQH7RkFRZFU9YgLY48=";
|
||||
hash = "sha256-Z+6zB4idX56eTZE8LN5EW2SFBTqhGXVgylhggeC3EJo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mcp-grafana";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "mcp-grafana";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Y5uzHLekC756dpMmhPXggLRO5bIawCdzSSoJjrwr4Qo=";
|
||||
hash = "sha256-huJt0UtaKs/F4v7FJXb0fILqBd+OaTL9X0MUb9KZsX8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PsfjKkdhgblo3ksjP1tewoJQCQmWuWoSAO5Pfn9iMVM=";
|
||||
vendorHash = "sha256-4TqbAUZQNwlfP44rRlmx+6ZaiOPEKcJ+K7qYja3pL/4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -18,23 +18,23 @@
|
||||
util-linux,
|
||||
xwininfo,
|
||||
zenity,
|
||||
zig_0_13,
|
||||
zig_0_14,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mepo";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~mil";
|
||||
repo = "mepo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-hEsQpTrj2WCoRgNWdhcUnQRzhI/6BydcbG9kRePstgg=";
|
||||
hash = "sha256-1NE8lADvcxWGi01kxYW2tCOhnVee+T76ITvwSj6M5DM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
zig_0_13.hook
|
||||
zig_0_14.hook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py
|
||||
index 641db77..712c55b 100644
|
||||
index aeca3e3..aeb6763 100644
|
||||
--- a/minigalaxy/launcher.py
|
||||
+++ b/minigalaxy/launcher.py
|
||||
@@ -77,6 +77,7 @@ def get_execute_command(game) -> list:
|
||||
@@ -84,6 +84,7 @@ def get_execute_command(game) -> list:
|
||||
if game.get_info("use_mangohud") is True:
|
||||
exe_cmd.insert(0, "mangohud")
|
||||
exe_cmd.insert(1, "--dlsym")
|
||||
@@ -11,22 +11,22 @@ index 641db77..712c55b 100644
|
||||
logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd))
|
||||
return exe_cmd
|
||||
diff --git a/tests/test_installer.py b/tests/test_installer.py
|
||||
index 8e6cb76..a9d9f46 100644
|
||||
index d459b62..dee93cb 100644
|
||||
--- a/tests/test_installer.py
|
||||
+++ b/tests/test_installer.py
|
||||
@@ -296,13 +296,13 @@ def test_get_exec_line(self, mock_list_dir, mock_which):
|
||||
@@ -405,13 +405,13 @@ class Test(TestCase):
|
||||
mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"]
|
||||
|
||||
result1 = installer.get_exec_line(game1)
|
||||
- self.assertEqual(result1, "scummvm -c beneath.ini")
|
||||
+ self.assertEqual(result1, "@steamrun@ scummvm -c beneath.ini")
|
||||
- self.assertEqual("scummvm -c beneath.ini", result1)
|
||||
+ self.assertEqual("@steamrun@ scummvm -c beneath.ini", result1)
|
||||
|
||||
game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux")
|
||||
mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"]
|
||||
|
||||
result2 = installer.get_exec_line(game2)
|
||||
- self.assertEqual(result2, "./start.sh")
|
||||
+ self.assertEqual(result2, "@steamrun@ ./start.sh")
|
||||
- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
+ self.assertEqual('@steamrun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
|
||||
@mock.patch('os.path.getsize')
|
||||
@mock.patch('os.listdir')
|
||||
|
||||
@@ -6,24 +6,26 @@
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
libnotify,
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
steam-run,
|
||||
replaceVars,
|
||||
unzip,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook3,
|
||||
xdg-utils,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "minigalaxy";
|
||||
version = "1.3.1";
|
||||
format = "setuptools";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkwouter";
|
||||
repo = "minigalaxy";
|
||||
tag = version;
|
||||
hash = "sha256-nxWJm+CkxZqRMUYQA0ZJKOb2fD1tPYXnYhy+DOnDbkQ=";
|
||||
hash = "sha256-ZHTjppdLxKDURceonbH7dJz+krBhu3lr2P7QPVDxRZw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -32,12 +34,6 @@ python3Packages.buildPythonApplication rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace minigalaxy/installer.py \
|
||||
--replace-fail '"unzip"' "\"${lib.getExe unzip}\"" \
|
||||
--replace-fail "'unzip'" "\"${lib.getExe unzip}\""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
@@ -47,6 +43,16 @@ python3Packages.buildPythonApplication rec {
|
||||
glib-networking
|
||||
gtk3
|
||||
libnotify
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
pygobject3
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
@@ -59,25 +65,29 @@ python3Packages.buildPythonApplication rec {
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonPath = [
|
||||
python3Packages.pygobject3
|
||||
python3Packages.requests
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--suffix PATH : "${
|
||||
lib.makeBinPath [
|
||||
unzip
|
||||
xdg-utils
|
||||
]
|
||||
}"
|
||||
)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://sharkwouter.github.io/minigalaxy/";
|
||||
changelog = "https://github.com/sharkwouter/minigalaxy/blob/${version}/CHANGELOG.md";
|
||||
downloadPage = "https://github.com/sharkwouter/minigalaxy/releases";
|
||||
description = "Simple GOG client for Linux";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ RoGreat ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nelm";
|
||||
version = "1.7.2";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "nelm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EmsA9ppuAZnrYtJE96vg3s+QGlsl4gXcQj2A0Buur4g=";
|
||||
hash = "sha256-IZO+uMWa2dxvfRhxeVy6JRIzRC1CduZxUHPrA8lqxi8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-q7+/OdYt/mdf/oZfFh3/vU8uOKaUpX+lLAFAOHgy6mk=";
|
||||
vendorHash = "sha256-wrZe0YmsMOHD3NOOXRKM0ZLnnOvasFyPq26JIAqyXTQ=";
|
||||
|
||||
subPackages = [ "cmd/nelm" ];
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "nzp-assets";
|
||||
version = "0-unstable-2024-09-28-13-34-48";
|
||||
version = "0-unstable-2024-09-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nzp-team";
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nzp-fteqw";
|
||||
version = "0-unstable-2024-09-11-20-07-31";
|
||||
version = "0-unstable-2024-09-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nzp-team";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "nzp-quakec";
|
||||
version = "0-unstable-2024-10-12-12-03-59";
|
||||
version = "0-unstable-2024-10-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nzp-team";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oapi-codegen";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmap";
|
||||
repo = "oapi-codegen";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-21VhHSyfF+NHkXlr2svjwBNZmfS1O448POBP9XUQxak=";
|
||||
hash = "sha256-Z10rJMancQLefyW0wXWaODIKfSY+4b3T+TAro//xsAQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bp5sFZNJFQonwfF1RjCnOMKZQkofHuqG0bXdG5Hf3jU=";
|
||||
vendorHash = "sha256-obpY7ZATebI/7bkPMidC83xnN60P0lZsJhSuKr2A5T4=";
|
||||
|
||||
# Tests use network
|
||||
doCheck = false;
|
||||
|
||||
@@ -2,29 +2,38 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
|
||||
# native check inputs
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "openscad-lsp";
|
||||
version = "1.2.5";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Leathong";
|
||||
repo = "openscad-LSP";
|
||||
rev = "dc1283df080b981f8da620744b0fb53b22f2eb84";
|
||||
hash = "sha256-IPTBWX0kKmusijg4xAvS1Ysi9WydFaUWx/BkZbMvgJk=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ACxsXGeVYmB13x/n+molCoScSOe6Zh2PYiaGGHnd4DQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qHwtLZUM9FrzDmg9prVtSf19KtEp8cZO/7XoXtZb5IQ=";
|
||||
cargoHash = "sha256-Q4NrRVSic7M1CFq24ffUv3d835PmaHus4Z0lLnUQ7Ts=";
|
||||
|
||||
# no tests exist
|
||||
doCheck = false;
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "LSP (Language Server Protocol) server for OpenSCAD";
|
||||
mainProgram = "openscad-lsp";
|
||||
homepage = "https://github.com/Leathong/openscad-LSP";
|
||||
changelog = "https://github.com/Leathong/openscad-LSP/releases/tag/${finalAttrs.src.tag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ c-h-johnson ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "pam_ussh";
|
||||
version = "0-unstable-20210615";
|
||||
version = "0-unstable-2021-06-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uber";
|
||||
|
||||
@@ -11,20 +11,19 @@
|
||||
wrapGAppsHook4,
|
||||
gnome-settings-daemon,
|
||||
gtk4,
|
||||
libgee,
|
||||
pango,
|
||||
pantheon,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pantheon-tweaks";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantheon-tweaks";
|
||||
repo = "pantheon-tweaks";
|
||||
rev = version;
|
||||
hash = "sha256-+dkjmeY4WJfXwgNR8HlRaVfvS/2icbi8eSAkiB9x7uI=";
|
||||
hash = "sha256-/fHhVErLIQMSRkri6vqc11yZr0YaLeQTUh986If8mVg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -39,7 +38,6 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
gnome-settings-daemon # org.gnome.settings-daemon.plugins.xsettings
|
||||
gtk4
|
||||
libgee
|
||||
pango
|
||||
]
|
||||
++ (with pantheon; [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
let
|
||||
tweetnacl = stdenv.mkDerivation {
|
||||
pname = "tweetnacl";
|
||||
version = "0-unstable-12-02-2020";
|
||||
version = "0-unstable-2020-02-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ianopolous";
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pv";
|
||||
version = "1.9.31";
|
||||
version = "1.9.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-o16S7ErA6POA6OhACIFnrgEBS/oAijqdZQa4SAedrt8=";
|
||||
hash = "sha256-wGJr7Wy+9QBrU9MoHo465LKDhylGKyHszygUDu/va7E=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quickshell";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
# github mirror: https://github.com/quickshell-mirror/quickshell
|
||||
src = fetchFromGitea {
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "quickshell";
|
||||
repo = "quickshell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DdE50ZJN/mKsSF/vc9hrMboOeJ7BST5DD6GNEXgVbWg=";
|
||||
hash = "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
dontStrip = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://quickshell.outfoxxed.me";
|
||||
homepage = "https://quickshell.org";
|
||||
description = "Flexbile QtQuick based desktop shell toolkit";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "reaction";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = "ppom";
|
||||
repo = "reaction";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3FJv1n1+cpV4yrBR6PKTAhSkjas/4uTZqn4nW948jAk=";
|
||||
hash = "sha256-F/vewPUqBXq5HsD2aWPEpvTlt4MAPmaGadZMR568HFQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Is8Mkl7Qfbe2CwYB+Da99NDQZd9+qR4NnT8iU/JMPJ0=";
|
||||
cargoHash = "sha256-YvTeZJqVMRr0Iw8jynWigQPs1Y+gMao4zQnNdQxhGlM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "readest";
|
||||
version = "0.9.66";
|
||||
version = "0.9.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "readest";
|
||||
repo = "readest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0KIqPB41sS0rX5IBao+0ThPz4EttpZxSb5mL4Spuoho=";
|
||||
hash = "sha256-gcysscFxNg5OOPhO9i3Flo6/ajBJ3lVEfHDlw0632Yg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-o0R5b+cE680RgdBT+4uiCtec3y3dGxYkBmnKzT/7JOg=";
|
||||
hash = "sha256-VOqFo06HV+XFjzR3l3klmR8vLXrG6KgD8UF9mQVf9uA=";
|
||||
};
|
||||
|
||||
pnpmRoot = "../..";
|
||||
|
||||
cargoHash = "sha256-ReRCzKbdmjPr9rQwCI7mLEs/MjV2yCp7FFZAlib1xIs=";
|
||||
cargoHash = "sha256-Pf5jxPZY2NZXvWFzBhISrprJ8GpF5olwnlGabcWKf1U=";
|
||||
|
||||
cargoRoot = "../..";
|
||||
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"flutter_secure_storage_linux": "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=",
|
||||
"receive_sharing_intent": "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY="
|
||||
}
|
||||
@@ -17,22 +17,16 @@
|
||||
|
||||
flutter332.buildFlutterApplication rec {
|
||||
pname = "saber";
|
||||
version = "0.25.9";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saber-notes";
|
||||
repo = "saber";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-l1TPk6JiT/o0Pl67Vqv4NE2n/FrZKy/SqwhW58A3c6w=";
|
||||
hash = "sha256-5N4HojdDysLgCPq614ZzJXx/dx3s4F++W35fjYdevRk=";
|
||||
};
|
||||
|
||||
gitHashes = {
|
||||
receive_sharing_intent = "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY=";
|
||||
flutter_secure_storage_linux = "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=";
|
||||
irondash_engine_context = "sha256-/ohreOZDsVqfPoJ6wK7ylTQAgWw23v0b31bDQw5L2Hw=";
|
||||
super_native_extensions = "sha256-0WZ5+imtLJE8GhbAgLyCC502vvlDl5QG3xtG2nCAnQI=";
|
||||
yaru = "sha256-j0aPyHx79kzT/eLf0Y3cq4qQkQ4c76GdpjLaVNp8MuI=";
|
||||
};
|
||||
gitHashes = lib.importJSON ./gitHashes.json;
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -47,13 +41,21 @@ flutter332.buildFlutterApplication rec {
|
||||
xorg.libXmu
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs patches/remove_proprietary_dependencies.sh
|
||||
patches/remove_proprietary_dependencies.sh
|
||||
'';
|
||||
|
||||
flutterBuildFlags = [ "--dart-define=DIRTY=false" ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0644 flatpak/com.adilhanney.saber.desktop $out/share/applications/saber.desktop
|
||||
install -Dm0644 assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg
|
||||
install -Dm0644 flatpak/com.adilhanney.saber.metainfo.xml -t $out/share/metainfo
|
||||
'';
|
||||
|
||||
# Remove libpdfrx.so's reference to the /build/ directory
|
||||
preFixup = ''
|
||||
# Remove libpdfrx.so's reference to the /build/ directory
|
||||
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/saber/lib/lib*.so
|
||||
'';
|
||||
|
||||
@@ -70,6 +72,10 @@ flutter332.buildFlutterApplication rec {
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(gitUpdater { rev-prefix = "v"; })
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "saber.pubspecSource" ./pubspec.lock.json)
|
||||
{
|
||||
command = [ ./update-gitHashes.py ];
|
||||
supportedFeatures = [ "silent" ];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -64,11 +64,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "asn1lib",
|
||||
"sha256": "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623",
|
||||
"sha256": "9a8f69025044eb466b9b60ef3bc3ac99b4dc6c158ae9c56d25eeccf5bc56d024",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.6.4"
|
||||
"version": "1.6.5"
|
||||
},
|
||||
"assorted_layout_widgets": {
|
||||
"dependency": "transitive",
|
||||
@@ -94,71 +94,71 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "audioplayers",
|
||||
"sha256": "a5341380a4f1d3a10a4edde5bb75de5127fe31e0faa8c4d860e64d2f91ad84c7",
|
||||
"sha256": "e653f162ddfcec1da2040ba2d8553fff1662b5c2a5c636f4c21a3b11bee497de",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.4.0"
|
||||
"version": "6.5.0"
|
||||
},
|
||||
"audioplayers_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "audioplayers_android",
|
||||
"sha256": "f8c90823a45b475d2c129f85bbda9c029c8d4450b172f62e066564c6e170f69a",
|
||||
"sha256": "60a6728277228413a85755bd3ffd6fab98f6555608923813ce383b190a360605",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.2.0"
|
||||
"version": "5.2.1"
|
||||
},
|
||||
"audioplayers_darwin": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "audioplayers_darwin",
|
||||
"sha256": "405cdbd53ebdb4623f1c5af69f275dad4f930ce895512d5261c07cd95d23e778",
|
||||
"sha256": "0811d6924904ca13f9ef90d19081e4a87f7297ddc19fc3d31f60af1aaafee333",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.2.0"
|
||||
"version": "6.3.0"
|
||||
},
|
||||
"audioplayers_linux": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "audioplayers_linux",
|
||||
"sha256": "7e0d081a6a527c53aef9539691258a08ff69a7dc15ef6335fbea1b4b03ebbef0",
|
||||
"sha256": "f75bce1ce864170ef5e6a2c6a61cd3339e1a17ce11e99a25bae4474ea491d001",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.2.0"
|
||||
"version": "4.2.1"
|
||||
},
|
||||
"audioplayers_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "audioplayers_platform_interface",
|
||||
"sha256": "77e5fa20fb4a64709158391c75c1cca69a481d35dc879b519e350a05ff520373",
|
||||
"sha256": "0e2f6a919ab56d0fec272e801abc07b26ae7f31980f912f24af4748763e5a656",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.1.0"
|
||||
"version": "7.1.1"
|
||||
},
|
||||
"audioplayers_web": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "audioplayers_web",
|
||||
"sha256": "bd99d8821114747682a2be0adcdb70233d4697af989b549d3a20a0f49f6c9b13",
|
||||
"sha256": "1c0f17cec68455556775f1e50ca85c40c05c714a99c5eb1d2d57cc17ba5522d7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.1.0"
|
||||
"version": "5.1.1"
|
||||
},
|
||||
"audioplayers_windows": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "audioplayers_windows",
|
||||
"sha256": "871d3831c25cd2408ddc552600fd4b32fba675943e319a41284704ee038ad563",
|
||||
"sha256": "4048797865105b26d47628e6abb49231ea5de84884160229251f37dfcbe52fd7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.2.0"
|
||||
"version": "4.2.1"
|
||||
},
|
||||
"barcode": {
|
||||
"dependency": "transitive",
|
||||
@@ -350,6 +350,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.0.8"
|
||||
},
|
||||
"dart_pubspec_licenses": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_pubspec_licenses",
|
||||
"sha256": "23ddb78ff9204d08e3109ced67cd3c6c6a066f581b0edf5ee092fc3e1127f4ea",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.4"
|
||||
},
|
||||
"dart_quill_delta": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -374,11 +384,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "decimal",
|
||||
"sha256": "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3",
|
||||
"sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.2.1"
|
||||
"version": "3.2.4"
|
||||
},
|
||||
"defer_pointer": {
|
||||
"dependency": "direct main",
|
||||
@@ -404,21 +414,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "device_info_plus",
|
||||
"sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53",
|
||||
"sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "11.4.0"
|
||||
"version": "11.5.0"
|
||||
},
|
||||
"device_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "device_info_plus_platform_interface",
|
||||
"sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
|
||||
"sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.2"
|
||||
"version": "7.0.3"
|
||||
},
|
||||
"diff_match_patch": {
|
||||
"dependency": "transitive",
|
||||
@@ -783,11 +793,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_svg",
|
||||
"sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
|
||||
"sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"flutter_test": {
|
||||
"dependency": "direct dev",
|
||||
@@ -851,11 +861,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "go_router",
|
||||
"sha256": "b453934c36e289cef06525734d1e676c1f91da9e22e2017d9dcab6ce0f999175",
|
||||
"sha256": "c489908a54ce2131f1d1b7cc631af9c1a06fac5ca7c449e959192089f9489431",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "15.1.3"
|
||||
"version": "16.0.0"
|
||||
},
|
||||
"golden_screenshot": {
|
||||
"dependency": "direct dev",
|
||||
@@ -1396,11 +1406,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "pdfrx",
|
||||
"sha256": "4640c561aa31598c9c8ff9042675f7c1ecb2ca2b1190dff6e2ecaa677d1bc416",
|
||||
"sha256": "c7f80eac77b38a66f2dc49e5cbfd38ed522da77d42ac6d5552872a17f7262a67",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.35"
|
||||
"version": "1.3.3"
|
||||
},
|
||||
"perfect_freehand": {
|
||||
"dependency": "direct main",
|
||||
@@ -1416,11 +1426,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "permission_handler",
|
||||
"sha256": "2d070d8684b68efb580a5997eb62f675e8a885ef0be6e754fb9ef489c177470f",
|
||||
"sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "12.0.0+1"
|
||||
"version": "12.0.1"
|
||||
},
|
||||
"permission_handler_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -1506,11 +1516,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "platform_linux",
|
||||
"sha256": "856cfc9871e3ff3df6926991729d24bba9b70d0229ae377fa08b562344baaaa8",
|
||||
"sha256": "907b7c6da6ee6eea61cd1266b7bd72e2d5bbf7e85160221e8ac5583a44e7a1c7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.2"
|
||||
"version": "0.1.2+1"
|
||||
},
|
||||
"plugin_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1536,11 +1546,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "posix",
|
||||
"sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
|
||||
"sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.0.2"
|
||||
"version": "6.0.3"
|
||||
},
|
||||
"power_extensions": {
|
||||
"dependency": "transitive",
|
||||
@@ -1626,11 +1636,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "quill_native_bridge_linux",
|
||||
"sha256": "5fcc60cab2ab9079e0746941f05c5ca5fec85cc050b738c8c8b9da7c09da17eb",
|
||||
"sha256": "388aaa62017dbd746742ce0bfae99f4ffe1dda2462e8a866df630c67b63c54fe",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.0.1"
|
||||
"version": "0.0.2"
|
||||
},
|
||||
"quill_native_bridge_macos": {
|
||||
"dependency": "transitive",
|
||||
@@ -1666,11 +1676,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "quill_native_bridge_windows",
|
||||
"sha256": "60e50d74238f22ceb43113d9a42b6627451dab9fc27f527b979a32051cf1da45",
|
||||
"sha256": "3f96ced19e3206ddf4f6f7dde3eb16bdd05e10294964009ea3a806d995aa7caa",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.0.1"
|
||||
"version": "0.0.2"
|
||||
},
|
||||
"quiver": {
|
||||
"dependency": "transitive",
|
||||
@@ -1903,11 +1913,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "slang",
|
||||
"sha256": "6668a08355b370d5cb5446fc869c4492ed23c6433934fe88228876460fedac22",
|
||||
"sha256": "bc9488b19acbc4756aa60a9de19720045f9d49a4a7524d56475e0a6965bcd8bd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.7.2"
|
||||
"version": "4.7.3"
|
||||
},
|
||||
"slang_flutter": {
|
||||
"dependency": "direct main",
|
||||
@@ -1949,6 +1959,46 @@
|
||||
"source": "hosted",
|
||||
"version": "1.12.1"
|
||||
},
|
||||
"stow": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "stow",
|
||||
"sha256": "94707ed29bfe08a92d7ff6e7849cf1a0d43a106a8bd514e1f6a86ce0e7347efe",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.0"
|
||||
},
|
||||
"stow_codecs": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "stow_codecs",
|
||||
"sha256": "edfaee5b03d6b23df277889ec80e587e66d48fbbf7f7ef925a9d1046d08a3ec0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0+1"
|
||||
},
|
||||
"stow_plain": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "stow_plain",
|
||||
"sha256": "be2496088876a6a3c51e24de0230a3c7626c8bc47c4edb8761ce69dcddbedca3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.0"
|
||||
},
|
||||
"stow_secure": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "stow_secure",
|
||||
"sha256": "8f5e724e0f94ab052b18ffa4c3e24d32f28efdd6b069c7494552759f1aa55504",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.0"
|
||||
},
|
||||
"stream_channel": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -2003,11 +2053,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "synchronized",
|
||||
"sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
|
||||
"sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.3.1"
|
||||
"version": "3.4.0"
|
||||
},
|
||||
"term_glyph": {
|
||||
"dependency": "transitive",
|
||||
@@ -2073,11 +2123,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "url_launcher",
|
||||
"sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
|
||||
"sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.3.1"
|
||||
"version": "6.3.2"
|
||||
},
|
||||
"url_launcher_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -2303,11 +2353,41 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "workmanager",
|
||||
"sha256": "f3c3ce6d79cce53eee4a29dd2e8328c25db5ba5d9062fcc5e8f3c71e0af9b7e4",
|
||||
"sha256": "dffcbbfd99af17271ca52d8a3767ba8a1000b357f2774db8ed5d58879cb9783a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.0"
|
||||
"version": "0.8.0"
|
||||
},
|
||||
"workmanager_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "workmanager_android",
|
||||
"sha256": "a6447816c41aa0ad8f6fa29b62d09a528891cf0737296397e1caae2523ced7dc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.8.0"
|
||||
},
|
||||
"workmanager_apple": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "workmanager_apple",
|
||||
"sha256": "9c99003682a8423bdc122ff4bae891e24574d1e676ea302d2ef0493266228461",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.8.0"
|
||||
},
|
||||
"workmanager_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "workmanager_platform_interface",
|
||||
"sha256": "b1f0a868f1117511a23b0eb4220f08134152433b51a83eed479b1d68bbe23789",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.8.0"
|
||||
},
|
||||
"xdg_directories": {
|
||||
"dependency": "transitive",
|
||||
@@ -2412,6 +2492,6 @@
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.8.0 <4.0.0",
|
||||
"flutter": ">=3.32.0"
|
||||
"flutter": ">=3.32.7"
|
||||
}
|
||||
}
|
||||
|
||||
Executable
+51
@@ -0,0 +1,51 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p python3 nix-prefetch-git
|
||||
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
THIS_FOLDER = Path(__file__).parent.resolve()
|
||||
PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json"
|
||||
GIT_HASHES = THIS_FOLDER / "gitHashes.json"
|
||||
|
||||
|
||||
def fetch_git_hash(url: str, rev: str) -> str:
|
||||
result = subprocess.run(
|
||||
["nix-prefetch-git", "--url", url, "--rev", rev],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=True,
|
||||
)
|
||||
return json.loads(result.stdout)["hash"]
|
||||
|
||||
|
||||
def main() -> None:
|
||||
if not PUBSPEC_LOCK.exists():
|
||||
sys.exit(1)
|
||||
try:
|
||||
data = json.loads(PUBSPEC_LOCK.read_text())
|
||||
except json.JSONDecodeError:
|
||||
sys.exit(1)
|
||||
output: dict[str, str] = {}
|
||||
for name, info in data.get("packages", {}).items():
|
||||
if info.get("source") != "git":
|
||||
continue
|
||||
desc = info.get("description")
|
||||
if not isinstance(desc, dict):
|
||||
continue
|
||||
url = desc.get("url")
|
||||
rev = desc.get("resolved-ref")
|
||||
if not (isinstance(url, str) and isinstance(rev, str)):
|
||||
continue
|
||||
try:
|
||||
package_hash = fetch_git_hash(url, rev)
|
||||
except subprocess.CalledProcessError:
|
||||
continue
|
||||
output[name] = package_hash
|
||||
GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sigslot";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "palacaze";
|
||||
repo = "sigslot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MKtVZLHp8UfXW8KJ3QjPMhxnt46xV+pA9NMqAX0iqiA=";
|
||||
hash = "sha256-8JBZ6Xid/uAOfiPKgJKetpj/oBb8lRLPgjkMnrfTKaM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -19,7 +19,7 @@ let
|
||||
|
||||
rnnoise-nu = stdenv.mkDerivation {
|
||||
pname = "rnnoise-nu";
|
||||
version = "0-unstable-07-10-2019";
|
||||
version = "0-unstable-2018-10-08";
|
||||
src = speech-denoiser-src;
|
||||
sourceRoot = "${speech-denoiser-src.name}/rnnoise";
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
@@ -34,7 +34,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "speech-denoiser";
|
||||
version = "unstable-07-10-2019";
|
||||
version = "0-unstable-2018-10-08";
|
||||
|
||||
src = speech-denoiser-src;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "stac-validator";
|
||||
version = "3.6.0";
|
||||
version = "3.10.0";
|
||||
pyproject = true;
|
||||
disabled = python3Packages.pythonOlder "3.8";
|
||||
|
||||
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
|
||||
owner = "stac-utils";
|
||||
repo = "stac-validator";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-j29Bo8n+/85fzJtif0eWYxDP86k9n4Osl9/piWmTxSs=";
|
||||
hash = "sha256-diaiF2wJyS/1DuUwPkdMyqpMfvKWvTnRo2H4O7FxYBM=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
@@ -26,6 +26,7 @@ python3Packages.buildPythonPackage rec {
|
||||
dependencies = with python3Packages; [
|
||||
click
|
||||
jsonschema
|
||||
pyyaml
|
||||
requests
|
||||
];
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "subdl";
|
||||
version = "0-unstable-2017-11.06";
|
||||
version = "0-unstable-2017-11-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexanderwink";
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "systemd-manager-tui";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Matheus-git";
|
||||
repo = "systemd-manager-tui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SFzqjd9qxXxuadSxNaCM0eGEWIiGJdXqoyXYqWqKOAc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wMuEh2m07gsOj52Bhd5BnvVRu1uZqOiQurqmcpDylXM=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Matheus-git/systemd-manager-tui";
|
||||
description = "Program for managing systemd services through a TUI";
|
||||
mainProgram = "systemd-manager-tui";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ vuimuich ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
stdenv,
|
||||
libnotify,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tg";
|
||||
version = "0.22.0";
|
||||
pyproject = true;
|
||||
disabled = python3Packages.pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paul-nameless";
|
||||
repo = "tg";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qzqYkksocR86QFmP75ZE93kMSVmdel+OTxPgt9uZHLI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "poetry-core>=1.0.0,<2.0.0" "poetry-core"
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
# Fix notifications on platforms other than darwin by providing notify-send
|
||||
sed -i 's|^NOTIFY_CMD = .*|NOTIFY_CMD = "${libnotify}/bin/notify-send {title} {message} -i {icon_path}"|' tg/config.py
|
||||
'';
|
||||
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
mailcap-fix
|
||||
python-telegram
|
||||
];
|
||||
|
||||
doCheck = false; # No tests
|
||||
|
||||
meta = {
|
||||
description = "Terminal client for telegram";
|
||||
mainProgram = "tg";
|
||||
homepage = "https://github.com/paul-nameless/tg";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
||||
@@ -15,22 +15,16 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "varia";
|
||||
version = "2025.5.14";
|
||||
version = "2025.7.19";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giantpinkrobots";
|
||||
repo = "varia";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-x2612aq/8YwDT3UYKW2P3PCVjhKhZJxH3JbY3A4IGq8=";
|
||||
hash = "sha256-/u6Eb9Se/Lt8Hisv24zfOgNE9ZxC3AJXbZHmukVLSRA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/varia-py.in \
|
||||
--replace-fail 'aria2cexec = sys.argv[1]' 'aria2cexec = "${lib.getExe aria2}"' \
|
||||
--replace-fail 'ffmpegexec = sys.argv[2]' 'ffmpegexec = "${lib.getExe ffmpeg}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@@ -44,7 +38,7 @@ python3Packages.buildPythonApplication rec {
|
||||
libadwaita
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
dependencies = with python3Packages; [
|
||||
pygobject3
|
||||
aria2p
|
||||
yt-dlp
|
||||
@@ -57,16 +51,22 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# This replaces original varia wrapper
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--add-flag "${lib.getExe aria2}"
|
||||
--add-flag "${lib.getExe ffmpeg}"
|
||||
--add-flag "NOSNAP"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Simple download manager based on aria2 and libadwaita";
|
||||
homepage = "https://giantpinkrobots.github.io/varia";
|
||||
license = licenses.mpl20;
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "varia";
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ aleksana ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "viw";
|
||||
version = "0-unstable-20171029";
|
||||
version = "0-unstable-2017-10-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lpan";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vouch-proxy";
|
||||
version = "0.41.0";
|
||||
version = "0.45.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vouch";
|
||||
repo = "vouch-proxy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HQ1NaAHY1YRbNUThW983V8x3ptzTc/zNP6yIMyDiq1s=";
|
||||
hash = "sha256-xI9xucRb2D2a1Fvp5DetB4ln3C020qSGEVnuIpy1TMI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1k9YFdackF10iJWJ22XlaENlOfRkZMs+IedDWnd/h8E=";
|
||||
vendorHash = "sha256-hieN3RJA0eBqlYxJj6hKgpQhq8s3vg/fPzxW0XSrlPA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "werf";
|
||||
version = "2.41.3";
|
||||
version = "2.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0ttukgb698ipdW2JTS9xbja+3R/VjXQVoXLJYs2lYTs=";
|
||||
hash = "sha256-HZT8MYPnSe6BQtGNiCCB/MfAsj1HQz9oXyZlKgBzbBg=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-eXZQYT65tHhMSTulXJ9UBN+9HggQL7Oo3sVFVfJDnGg=";
|
||||
vendorHash = "sha256-IlXE1mNSc/CFN5lSXvXonGQanyDS+XH8Wa3FCLM/gXc=";
|
||||
|
||||
subPackages = [ "cmd/werf" ];
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "zthrottle";
|
||||
version = "0-unstable-2017-7-24";
|
||||
version = "0-unstable-2017-07-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anko";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ca-certs-nss";
|
||||
version = "3.113.1";
|
||||
version = "3.114";
|
||||
|
||||
minimalOCamlVersion = "4.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz";
|
||||
hash = "sha256-N70Gl7o5ac5grGKZhk8TQymIo/2TNWmh5MISwOikKg8=";
|
||||
hash = "sha256-FvoT5uEZDFlUJcgg+0vjylSYd/HPXbaQ/oXaFRUveSo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -39,12 +39,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coiled";
|
||||
version = "1.110.0";
|
||||
version = "1.113.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-g+c9PQ4CpDlGjBAW1qb+l/80Dnsd6xL1h30H9s/cjJw=";
|
||||
hash = "sha256-1AIE06pssYFaiYBTv7gY4/Kw2jwKntvU/AMy2I77nsY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -31,14 +31,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-application";
|
||||
version = "5.5.0";
|
||||
version = "5.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "craft-application";
|
||||
tag = version;
|
||||
hash = "sha256-eNca9+CBAGTQe6URMUYRaJR7TXFJA+dWcYIJdKyB3bw=";
|
||||
hash = "sha256-d1uptYLndXvJrnA42vXoZTVkX1WxgKGfZX6SXYSffSo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -51,14 +51,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datalad";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datalad";
|
||||
repo = "datalad";
|
||||
tag = version;
|
||||
hash = "sha256-jLbtx6gNuMdZ34LVC7PY79k2w3B9aJ0ijCh9HhALQQc=";
|
||||
hash = "sha256-QcKhMiJNlETlxmRoPwKKGYK7zKbJ0pQpbRZDyJ+yrN0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
httpx,
|
||||
lib,
|
||||
nix-update-script,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "discord-webhook";
|
||||
version = "1.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lovvskillz";
|
||||
repo = "python-discord-webhook";
|
||||
tag = "${version}";
|
||||
hash = "sha256-7nVvtXo1XjQExZSCF9VaYSCeEByJY2jn5KbVGTi33f0=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
httpx # Optional, required for async support.
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"discord_webhook"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Execute discord webhooks";
|
||||
homepage = "https://github.com/lovvskillz/python-discord-webhook";
|
||||
changelog = "https://github.com/lovvskillz/python-discord-webhook/blob/${version}/CHANGES.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ polyfloyd ];
|
||||
};
|
||||
}
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-text-splitters";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-text-splitters==${version}";
|
||||
hash = "sha256-Ia3ZZ94uLZUVr1/w4HLPZLM6u8leA4OJtAwUf7eSAE0=";
|
||||
hash = "sha256-dMGvGZyux38Svl0OYgiAoYLdAf0lv27lzXgHFTBp3cs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/text-splitters";
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-xai";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-xai==${version}";
|
||||
hash = "sha256-uH9D1mbpVfoxhF8e4uUycrj3hwV4r+hc/CBpeCVZ2eE=";
|
||||
hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/partners/xai";
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "qpsolvers";
|
||||
version = "4.7.1";
|
||||
version = "4.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qpsolvers";
|
||||
repo = "qpsolvers";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sGnr1my1/1xA+pVX1SLsj8WtNViJ/nKRwN6Kl0HsJV0=";
|
||||
hash = "sha256-GBZrqBnZajbgiNSj+fcd1Ytz7MC8g7Zk1FNVpbJ22EI=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "rmrl";
|
||||
version = "0.2.1-unstable-2023-06-1";
|
||||
version = "0.2.1-unstable-2023-06-01";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "composable_kernel_base";
|
||||
# Picked this version over 6.3 because much easier to get to build
|
||||
# and it matches the version torch 2.6 wants
|
||||
version = "6.4.0-unstable-20241220";
|
||||
version = "6.4.0-unstable-2024-12-20";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
||||
+18
-16
@@ -135,22 +135,24 @@ rec {
|
||||
else
|
||||
(mkDerivationSuper args).overrideAttrs (
|
||||
args:
|
||||
if args ? env.NIX_CFLAGS_LINK then
|
||||
{
|
||||
env = args.env // {
|
||||
NIX_CFLAGS_LINK = toString args.env.NIX_CFLAGS_LINK + " -static";
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static";
|
||||
}
|
||||
// lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) {
|
||||
configureFlags = (args.configureFlags or [ ]) ++ [
|
||||
"--disable-shared" # brrr...
|
||||
];
|
||||
cmakeFlags = (args.cmakeFlags or [ ]) ++ [ "-DCMAKE_SKIP_INSTALL_RPATH=On" ];
|
||||
}
|
||||
(
|
||||
if (args.__structuredAttrs or false) || (args ? env.NIX_CFLAGS_LINK) then
|
||||
{
|
||||
env = (args.env or { }) // {
|
||||
NIX_CFLAGS_LINK = toString (args.env.NIX_CFLAGS_LINK or "") + " -static";
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static";
|
||||
}
|
||||
)
|
||||
// lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) {
|
||||
configureFlags = (args.configureFlags or [ ]) ++ [
|
||||
"--disable-shared" # brrr...
|
||||
];
|
||||
cmakeFlags = (args.cmakeFlags or [ ]) ++ [ "-DCMAKE_SKIP_INSTALL_RPATH=On" ];
|
||||
}
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -276,7 +276,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3Only;
|
||||
};
|
||||
}).goModules;
|
||||
inherit withIpmi withNetworkViewer withNdsudo;
|
||||
inherit
|
||||
withIpmi
|
||||
withNdsudo
|
||||
withNetworkViewer
|
||||
withSystemdJournal
|
||||
;
|
||||
tests.netdata = nixosTests.netdata;
|
||||
};
|
||||
|
||||
|
||||
@@ -304,6 +304,7 @@ mapAliases {
|
||||
archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15
|
||||
argo = argo-workflows; # Added 2025-02-01
|
||||
aria = aria2; # Added 2024-03-26
|
||||
artim-dark = aritim-dark; # Added 2025-07-27
|
||||
armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
|
||||
aseprite-unfree = aseprite; # Added 2023-08-26
|
||||
asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility
|
||||
|
||||
@@ -13836,8 +13836,6 @@ with pkgs;
|
||||
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv;
|
||||
};
|
||||
|
||||
tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { };
|
||||
|
||||
termdown = python3Packages.callPackage ../applications/misc/termdown { };
|
||||
|
||||
terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects;
|
||||
|
||||
@@ -3625,6 +3625,8 @@ self: super: with self; {
|
||||
|
||||
discogs-client = callPackage ../development/python-modules/discogs-client { };
|
||||
|
||||
discord-webhook = callPackage ../development/python-modules/discord-webhook { };
|
||||
|
||||
discordpy = callPackage ../development/python-modules/discordpy { };
|
||||
|
||||
discovery30303 = callPackage ../development/python-modules/discovery30303 { };
|
||||
|
||||
Reference in New Issue
Block a user