Merge master into staging-next
This commit is contained in:
@@ -36,25 +36,22 @@
|
||||
# Avoid bundling an entire MariaDB installation on the ISO.
|
||||
programs.kde-pim.enable = false;
|
||||
|
||||
system.activationScripts.installerDesktop =
|
||||
systemd.tmpfiles.settings."10-installer-desktop" =
|
||||
let
|
||||
|
||||
# Comes from documentation.nix when xserver and nixos.enable are true.
|
||||
manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";
|
||||
|
||||
homeDir = "/home/nixos/";
|
||||
desktopDir = homeDir + "Desktop/";
|
||||
|
||||
in
|
||||
''
|
||||
mkdir -p ${desktopDir}
|
||||
chown nixos ${homeDir} ${desktopDir}
|
||||
|
||||
ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}
|
||||
ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}
|
||||
ln -sfT ${pkgs.calamares-nixos}/share/applications/calamares.desktop ${
|
||||
desktopDir + "calamares.desktop"
|
||||
}
|
||||
'';
|
||||
{
|
||||
"/home/nixos/Desktop".d = {
|
||||
user = "nixos";
|
||||
group = "users";
|
||||
mode = "0755";
|
||||
};
|
||||
"/home/nixos/Desktop/nixos-manual.desktop"."L+".argument = manualDesktopFile;
|
||||
"/home/nixos/Desktop/gparted.desktop"."L+".argument =
|
||||
"${pkgs.gparted}/share/applications/gparted.desktop";
|
||||
"/home/nixos/Desktop/calamares.desktop"."L+".argument =
|
||||
"${pkgs.calamares-nixos}/share/applications/calamares.desktop";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -207,6 +207,7 @@ in
|
||||
};
|
||||
tmpfiles.rules = [
|
||||
"d ${cfg.settings.Rules.Path} 0750 root root - -"
|
||||
"L+ /etc/opensnitchd/network_aliases.json - - - - ${cfg.package}/etc/opensnitchd/network_aliases.json"
|
||||
"L+ /etc/opensnitchd/system-fw.json - - - - ${cfg.package}/etc/opensnitchd/system-fw.json"
|
||||
];
|
||||
};
|
||||
|
||||
@@ -238,10 +238,10 @@ in
|
||||
default = null;
|
||||
example = "770";
|
||||
description = ''
|
||||
If not `null`, is used as the permissions
|
||||
set by `system.activationScripts.transmission-daemon`
|
||||
on the directories [](#opt-services.transmission.settings.download-dir),
|
||||
[](#opt-services.transmission.settings.incomplete-dir).
|
||||
If not `null`, is used as the permissions set by
|
||||
`transmission-setup.service` on the directories
|
||||
[](#opt-services.transmission.settings.download-dir),
|
||||
[](#opt-services.transmission.settings.incomplete-dir)
|
||||
and [](#opt-services.transmission.settings.watch-dir).
|
||||
Note that you may also want to change
|
||||
[](#opt-services.transmission.settings.umask).
|
||||
|
||||
@@ -54,10 +54,23 @@ in
|
||||
action = "allow";
|
||||
duration = "always";
|
||||
operator = {
|
||||
type = "simple";
|
||||
sensitive = false;
|
||||
operand = "process.path";
|
||||
data = "${pkgs.curl}/bin/curl";
|
||||
type = "list";
|
||||
operand = "list";
|
||||
list = [
|
||||
{
|
||||
type = "simple";
|
||||
sensitive = false;
|
||||
operand = "process.path";
|
||||
data = "${pkgs.curl}/bin/curl";
|
||||
}
|
||||
# Check that network aliases like "LAN" are properly resolved.
|
||||
{
|
||||
type = "network";
|
||||
sensitive = false;
|
||||
operand = "dest.network";
|
||||
data = "LAN";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -5235,6 +5235,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
diffview-plus-nvim = buildVimPlugin {
|
||||
pname = "diffview.nvim";
|
||||
version = "0.34";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlyongemallo";
|
||||
repo = "diffview-plus.nvim";
|
||||
tag = "v0.34";
|
||||
hash = "sha256-M3Hf4y9HGFquBOK/Stv5FIxoVYX4aoO4dbbYQNPhisk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/dlyongemallo/diffview.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
dirbuf-nvim = buildVimPlugin {
|
||||
pname = "dirbuf.nvim";
|
||||
version = "0-unstable-2022-08-28";
|
||||
|
||||
@@ -1378,6 +1378,15 @@ assertNoAdditions {
|
||||
};
|
||||
});
|
||||
|
||||
diffview-plus-nvim = super.diffview-plus-nvim.overrideAttrs (old: {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
doInstallCheck = true;
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.gpl3Plus;
|
||||
description = "Cycle through diffs for all modified files for any git rev (dlyongemallo's active fork)";
|
||||
};
|
||||
});
|
||||
|
||||
direnv-vim = super.direnv-vim.overrideAttrs (old: {
|
||||
preFixup = old.preFixup or "" + ''
|
||||
substituteInPlace $out/autoload/direnv.vim \
|
||||
|
||||
@@ -372,6 +372,7 @@ https://github.com/3rd/diagram.nvim/,,
|
||||
https://github.com/monaqa/dial.nvim/,,
|
||||
https://github.com/barrettruth/diffs.nvim/,,
|
||||
https://github.com/sindrets/diffview.nvim/,,
|
||||
https://github.com/dlyongemallo/diffview-plus.nvim/,,
|
||||
https://github.com/elihunter173/dirbuf.nvim/,,
|
||||
https://github.com/direnv/direnv.vim/,,
|
||||
https://github.com/chipsenkbeil/distant.nvim/,,
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-saturn";
|
||||
version = "0-unstable-2026-05-17";
|
||||
version = "0-unstable-2026-05-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-saturn-libretro";
|
||||
rev = "c64a467e334cde47d74df6456748deb783522752";
|
||||
hash = "sha256-np+zzuMDtanmlUVlDoS0D4Fm+2uuXo08qar/aoXwmUI=";
|
||||
rev = "8f0d69a4938edd84ef5b308b6013ed4b17b5b7dd";
|
||||
hash = "sha256-hDiUcmkAyFbuMdK3LCshC2vMMU4TbJQAyqzkye/Sb5U=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "ppsspp";
|
||||
version = "0-unstable-2026-05-25";
|
||||
version = "0-unstable-2026-06-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "68296a4f75cc3c30b39ea6e82dac8c4e83fd41a4";
|
||||
hash = "sha256-mME2g2a1HLGsby2ZV5S/brYAeHBhBCIUF5plQMQWLac=";
|
||||
rev = "c9bededa26315b0a7564f72821ce61a5420c79b4";
|
||||
hash = "sha256-bm83QjqhyployW+LzC3/AvR6qgEF9DpQrDqRAtI+4dU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "stella";
|
||||
version = "0-unstable-2026-05-24";
|
||||
version = "0-unstable-2026-06-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stella-emu";
|
||||
repo = "stella";
|
||||
rev = "a720cccc55ae9bce007e748b53371914951f9f32";
|
||||
hash = "sha256-TAR1/FiVMz6YYzbLB8maZcsU+0h6lo8lpY31Y+gGj1k=";
|
||||
rev = "502f15b41708a3911048f2770a320a3ef20b0415";
|
||||
hash = "sha256-1/Zl6YNZhsIDJobbzGKAWKGEsep7k/iXAbwL7sK98M8=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "vice-${type}";
|
||||
version = "0-unstable-2026-05-21";
|
||||
version = "0-unstable-2026-06-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "vice-libretro";
|
||||
rev = "b0d88812a0af0dcba40041d78709480ad1d90833";
|
||||
hash = "sha256-OD1OB68g8WxpXLyJ0YIQ9Ys6D4eoARFjjFx+gAdeYGg=";
|
||||
rev = "7946cfa0d3775e958616d4d107de867a4616ae6c";
|
||||
hash = "sha256-tsOACtp58eXar5y3unuz46sVkQ/ZTSF9go9G56iNyxo=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
libcxx,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "aapt";
|
||||
version = "8.13.2-14304508";
|
||||
|
||||
@@ -15,12 +15,12 @@ stdenvNoCC.mkDerivation rec {
|
||||
urlAndHash =
|
||||
if stdenvNoCC.hostPlatform.isLinux then
|
||||
{
|
||||
url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-linux.jar";
|
||||
url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${finalAttrs.version}/aapt2-${finalAttrs.version}-linux.jar";
|
||||
hash = "sha256-eiNY58ueDpcyKvAteRuKFVr3r22kOhwSADkaH3CRwKw=";
|
||||
}
|
||||
else if stdenvNoCC.hostPlatform.isDarwin then
|
||||
{
|
||||
url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-osx.jar";
|
||||
url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${finalAttrs.version}/aapt2-${finalAttrs.version}-osx.jar";
|
||||
hash = "sha256-RI/S2oXMSvipALRfeRTsiXUh130/b8iP+EO0yltd7x0=";
|
||||
}
|
||||
else
|
||||
@@ -55,4 +55,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "andcli";
|
||||
version = "2.6.2";
|
||||
version = "2.7.0";
|
||||
|
||||
subPackages = [ "cmd/andcli" ];
|
||||
|
||||
@@ -17,10 +17,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "tjblackheart";
|
||||
repo = "andcli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EtfsSLyZs5hADJRE5xvn2mu6A04Sz9e21Y4+VkopCY0=";
|
||||
hash = "sha256-l+ZpAm+yHCKPalGib4OlIaGFsDHc3IFFlOvB1kXWZG0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CHWypAA2BpHop5LGkjZVTBL4dGzWfrwDJcFrtGTBAb4=";
|
||||
vendorHash = "sha256-S2JRkVy1iLGBqoOWukTQm80fVJ2YMNHTLfUUA2530GE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -126,7 +126,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "Open-source alternative to Notion";
|
||||
homepage = "https://www.appflowy.io/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.agpl3Only;
|
||||
license = with lib.licenses; [
|
||||
# The LICENSE file clearly claims the project is using AGPL-3.0
|
||||
#
|
||||
# c.f. https://github.com/AppFlowy-IO/AppFlowy/blob/main/LICENSE
|
||||
agpl3Only
|
||||
# But, the source code has not been synced with any major release since
|
||||
# the end of 2025. One of the core team member said that they will "merge
|
||||
# Flutter code back into this public repository at a later stage". However,
|
||||
# 2 months later, nothing has changed.
|
||||
#
|
||||
# c.f. https://github.com/AppFlowy-IO/AppFlowy/issues/8479#issuecomment-4053301446
|
||||
unfreeRedistributable
|
||||
];
|
||||
changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ darkonion0 ];
|
||||
platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "asusctl";
|
||||
version = "6.3.7";
|
||||
version = "6.3.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "asusctl";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jBO9AzQt4T4VU8aMcC9ALI7xBesAZC4beEyZ4+0cPPU=";
|
||||
hash = "sha256-DXpuKZmjYKiQp8ULH39EYtY75muZ77YzwYmE/yF1wEY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-f/rD2zEvGwyyBFSih7G9vdwFepehYS1u38vBlKGZBFM=";
|
||||
cargoHash = "sha256-nZDpKuL+7IIuV5q/W4qWHa7C/HEoX5YaerUMcDQQVtg=";
|
||||
|
||||
postPatch = ''
|
||||
files="
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
gitMinimal,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "beadwork";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jallum";
|
||||
repo = "beadwork";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-SuIQygsd/X8khQ1+S/af5haREBxsznFfcefLwsJRv/g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LjqZSI7F3C8GyNrPK/BwG9QTmNg89hFAvhUuBjmbHTU=";
|
||||
|
||||
subPackages = [ "cmd/bw" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gitMinimal
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doInstallCheck = true;
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$TMPDIR"
|
||||
git config --global user.email "test@test.com"
|
||||
git config --global user.name "Test"
|
||||
git config --global init.defaultBranch main
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Git-native work management for AI coding agents";
|
||||
homepage = "https://github.com/jallum/beadwork";
|
||||
license = licenses.mit;
|
||||
mainProgram = "bw";
|
||||
maintainers = with lib.maintainers; [ munksgaard ];
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
})
|
||||
@@ -24,7 +24,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.10";
|
||||
version = "2.1.11";
|
||||
|
||||
jdk = zulu25.override { enableJavaFX = true; };
|
||||
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
|
||||
hash = "sha256-e1b2F4JKm7i7iMEqi+OTBryScWWhdvLJW3iKecQgqvg=";
|
||||
hash = "sha256-Ts0u1Rapgfz/z17U3VSN17/rdACr/KOGmiZjWnGJmcw=";
|
||||
|
||||
# Verify the upstream Debian package prior to extraction.
|
||||
# See https://bisq.wiki/Bisq_2#Installation
|
||||
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
signature = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
|
||||
hash = "sha256-2B8rmNwCcJ/cSv7P0FYi2DlRcWkG0o0lMFPsr5zaoIk=";
|
||||
hash = "sha256-/+HDj28uOFQwkrrzKfcQW0T5/qTIeB30Zd10EjeGhlU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cliamp";
|
||||
version = "1.50.0";
|
||||
version = "1.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjarneo";
|
||||
repo = "cliamp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wXOIJ6oJfphEtBs84ova5tErcmKO3bHbDmRTiTX5zUE=";
|
||||
hash = "sha256-07hKE13eX6IWo77mMbgvPgJZjymfsGn9xMN7XIVIB1g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-A2Ygc1a9e2flZzaNAEXvr8Ui1cE89TxBfUNALmDzIo0=";
|
||||
|
||||
@@ -25,18 +25,20 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.135.0";
|
||||
version = "0.136.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-7Ak7rpogcN2kNezk7aMdMmkgNyPxH58f6lFdXOd/mgc=";
|
||||
hash = "sha256-MI9VrfMFuUOup0e8KECaFA8SbkrPLEG+6K/wqLA8rs8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-v1ggzNoncBVcOiJDQNNKPxYqWASNGjVjLMCXhsIbrVI=";
|
||||
cargoHash = "sha256-zHNOUHUnyNxYSWn13H77ZdIuv09kHSlJfQBatTugLUA=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
# Match upstream's release build for the codex binary only.
|
||||
cargoBuildFlags = [
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "commit-notifier";
|
||||
version = "0-unstable-2026-02-07";
|
||||
version = "0-unstable-2026-05-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "linyinfeng";
|
||||
repo = "commit-notifier";
|
||||
rev = "93ad526940c60d3a7be65239e6ff8604ce8c6e17";
|
||||
hash = "sha256-2U1Pp6v68fAxG6pVztHvCGe8FP714o9V2WQFMSmChBQ=";
|
||||
rev = "82d9177bc494f946d5fcdae14578908b5b7fb2f5";
|
||||
hash = "sha256-tlYXx9gtHv3HSlmdtGIZ70CsL19nmhoi8DbzQu30izQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IezbCVH3C7i7COZ8Fw7aXym7Q64hy6jxo98aohxgOyA=";
|
||||
cargoHash = "sha256-VOemLMuCa1AEwbFnngimO9xtpi/ZGcX6ZstwKEaOdvA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
{
|
||||
apple-sdk_14,
|
||||
cargo-tauri,
|
||||
darwin,
|
||||
fetchFromGitHub,
|
||||
fetchPnpmDeps,
|
||||
gst_all_1,
|
||||
lib,
|
||||
libayatana-appindicator,
|
||||
makeWrapper,
|
||||
nodejs,
|
||||
openssl,
|
||||
perl,
|
||||
pkg-config,
|
||||
pnpm_9,
|
||||
pnpmConfigHook,
|
||||
python3,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
let
|
||||
pnpm = pnpm_9;
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deltachat-tauri";
|
||||
version = "2.49.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JTbhKOTtPNlromdOsdekw6hhuE4gRwm1QB+5qaKy53o=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-UZ6/OTUtIiOA1D5PanY4aS+VCBNj/AIbIGYe1eibGMQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xxO17cpZ86Pg/zlfoEYLdBkY9MstsgNqoJbPWxTaXrw=";
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace $cargoDepsCopy/source-registry-0/libappindicator-sys-*/src/lib.rs \
|
||||
--replace-fail libayatana-appindicator3.so.1 '${libayatana-appindicator}/lib/libayatana-appindicator3.so.1'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
nodejs
|
||||
perl
|
||||
pnpm
|
||||
pnpmConfigHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook4
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.autoSignDarwinBinariesHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-vaapi
|
||||
gst_all_1.gstreamer
|
||||
libayatana-appindicator
|
||||
openssl
|
||||
webkitgtk_4_1
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_14
|
||||
];
|
||||
|
||||
buildAndTestSubdir = "packages/target-tauri";
|
||||
|
||||
env = {
|
||||
VERSION_INFO_GIT_REF = finalAttrs.src.tag;
|
||||
};
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
install -Dm 444 images/tray/deltachat.svg "$out/share/icons/hicolor/scalable/apps/deltachat-tauri.svg"
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/deltachat/deltachat-desktop/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Email-based instant messaging for Desktop";
|
||||
homepage = "https://github.com/deltachat/deltachat-desktop";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "deltachat-tauri";
|
||||
maintainers = [ lib.maintainers.dotlambda ];
|
||||
platforms = lib.platforms.darwin ++ lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2026-05-15";
|
||||
version = "0-unstable-2026-05-30";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "aiyahm";
|
||||
owner = "FreshDoctor";
|
||||
repo = "FairyWren-Icons";
|
||||
rev = "d4a7d6d0a363e9a640a97e54318e64a52c7fcc28";
|
||||
hash = "sha256-08w8DhTpQeJzqgcBjaH5ELkahgrYrYjulCVR8zd5n9Q=";
|
||||
rev = "1c5df6752220e7dd1dcf6f08974234785cd0edb6";
|
||||
hash = "sha256-CD5m/juhC40Hg2rh1n5WfbukRW3TueXXQb4oYUHHVs4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -51,11 +51,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
hardcodeZeroVersion = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "FairyWren Icon Set";
|
||||
homepage = "https://gitlab.com/aiyahm/FairyWren-Icons";
|
||||
homepage = "https://gitlab.com/FreshDoctor/FairyWren-Icons";
|
||||
maintainers = with lib.maintainers; [ iamanaws ];
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "framework-tool";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FrameworkComputer";
|
||||
repo = "framework-system";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EoaMVbnmidXoCRMbqn5LIZuxXE9xl9Dtb16U9FKmH+4=";
|
||||
hash = "sha256-EpStj1uMh0IkzXA5eI/xOndzDCxyJITqKGaSHqnJEFs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PshbC+LIBm84/86w9lP0OmCVztsT5gB+86rUorCDsQM=";
|
||||
cargoHash = "sha256-SVipNctgdU5oJiKbDnUmpv99Hc0W6nFtnI/DB90ndCo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "garnet";
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "garnet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8oZrUb3ed/M3juchn6OSRQAX6tfplekwmLLjHURtms8=";
|
||||
hash = "sha256-tvfqs9ZSIQySJu7euf56ESzqw7A2973PSMr/rxNHxR8=";
|
||||
};
|
||||
|
||||
projectFile = "main/GarnetServer/GarnetServer.csproj";
|
||||
|
||||
@@ -35,13 +35,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "github-desktop";
|
||||
version = "3.5.11";
|
||||
version = "3.5.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop";
|
||||
repo = "desktop";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-nW+yq330lQRfo1RtxUtbkQ336WeE8BjC9jYAIibfdXo=";
|
||||
hash = "sha256-/ehwjv1ipvxhmZYye1avkpz8uyO8YEWl0iM8U8n6pwE=";
|
||||
fetchSubmodules = true;
|
||||
postCheckout = "git -C $out rev-parse HEAD > $out/.gitrev";
|
||||
};
|
||||
@@ -100,9 +100,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
yarn --cwd app/node_modules/desktop-notifications run install
|
||||
|
||||
# use git from nixpkgs instead of an automatically downloaded one by dugite
|
||||
makeWrapper ${lib.getExe git} app/node_modules/dugite/git/bin/git \
|
||||
gitRoot=app/node_modules/dugite/git
|
||||
makeWrapper ${lib.getExe git} "$gitRoot/bin/git" \
|
||||
--prefix PATH : ${lib.makeBinPath [ git-lfs ]}
|
||||
|
||||
mkdir -p "$gitRoot/libexec/git-core"
|
||||
|
||||
for script in ${git}/libexec/git-core/*; do
|
||||
ln -s "$script" "$gitRoot/libexec/git-core/$(basename "$script")"
|
||||
done
|
||||
|
||||
# exception: printenvz needs `node-gyp` configure first for some reason
|
||||
pushd node_modules/printenvz
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-dnscollector";
|
||||
version = "2.2.3";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmachard";
|
||||
repo = "go-dnscollector";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hqSfL3R0fp7uYBGoD1Wu0ZNLq1VnOvcN0n8zzfRXTfA=";
|
||||
hash = "sha256-5SFdTDuXnVdMFGxoraUMbDV3o476sc9c7D9qWBoQXr4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-i1Ogo5zRYaEgiYMMTUjI2WiL2gABw2r31/WslXLzowI=";
|
||||
vendorHash = "sha256-eoUsiRGtq1ucAIyeCRNEuro2Qj4iRe+3aE8DrqIcCWs=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gsasl";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gsasl/gsasl-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-QejkQmSOzK9kWdmtk9SxhTC5bI6vUOPzQlMu8nXv87o=";
|
||||
sha256 = "sha256-/uNsZqwS0y078pp7Na2PREt5lv42m52l02/WrmScaOs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hiredis";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redis";
|
||||
repo = "hiredis";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gbCLIz6nOpPbu0xbsxUVvr7XmvGdVWZQJWjpE76NIXY=";
|
||||
hash = "sha256-1qOwuszjiAQLKc7byKw45wVKUSvkTw7HfvRcejbr4OA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kubazip";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kuba--";
|
||||
repo = "zip";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iVxUxF1zF5cEUyENRZKMCw6MRd0hrsokY+UD6jwbBTA=";
|
||||
hash = "sha256-xBGA421bL7eYdROQ6M4bALDEi6xltWDjkj7Jt7SJizY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,32 +2,22 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libburn";
|
||||
version = "1.5.6";
|
||||
version = "1.5.8";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "dev.lovelyhq.com";
|
||||
owner = "libburnia";
|
||||
repo = "libburn";
|
||||
rev = "release-${finalAttrs.version}";
|
||||
hash = "sha256-Xo45X4374FXvlrJ4Q0PahYvuWXO0k3N0ke0mbURYt54=";
|
||||
hash = "sha256-W/9dUUQGB1V76G9YshNjJcrptAuVVcsXiM5ZQ9Q50Xs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix the build against C23 compilers (like gcc-15):
|
||||
(fetchpatch {
|
||||
name = "c23.patch";
|
||||
url = "https://dev.lovelyhq.com/libburnia/libburn/commit/d537f9dd35282df834a311ead5f113af67d223b3.patch";
|
||||
hash = "sha256-aouU/6AchLhzMzvkVvUnFHWfebYTrkEJ6P3fF5pvE9M=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libgsf";
|
||||
version = "1.14.55";
|
||||
version = "1.14.58";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "GNOME";
|
||||
repo = "libgsf";
|
||||
tag = "LIBGSF_${lib.replaceString "." "_" finalAttrs.version}";
|
||||
hash = "sha256-lx/FgF4X0aLtUFRaX69gX9J7w9ZlO0A1xoVg9Fgvtfo=";
|
||||
hash = "sha256-0QQas3AsH46OOCSuezoBSeIQSilaenl50stpNwNJsKc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libharu";
|
||||
version = "2.4.5";
|
||||
version = "2.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libharu";
|
||||
repo = "libharu";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-v2vudB95OdYPiLxS9Al5lsAInsvmharhPWdnUmCl+Bs=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uy16fOZgGC7z8eUtQ6Y0R0B9vXEJcSnyBGQQamkDkik=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/libharu/libharu/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Cross platform, open source library for generating PDF files";
|
||||
homepage = "http://libharu.org/";
|
||||
license = lib.licenses.zlib;
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libisoburn";
|
||||
version = "1.5.6";
|
||||
version = "1.5.8.pl02";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "dev.lovelyhq.com";
|
||||
owner = "libburnia";
|
||||
repo = "libisoburn";
|
||||
rev = "release-${finalAttrs.version}";
|
||||
hash = "sha256-16qNVlWFVXfvbte5EgP/u193wK2GV/r22hVX0SZWr+0=";
|
||||
hash = "sha256-wYX2foI0YXrhVENz8QqfS9IdXwbsHP7rqYOWzlo8FdM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libisofs";
|
||||
version = "1.5.8";
|
||||
version = "1.5.8.pl02";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "dev.lovelyhq.com";
|
||||
owner = "libburnia";
|
||||
repo = "libisofs";
|
||||
rev = "release-${finalAttrs.version}";
|
||||
hash = "sha256-tOkJfS/utUPn38rn0u5zAo1N4IIkvpejg89Oxw6Xqv4=";
|
||||
hash = "sha256-uyE+7H5zWcBgtOsoFtiLFroeqA0Kj7tg7s+1IzXNKBo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libjcat";
|
||||
version = "0.2.3";
|
||||
version = "0.2.6";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "hughsie";
|
||||
repo = "libjcat";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-3Ttk5nwVLB/Ll4Xz25JODOKHsGrOxKeSF2f+6QhDI2Q=";
|
||||
sha256 = "sha256-PLaxeRWbPWXbS9QvMzYS4FTBNw9BDpMf1z2gYNZQa2c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libwacom";
|
||||
version = "2.18.0";
|
||||
version = "2.19.0";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "linuxwacom";
|
||||
repo = "libwacom";
|
||||
rev = "libwacom-${finalAttrs.version}";
|
||||
hash = "sha256-habbSnrOr9H6e/eRSQHugJaLRa252GXjZ8wHThpIydU=";
|
||||
hash = "sha256-0TlTt/9kN8NiWGDhvzMfvgJZnlzwcEFzAOCSzRowX8A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,17 +5,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rust-rpxy";
|
||||
version = "0.11.3";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junkurihara";
|
||||
repo = "rust-rpxy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LoZ6On/837RJSsf7Qxol83PkczSp+VDk66IBUm/tVWY=";
|
||||
hash = "sha256-PjlC65wKZFz6pEHoBHFk3J1+GXa6lwFsLEhgg57odxY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-L3+kGyeIUHdQfcZ5hHd6YsFYbsyq2R8XwE9HUFJMyd8=";
|
||||
cargoHash = "sha256-d6Tsh1wYreJGwfT5vzjT+ZmYTm50Aj8dT/creN9fqtI=";
|
||||
|
||||
meta = {
|
||||
description = "Http reverse proxy serving multiple domain names and terminating TLS for http/1.1, 2 and 3, written in Rust";
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
python3,
|
||||
fetchpatch,
|
||||
fetchPypi,
|
||||
openssl,
|
||||
# Many Salt modules require various Python modules to be installed,
|
||||
@@ -12,36 +11,31 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "salt";
|
||||
version = "3007.13";
|
||||
version = "3008.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-xmOnOGy9R6/pSm2LCxrx/M3DUFnM7CuTMQ55IHBTRPs=";
|
||||
hash = "sha256-az5PJTHJnD2wZtgds1KDnHdn3oRsk94/+UZRoX054tE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-libcrypto-loading.patch
|
||||
(fetchpatch {
|
||||
name = "urllib.patch";
|
||||
url = "https://src.fedoraproject.org/rpms/salt/raw/1c6e7b7a88fb81902f5fcee32e04fa80713b81f8/f/urllib.patch";
|
||||
hash = "sha256-yldIurafduOAYpf2X0PcTQyyNjz5KKl/N7J2OTEF/c0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "salt/utils/rsax931.py" \
|
||||
--subst-var-by "libcrypto" "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
substituteInPlace requirements/base.txt \
|
||||
--replace contextvars ""
|
||||
|
||||
# Don't require optional dependencies on Darwin, let's use
|
||||
# `extraInputs` like on any other platform
|
||||
echo -n > "requirements/darwin.txt"
|
||||
|
||||
# Remove windows-only requirement
|
||||
substituteInPlace "requirements/zeromq.txt" \
|
||||
--replace 'pyzmq==25.0.2 ; sys_platform == "win32"' ""
|
||||
# Fix duplicated script in bin and scripts:
|
||||
# FileExistsError: File already exists: /nix/store/...-salt-3008.0/bin/salt
|
||||
# See https://github.com/pypa/installer/pull/170 and https://github.com/saltstack/salt/issues/65083
|
||||
substituteInPlace "tools/pkg/salt_build_backend.py" \
|
||||
--replace-fail 'get_scripts(dist=None):' $'get_scripts(dist=None):\n return []'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdl3-mixer";
|
||||
version = "3.2.2";
|
||||
version = "3.2.4";
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "libsdl-org";
|
||||
repo = "SDL_mixer";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-J4qyb5zeeDowile8p2qJzBWP0lnBR8nYSF0fuZUshiM=";
|
||||
hash = "sha256-mPk6xU1/GkBtWgF8S9ttha7/PNxcBEiSxpzo6ARLC9I=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
# dependencies
|
||||
alsa-lib,
|
||||
eigen,
|
||||
eigen_5,
|
||||
gtest,
|
||||
kissfft,
|
||||
nlohmann_json,
|
||||
@@ -111,13 +111,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sherpa-onnx";
|
||||
version = "1.12.38";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k2-fsa";
|
||||
repo = "sherpa-onnx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lzcquKwP68KOem50b4X0+nZ3s2IthiYB76IxfvmJo54=";
|
||||
hash = "sha256-3SbJd9PHOjy5km6uxFqVZljn39cs/o7RLxxUivqx5VM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals pythonSupport [ "python" ];
|
||||
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "SHERPA_ONNX_ENABLE_GPU" cudaSupport)
|
||||
# Use nixpkgs sources instead of vendored downloads where possible.
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json.src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_EIGEN" "${eigen.src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_EIGEN" "${eigen_5.src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_KISSFFT" "${kissfft.src}")
|
||||
"-Wno-dev"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
buildGoModule (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
pname = "sonar";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raskrebs";
|
||||
repo = "sonar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ucOIFws3fo94o5ziJDn8ldgWkpAuiUqW8A+MQdPNy3c=";
|
||||
hash = "sha256-rHc7uYk0Js/hvWntI/Kt4Wq6Pod4T1DnTjAeUDa0fv0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-komX1AmHt2NoF1x6xsNa2RFkfVzOXfYEMPhT0zwMxjw=";
|
||||
|
||||
@@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "source2viewer-cli";
|
||||
version = "19.1";
|
||||
version = "19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValveResourceFormat";
|
||||
repo = "ValveResourceFormat";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-eH/qAnStEjin/OM83JT1BfvWqwhjR0OoukIbAgxBNZU=";
|
||||
hash = "sha256-4aUJlJWfNOqRXeLEHf8ZlXdcASGbmV2o1oFCcHpJG0w=";
|
||||
};
|
||||
|
||||
projectFile = "CLI/CLI.csproj";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "speakeasy-cli";
|
||||
version = "1.761.9";
|
||||
version = "1.770.0";
|
||||
|
||||
sourceRoot = ".";
|
||||
src =
|
||||
@@ -33,19 +33,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_amd64.zip";
|
||||
hash = "sha256-rTnaKHCJt4bQepg6e110AZavsU4AGD/3WPR0/M14gBo=";
|
||||
hash = "sha256-XemoVRSWPR9skYPgNB+eC7q/NOac26R9TwLbbntiOV8=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_amd64.zip";
|
||||
hash = "sha256-fmoLK8hAgIS0vSBQkIiJagBtfEwvf6FElhvW5xjnje4=";
|
||||
hash = "sha256-c25Wrn5/r4FZKjb/afQfJei/UrTA4A5Kxm+HaAImXY8=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_arm64.zip";
|
||||
hash = "sha256-f9/Pse4B8DB86ZHHPdS21yUzVtecFFS+RhOPLf/8MLg=";
|
||||
hash = "sha256-MWcGlRpZSKhmIZKr5R4JMS95WpAMtabynroDAmXxXuo=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_arm64.zip";
|
||||
hash = "sha256-Su0ZiKwEFugniMNJshb5C156BnuHxhcArLI8FzixIEI=";
|
||||
hash = "sha256-L+w4pYQ9GBPmT4YzYMsqykfoK0qeE9ALGAMwC2e6lrA=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-speakeasy" ''
|
||||
|
||||
@@ -33,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"cover-art"
|
||||
"discord-rpc"
|
||||
"mpris"
|
||||
"streaming"
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "turbo-unwrapped";
|
||||
version = "2.9.14";
|
||||
version = "2.9.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vercel";
|
||||
repo = "turborepo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4854TMHj6mqzWnCcSwRcbkBQQlLaevwP63gk9IXBUhA=";
|
||||
hash = "sha256-FIKwipmuCGdonnfEvmcPnXlsD7k70qrVRP5xAWbPP7U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3iFUpt33oyMnY/NomIz0mvYqRPK1ltyr8wSd9DMfB/Q=";
|
||||
cargoHash = "sha256-GXOIeQI7BWLgxpOMaNR1FH0Hhf9iFcdLfdCxAOZPZKQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
capnproto
|
||||
|
||||
@@ -45,13 +45,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ultrastardx";
|
||||
version = "2026.5.0";
|
||||
version = "2026.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UltraStar-Deluxe";
|
||||
repo = "USDX";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-67tWYCN2dRtll/XgG8uqqoRUoiNl4/Ne/MHmL7Y3j40=";
|
||||
hash = "sha256-xqP50OFUT+wreG/EZhmh5zPOwpNvG1TQkLzovgVDquI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "unison-fsmonitor";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "autozimu";
|
||||
repo = "unison-fsmonitor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1W05b9s0Pg2LzNu0mFo/JKpPw0QORqZkXhbbSuCZIUo=";
|
||||
hash = "sha256-hMrfEKW4klzHF89UGI4NUwXE6/Yk/wsUXUxe7ZPy/b8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FhENsOGv4jN9A0HS0TIPJMiXA4mYBL668jyckVNGOKc=";
|
||||
cargoHash = "sha256-N3l18MM5DqgDKzl6qAXUibaHgQKvAQFvZuuzgb3eAPE=";
|
||||
|
||||
checkFlags = [
|
||||
# accesses /usr/bin/env
|
||||
|
||||
@@ -53,13 +53,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vulkan-cts";
|
||||
version = "1.4.5.3";
|
||||
version = "1.4.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "VK-GL-CTS";
|
||||
rev = "vulkan-cts-${finalAttrs.version}";
|
||||
hash = "sha256-UZktBlSADFowMuGoWH98Dhg9nD5hYjs19melnx996gg=";
|
||||
hash = "sha256-WtKhem+ecf/fY63wGO/0HTW4uMYpV20M0lryu5DEkv8=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -4,15 +4,15 @@ rec {
|
||||
amber = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "amber";
|
||||
rev = "9482448393f3f1f75067cc6ba8ad77fda48691c6";
|
||||
hash = "sha256-NiJkSvmo/AvtDCJtbWzIvaDy1DqhUvASxznosM2XS3M=";
|
||||
rev = "53a4c8934bf7335d27c694e9fdac9ae1b180c0d2";
|
||||
hash = "sha256-oHfCBWW11tEs/mM2oX0+yNX1AS3Ch5TLR6e/39nxYmQ=";
|
||||
};
|
||||
|
||||
glslang = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "glslang";
|
||||
rev = "7a47e2531cb334982b2a2dd8513dca0a3de4373d";
|
||||
hash = "sha256-BXfe5SgjPy5a+FJh4KIe5kwvKVBvo773OfIZpOsDBLo=";
|
||||
rev = "715c8500e7cd67f2eba9e60e98852a1ed49d2f15";
|
||||
hash = "sha256-vSbMdTjlRVvYLi5ZvTVmfe76oAQ4AhqyD+ohvkvIYIs=";
|
||||
};
|
||||
|
||||
jsoncpp = fetchFromGitHub {
|
||||
@@ -25,15 +25,15 @@ rec {
|
||||
spirv-headers = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "b824a462d4256d720bebb40e78b9eb8f78bbb305";
|
||||
hash = "sha256-HjJjMuqTrYv5LUOWcexzPHb8nhOT4duooDAhDsd44Zo=";
|
||||
rev = "6dd7ba990830f7c15ac1345ff3b43ef6ffdad216";
|
||||
hash = "sha256-UKBVs2s05hP+paPq1dZFaUEQQ9Kx9acHxYUyJVx22eY=";
|
||||
};
|
||||
|
||||
spirv-tools = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "8a67272ca6c266b21dd0a9548471756a237ebbef";
|
||||
hash = "sha256-VLiIcVNlE7GhquAsEhPLYuBSNOAvhGIjR4zJ1QlPqvI=";
|
||||
rev = "2d14d2e76aa7de72404b17078eda15c20a6a0389";
|
||||
hash = "sha256-8Xtzq8WOdFEw+uEJqMW39LLHt2m165K9OJsIFZuifoM=";
|
||||
};
|
||||
|
||||
video_generator = fetchFromGitHub {
|
||||
@@ -46,15 +46,15 @@ rec {
|
||||
vulkan-docs = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Docs";
|
||||
rev = "60a4ad187cf3be4ede658f0fae7dd392192a314b";
|
||||
hash = "sha256-x/ijivXfzDRP6eCWF4rkL6MBiiIITh8vzcTuXQwbHlE=";
|
||||
rev = "6019efe93eca7bfa7a692316d91a9465eb457d60";
|
||||
hash = "sha256-zZOxL3XOCzlTsCuAm/+5SrDk6jPJpTY+nAL6H9knyPU=";
|
||||
};
|
||||
|
||||
vulkan-validationlayers = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-ValidationLayers";
|
||||
rev = "0a11cf1257471c22b9e7d620ab48057fb2f53cf9";
|
||||
hash = "sha256-Qhi+xjFpuL/bQcHqmY8vSZXVf8xuJbrF+0QfgL3120k=";
|
||||
rev = "eb51484e6039752b56e8f70b5c33f04874224bfb";
|
||||
hash = "sha256-fwFG0UdhgDUsCpp/n6iwjxTPlgxfnI8X2ZmAHbG+ZZ8=";
|
||||
};
|
||||
|
||||
vulkan-video-samples = fetchFromGitHub {
|
||||
|
||||
@@ -16,14 +16,12 @@
|
||||
installShellFiles,
|
||||
pipectl,
|
||||
slurp,
|
||||
rofi,
|
||||
scdoc,
|
||||
}:
|
||||
|
||||
let
|
||||
wl-present-binpath = lib.makeBinPath [
|
||||
pipectl
|
||||
rofi
|
||||
slurp
|
||||
(placeholder "out")
|
||||
];
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
openssl,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -76,6 +77,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--zsh <($out/bin/zellij setup --generate-completion zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Terminal workspace with batteries included";
|
||||
homepage = "https://zellij.dev/";
|
||||
@@ -1,23 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
zellij-unwrapped,
|
||||
makeBinaryWrapper,
|
||||
stdenvNoCC,
|
||||
nix-update-script,
|
||||
|
||||
extraPackages ? [ ],
|
||||
}:
|
||||
let
|
||||
unwrapped = callPackage ./unwrapped.nix { };
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit (unwrapped) version meta;
|
||||
inherit (zellij-unwrapped) version meta;
|
||||
pname = "zellij";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = unwrapped;
|
||||
src = zellij-unwrapped;
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
@@ -27,9 +23,4 @@ stdenvNoCC.mkDerivation {
|
||||
wrapProgram "$out/bin/zellij" \
|
||||
--prefix PATH : '${lib.makeBinPath extraPackages}'
|
||||
'';
|
||||
|
||||
passthru = unwrapped.passthru or { } // {
|
||||
inherit unwrapped;
|
||||
updateScript = nix-update-script { attrPath = "zellij.unwrapped"; };
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dart";
|
||||
version = "3.11.6";
|
||||
version = "3.12.1";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
aarch64-darwin = "macos-arm64";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-6g/yOW6lr0Aro1mKkTmg9LGzRx2dfoNIgtFVliJ2Ct0=";
|
||||
aarch64-linux = "sha256-PBKZ9GjroP13z5uC1+doOCwemAg3tgyndKLOtPnX20s=";
|
||||
x86_64-darwin = "sha256-gccm33wZaltIGlHOwExsECxRyOFMeW+FdZvu7M7Ychw=";
|
||||
aarch64-darwin = "sha256-09iIdY8xOvDLp03MoVfShBdyyW4NR8ZN1SvVTc8Rr3Y=";
|
||||
x86_64-linux = "sha256-aiu/ZKEzychqYqUy29PgtNtKw2Wr1Fbp+dHF32H82/g=";
|
||||
aarch64-linux = "sha256-tECHkwEI9tf1a/WAoC1dKpf/lFGcWiiDOZgiAuG0xIE=";
|
||||
x86_64-darwin = "sha256-xWsyLNvBXg18NzlwwuK+U7+0OEWL1nwYKHA+dErLeRY=";
|
||||
aarch64-darwin = "sha256-6v84I9Wgxc3LZbOK3yBOXzUpD81WDUjLR8L6x+FUe5c=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
|
||||
@@ -46,13 +46,13 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
# NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
|
||||
name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
|
||||
pname = "cutlass";
|
||||
version = "3.9.2";
|
||||
version = "4.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "cutlass";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI=";
|
||||
hash = "sha256-rW//OyY9fZjxavT5QYjLvc5oOpQhrXiDGwM2NTFuehY=";
|
||||
};
|
||||
|
||||
# TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a
|
||||
@@ -97,7 +97,7 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
# '_CUDA_INSTALL_PATH = "${getBin cuda_nvcc}"'
|
||||
+ ''
|
||||
nixLog "patching python bindings to make cuda_install_path fail"
|
||||
substituteInPlace ./python/cutlass/__init__.py \
|
||||
substituteInPlace ./python/cutlass_cppgen/__init__.py \
|
||||
--replace-fail \
|
||||
'def cuda_install_path():' \
|
||||
'
|
||||
@@ -106,15 +106,15 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
'
|
||||
''
|
||||
# Patch the python bindings to use environment variables set by Nixpkgs.
|
||||
# https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L80
|
||||
# https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L81
|
||||
# https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L317
|
||||
# https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L319
|
||||
# https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L344
|
||||
# https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L360
|
||||
# https://github.com/NVIDIA/cutlass/blob/2e602843e75100d0e03934efb386b3e1e35d7907/python/cutlass_cppgen/backend/compiler.py#L83
|
||||
# https://github.com/NVIDIA/cutlass/blob/2e602843e75100d0e03934efb386b3e1e35d7907/python/cutlass_cppgen/backend/compiler.py#L84
|
||||
# https://github.com/NVIDIA/cutlass/blob/2e602843e75100d0e03934efb386b3e1e35d7907/python/cutlass_cppgen/backend/compiler.py#L320
|
||||
# https://github.com/NVIDIA/cutlass/blob/2e602843e75100d0e03934efb386b3e1e35d7907/python/cutlass_cppgen/backend/compiler.py#L322
|
||||
# https://github.com/NVIDIA/cutlass/blob/2e602843e75100d0e03934efb386b3e1e35d7907/python/cutlass_cppgen/backend/compiler.py#L347
|
||||
# https://github.com/NVIDIA/cutlass/blob/2e602843e75100d0e03934efb386b3e1e35d7907/python/cutlass_cppgen/backend/compiler.py#L363
|
||||
+ ''
|
||||
nixLog "patching python bindings to use environment variables"
|
||||
substituteInPlace ./python/cutlass/backend/compiler.py \
|
||||
substituteInPlace ./python/cutlass_cppgen/backend/compiler.py \
|
||||
--replace-fail \
|
||||
'self.include_paths = include_paths' \
|
||||
'self.include_paths = include_paths + [root + "/include" for root in os.getenv("CUDAToolkit_ROOT").split(";")]' \
|
||||
@@ -220,7 +220,7 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "CUDA Templates for Linear Algebra Subroutines";
|
||||
homepage = "https://github.com/NVIDIA/cutlass";
|
||||
license = licenses.asl20;
|
||||
license = licenses.bsd3;
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
|
||||
@@ -53,7 +53,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libinput";
|
||||
version = "1.31.1";
|
||||
version = "1.31.2";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "libinput";
|
||||
repo = "libinput";
|
||||
rev = version;
|
||||
hash = "sha256-9Ko97vJyo4a9NUF7omqHTwzVV02sJ2EqpDIh+nPeLwk=";
|
||||
hash = "sha256-qHcLiJ5Fa+/tbBmvI8FFBJYC7C3VHcBNWusseZAkuCU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -85,7 +85,7 @@ in
|
||||
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.52.3";
|
||||
version = "2.52.4";
|
||||
name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}";
|
||||
|
||||
outputs = [
|
||||
@@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Wz4NF05j3MKISLEZTg50SNWUjDwkJ+zZMcLFvlJhrrs=";
|
||||
hash = "sha256-z0B2ocoqZHiO3KjEUtjrto1eKWXliP5Go4igFlE+3OQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "async-cache";
|
||||
version = "1.1.1";
|
||||
version = "2.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iamsinghrajat";
|
||||
repo = "async-cache";
|
||||
rev = "9925f07920e6b585dc6345f49b7f477b3e1b8c2c"; # doesn't tag releases :(
|
||||
hash = "sha256-AVSdtWPs1c8AE5PNOq+BdXzBXkI0aeFVzxxPl/ATyU0=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3SPepAlXJxufTgNqwxh/c2jhL/j9/omqOZElHhDiIIw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -30,4 +30,4 @@ buildPythonPackage {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.lukegb ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,19 +4,18 @@
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
requests,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tmdbsimple";
|
||||
version = "2.9.2-unstable-2025-01-07";
|
||||
version = "2.9.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "celiao";
|
||||
repo = "tmdbsimple";
|
||||
rev = "0b3359f7bab3ade391b2e5de964ed115b00984a6";
|
||||
hash = "sha256-usyL2lHSJwvPnWncI3K+yTmeU5DN1AkRzHC5nFh3vxs=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ooyfwRCvH980gym8ujpLxbmR7FYfi59gGXqT8K40pNw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -28,12 +27,10 @@ buildPythonPackage {
|
||||
# The tests require an internet connection and an API key
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Wrapper for The Movie Database API v3";
|
||||
homepage = "https://github.com/celiao/tmdbsimple";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ theobori ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user