Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-11-11 12:06:02 +00:00 committed by GitHub
commit 351e0a0a7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
80 changed files with 7913 additions and 1053 deletions

View File

@ -3536,6 +3536,12 @@
github = "scaredmushroom";
githubId = 45340040;
};
caperren = {
name = "Corwin Perren";
email = "caperren@gmail.com";
github = "caperren";
githubId = 4566591;
};
CaptainJawZ = {
email = "CaptainJawZ@outlook.com";
name = "Danilo Reyes";
@ -4763,6 +4769,12 @@
githubId = 743057;
name = "Danylo Hlynskyi";
};
danbulant = {
name = "Daniel Bulant";
email = "danbulant@gmail.com";
github = "danbulant";
githubId = 30036876;
};
danc86 = {
name = "Dan Callaghan";
email = "djc@djc.id.au";
@ -18765,6 +18777,13 @@
githubId = 521306;
name = "Rob Glossop";
};
robinkrahl = {
email = "nix@ireas.org";
github = "robinkrahl";
githubId = 165115;
keys = [ { fingerprint = "EC7E F0F9 B681 4C24 6236 3842 B755 6972 702A FD45"; } ];
name = "Robin Krahl";
};
roblabla = {
email = "robinlambertz+dev@gmail.com";
github = "roblabla";

View File

@ -11,14 +11,12 @@ in
type = lib.types.bool;
default = false;
description = ''
Enables udev rules for Nitrokey devices. By default grants access
to users in the "nitrokey" group. You may want to install the
nitrokey-app package, depending on your device and needs.
Enables udev rules for Nitrokey devices.
'';
};
};
config = lib.mkIf cfg.enable {
services.udev.packages = [ pkgs.libnitrokey ];
services.udev.packages = [ pkgs.nitrokey-udev-rules ];
};
}

View File

@ -334,6 +334,12 @@ in
environment.etc."my.cnf".source = cfg.configFile;
# The mysql_install_db binary will try to adjust the permissions, but fail to do so with a permission
# denied error in some circumstances. Setting the permissions manually with tmpfiles is a workaround.
systemd.tmpfiles.rules = [
"d ${cfg.dataDir} 0755 ${cfg.user} ${cfg.group} - -"
];
systemd.services.mysql = {
description = "MySQL Server";

View File

@ -55,7 +55,12 @@ in
default = "";
};
passwordFile = lib.mkOption {
type = lib.types.str;
type = lib.types.path;
example = lib.literalExpression ''
pkgs.writeText "roundcube-postgres-passwd.txt" '''
hostname:port:database:username:password
'''
'';
description = ''
Password file for the postgresql connection.
Must be formatted according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html)

View File

@ -1,11 +1,11 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-4uE34f99fTiG5FJq0xnEodqQvNT2Aa8kesYOxY44xXA=";
hash_darwin = "sha256-+Pcd++19/nJVsqGr2jzyjMTWYfb2U9wSgnNccDyGuGU=";
hash_darwin_aarch64 =
"sha256-gDrfR5EgBx3YRxf3/08gayOhmEqSw4G/QcuNtfHmRHk=";
hash_linux = "sha256-qMlM6ilsIqm8G5KLE4uGVb/s2bNyZSyQmxsq+EHKX/c=";
version = "130.0.6723.91";
"sha256-vrbIpHrBwbzqars7D546eJ7zhEhAB0abq7MXiqlU4ts=";
hash_linux = "sha256-NbZ1GULLWJ6L3kczz23HoUhGk6VgBOXcjZlL7t4Z6Ec=";
version = "130.0.6723.116";
};
deps = {
gn = {
@ -15,8 +15,8 @@
version = "2024-09-09";
};
};
hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M=";
version = "130.0.6723.91";
hash = "sha256-eOCUKhFv205MD1gEY1FQQNCwxyELNjIAxUlPcRn74Lk=";
version = "130.0.6723.116";
};
ungoogled-chromium = {
deps = {
@ -27,11 +27,11 @@
version = "2024-09-09";
};
ungoogled-patches = {
hash = "sha256-LhCrwOwPmEn5xlBLTgp2NMfQLxYbSg0pdZxshoqQAGw=";
rev = "130.0.6723.91-1";
hash = "sha256-+94tSSaOp6vzWkXN1qF3UXMm/Rs3pKmjf+U4x+af818=";
rev = "130.0.6723.116-1";
};
};
hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M=";
version = "130.0.6723.91";
hash = "sha256-eOCUKhFv205MD1gEY1FQQNCwxyELNjIAxUlPcRn74Lk=";
version = "130.0.6723.116";
};
}

View File

@ -21,14 +21,14 @@
buildPythonApplication rec {
pname = "protonvpn-gui";
version = "4.6.0";
version = "4.7.3";
pyproject = true;
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "proton-vpn-gtk-app";
rev = "refs/tags/v${version}";
hash = "sha256-GCfr6x0KbIJr2r4UcFtMjuyHZVyDLKPvgtjdpTCb5Ro=";
hash = "sha256-LcHloc4iHDgP6RCwFvJM6GfzTRd3RqYo0medjEhmj6M=";
};
nativeBuildInputs = [

View File

@ -4,22 +4,25 @@
fetchFromGitHub,
hyprland,
mkHyprlandPlugin,
nix-update-script,
}:
mkHyprlandPlugin hyprland rec {
pluginName = "hy3";
version = "0.44.0";
version = "0.45.0";
src = fetchFromGitHub {
owner = "outfoxxed";
repo = "hy3";
rev = "refs/tags/hl${version}";
hash = "sha256-6TVaB+nWVanqZWqievg+m7tVNrSpQ9CQcwXJQeyU/Q0=";
hash = "sha256-b3PuEtRHTSxV809RLUiZVQhDQZ8NxxpWUjboTe9QAAY=";
};
nativeBuildInputs = [ cmake ];
dontStrip = true;
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/outfoxxed/hy3";
description = "Hyprland plugin for an i3 / sway like manual tiling layout";

View File

@ -8,13 +8,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hypr-dynamic-cursors";
version = "0-unstable-2024-10-10";
version = "0-unstable-2024-11-10";
src = fetchFromGitHub {
owner = "VirtCode";
repo = "hypr-dynamic-cursors";
rev = "3ff4c2a053f7673b3b8cd45ada0886cbda13ebcc";
hash = "sha256-XMR9wDNXmY3pPp3imT5vA4Gc6yC3R2Fatp4B53uLHzI=";
rev = "a3427f2a7f1dc70236dbaa870eadead03d9807a6";
hash = "sha256-7nznQzeq0rzvTos2axd4LvzLJ64n0erP3WxMIpCE5Ew=";
};
dontUseCmakeConfigure = true;

View File

@ -7,13 +7,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprfocus";
version = "0-unstable-2024-05-30";
version = "0-unstable-2024-10-09";
src = fetchFromGitHub {
owner = "pyt0xic";
repo = "hyprfocus";
rev = "aa7262d3a4564062f97b9cfdad47fd914cfb80f2";
hash = "sha256-R1ZgNhQkoS6ZHRRKB+j5vYgRANfYO//sHbrD7moUTx0=";
rev = "bead5b77d80f222c006d1a6c6f44ee8b02021d73";
hash = "sha256-qIl7opF7fA1ZmC91TGQ7D12tB7kHc6Sn9DrfUN6sbBY=";
};
installPhase = ''

View File

@ -11,15 +11,15 @@
nix-update-script,
}:
mkHyprlandPlugin hyprland rec {
mkHyprlandPlugin hyprland {
pluginName = "hyprgrass";
version = "0.8.2";
version = "0.8.2-unstable-2024-10-30";
src = fetchFromGitHub {
owner = "horriblename";
repo = "hyprgrass";
rev = "v${version}";
hash = "sha256-0dYMlNYuevQvsd6+imOkic3c6RSssM8WSx1hAepJ/wU=";
rev = "f97b6ac2b7de3bae194b776c388467db2604929f";
hash = "sha256-Jg5Q/v8tcNjopTMbra82y5n9QQdCnrbEFNgT1kA7pQE=";
};
nativeBuildInputs = [

View File

@ -14,13 +14,13 @@ let
mkHyprlandPlugin,
}:
let
version = "0.44.0";
version = "0.45.0";
hyprland-plugins-src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprland-plugins";
rev = "refs/tags/v${version}";
hash = "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w=";
hash = "sha256-hOljwsXpY4Y6guvcr51tWCnXo6c56yaBknnLXk1m3Vk=";
};
in
mkHyprlandPlugin hyprland {

View File

@ -9,13 +9,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprscroller";
version = "0-unstable-2024-10-10";
version = "0-unstable-2024-11-09";
src = fetchFromGitHub {
owner = "dawsers";
repo = "hyprscroller";
rev = "1a907fd38594ec58a8fe5d68be0dcf2f9e76b0f8";
hash = "sha256-cgwHl2YtqrnS0ThUyycFGYoYozpq7zT9POARrQAoahY=";
rev = "556e01458ba26aa63253ae590a6aa8b2601ecf03";
hash = "sha256-lILkkTNwPxMvfYNpusbakl2BW4lvNUZcIputwAfHHAE=";
};
nativeBuildInputs = [ cmake ];

View File

@ -8,13 +8,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprspace";
version = "0-unstable-2024-09-16";
version = "0-unstable-2024-11-02";
src = fetchFromGitHub {
owner = "KZDKM";
repo = "hyprspace";
rev = "8f14fa2e10d24742d713f04c278bc7651037b74b";
hash = "sha256-lMIFDORuyMYHtUPrRWU5WjGcS+ZMrR4/wBSO+sgUVSY=";
rev = "260f386075c7f6818033b05466a368d8821cde2d";
hash = "sha256-cwbcYg+rPmvHFFtAEie7nw5IaBidrTYe5XsTlhOyoyQ=";
};
dontUseCmakeConfigure = true;

View File

@ -8,13 +8,13 @@
}:
mkHyprlandPlugin hyprland rec {
pluginName = "hyprsplit";
version = "0.44.1";
version = "0.45.0";
src = fetchFromGitHub {
owner = "shezdy";
repo = "hyprsplit";
rev = "refs/tags/v${version}";
hash = "sha256-l+DQHWPMyUCXbKhbIFVooTKKnCRQ97Ic5smw4VzUcTc=";
hash = "sha256-otDIivy4sMZBN2t9eHVI5PaFacg2Je4U9gBPPcH/Vpo=";
};
nativeBuildInputs = [

View File

@ -33,7 +33,6 @@ let
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libXxf86vm
xorg.libxcb
libxkbcommon

6008
pkgs/by-name/al/alcom/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

23
pkgs/by-name/al/alcom/deps.nix generated Normal file
View File

@ -0,0 +1,23 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.1"; hash = "sha256-vAqIkIrtqiJbQ8ngqSfxLA4XUyfqO1lr7NiYch5+TTc="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.1"; hash = "sha256-QbUQXjCzr8j8u/5X0af9jE++EugdoxMhT08F49MZX74="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.1"; hash = "sha256-tiSDf189+7K788Z2qVmsP3PeUzkByUCtcjXR9onOdXA="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.1"; hash = "sha256-tYR6xGWvWoR0ITYHra9bsOxIhzhe/GYNVpB4R7KkKik="; })
(fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-u4JMGIe/rmXOzx+Y2tC5qlkP5aNVMHy6AQnYwxsXsN4="; })
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; hash = "sha256-SopZpGaZ48/8dpUwDFDM3ix+g1rP4Yqs1PGuzRp+K7c="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.1"; hash = "sha256-g4RhRWUP4o3dkNt2hV0ZNRRwDGIuAJ6gY02d3xhtFzY="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.1"; hash = "sha256-+fUVeiQ2qXBtP4HI+8+/SLqZOEuKi9/zC/pX9g+rhqs="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.1"; hash = "sha256-aRGVm8Ckd+uhkuAnJAuqHH6+muT+sXf+b+6nZ/Md77c="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.1"; hash = "sha256-UiJ5KdJdLg+/eDHsC4HgvYaY9h3av+/92VPoEixHDgQ="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.1"; hash = "sha256-JeYU02u4ln0v56QeCs+8ZLWhRlNxZ6c/xHr8Jy3koww="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.1"; hash = "sha256-jajBI5GqG2IIcsIMgxTHfXbMapoXrZGl/EEhShwYq7w="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.1"; hash = "sha256-TJbkjj3koeFN068auqXUojMLPrihO6sEMIPqglW7uTE="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.1"; hash = "sha256-SYctZpDlsEHxmy+/Oa1Qp99mpx8I7icYoSBKczF1Ybo="; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-oCzhhcSp2ZZ+R8ITzhVn21nmT+R6upf3IzsRtke4xxY="; })
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-BMDOdOJFDuItIL8gbYKJdoycvf2rJ8RI8FHsaaYYflY="; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-7FJEqNLs8DvqsSJQZETbL2uvRrqO5M1ReWCYkXtqVAE="; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-WOJqlt/ONpCqhfB2S++rY+iRqW6mlAddxGoqaC/boCM="; })
]

View File

@ -0,0 +1,122 @@
{
buildDotnetModule,
cargo-about,
cargo-tauri,
dotnetCorePackages,
fetchFromGitHub,
fetchNpmDeps,
glib-networking,
google-fonts,
lib,
libsoup,
nodejs,
npmHooks,
openssl,
pkg-config,
rustPlatform,
stdenv,
webkitgtk_4_0,
}:
let
pname = "alcom";
version = "1.8.2";
src = fetchFromGitHub {
owner = "vrc-get";
repo = "vrc-get";
rev = "refs/tags/v${version}";
fetchSubmodules = true;
hash = "sha256-jkhjJTb/U2dXj/vyaip+gWoqIOdfFKSExeDl0T11DE4=";
};
subdir = "vrc-get-gui";
google-fonts' = google-fonts.override {
fonts = [
"NotoSans"
"NotoSansJP"
];
};
dotnetSdk = dotnetCorePackages.sdk_8_0;
dotnetRuntime = dotnetCorePackages.runtime_8_0;
dotnetBuild = buildDotnetModule {
inherit pname version src;
dotnet-sdk = dotnetSdk;
dotnet-runtime = dotnetRuntime;
projectFile = [
"vrc-get-litedb/dotnet/vrc-get-litedb.csproj"
"vrc-get-litedb/dotnet/LiteDB/LiteDB/LiteDB.csproj"
];
nugetDeps = ./deps.nix;
};
in
rustPlatform.buildRustPackage {
inherit pname version src;
nativeBuildInputs = [
cargo-about
cargo-tauri.hook
dotnetSdk
nodejs
npmHooks.npmConfigHook
pkg-config
];
buildInputs =
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
libsoup
webkitgtk_4_0
]
++ dotnetSdk.packages
++ dotnetBuild.nugetDeps;
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tauri-plugin-single-instance-0.0.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
};
};
buildAndTestSubdir = subdir;
npmDeps = fetchNpmDeps {
inherit src;
sourceRoot = "${src.name}/${subdir}";
hash = "sha256-4zokKLhLgW2u1GxeTlIAAxJINSpxHRtY5HXmhi9nj6c=";
};
npmRoot = subdir;
patches = [
./use-local-fonts.patch
];
postPatch = ''
install -Dm644 "${google-fonts'}/share/fonts/truetype/NotoSans[wdth,wght].ttf" ${subdir}/app/fonts/noto-sans.ttf
install -Dm644 "${google-fonts'}/share/fonts/truetype/NotoSansJP[wght].ttf" ${subdir}/app/fonts/noto-sans-jp.ttf
'';
preConfigure = ''
dotnet restore "vrc-get-litedb/dotnet/vrc-get-litedb.csproj" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true
'';
passthru = {
inherit (dotnetBuild) fetch-deps;
};
meta = {
description = "Experimental GUI application to manage VRChat Unity Projects";
homepage = "https://github.com/vrc-get/vrc-get";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Scrumplex ];
# aarch64-linux: Error failed to build app: Target aarch64-unknown-linux-gnu does not exist. Please run `rustup target list` to see the available targets.
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
mainProgram = "alcom";
};
}

View File

@ -0,0 +1,32 @@
diff --git a/vrc-get-gui/app/fonts.ts b/vrc-get-gui/app/fonts.ts
index 855de943..3fd6a0b6 100644
--- a/vrc-get-gui/app/fonts.ts
+++ b/vrc-get-gui/app/fonts.ts
@@ -1,5 +1,3 @@
-import {Noto_Sans_Mono} from "next/font/google";
+import localFont from "next/font/local";
-export const notoSansMono = Noto_Sans_Mono({
- subsets: ["latin"]
-});
+export const notoSansMono = localFont({ src: './fonts/noto-sans.ttf' })
diff --git a/vrc-get-gui/app/layout.tsx b/vrc-get-gui/app/layout.tsx
index f38ab32d..723101b7 100644
--- a/vrc-get-gui/app/layout.tsx
+++ b/vrc-get-gui/app/layout.tsx
@@ -1,13 +1,11 @@
import type {Metadata} from "next";
-import {Noto_Sans_JP} from "next/font/google";
+import localFont from "next/font/local";
import "./globals.css";
import 'react-toastify/dist/ReactToastify.css';
import {SideBar} from "@/components/SideBar";
import {Providers} from "@/components/providers";
-const notoSansJP = Noto_Sans_JP({
- subsets: ["latin"],
-});
+const notoSansJP = localFont({ src: "./fonts/noto-sans-jp.ttf", });
export const metadata: Metadata = {
title: "Create Next App",

View File

@ -0,0 +1,80 @@
{
rustPlatform,
lib,
fetchFromGitHub,
libsoup,
pkg-config,
webkitgtk_4_0,
openssl,
nodejs,
npmHooks,
fetchNpmDeps,
gtk3,
wrapGAppsHook3,
cargo-tauri,
}:
rustPlatform.buildRustPackage rec {
pname = "alexandria";
version = "0.12";
src = fetchFromGitHub {
owner = "btpf";
repo = "Alexandria";
rev = "refs/tags/v${version}";
hash = "sha256-NX89Sg639dSwUcUGrpgmdcO4tXl2iszctiRDcBVLbUA=";
fetchSubmodules = true;
};
prePatch = ''
chmod +w .. # make sure that /build/source is writeable
'';
npmDeps = fetchNpmDeps {
inherit src;
sourceRoot = "${src.name}";
hash = "sha256-/RGaZMCJftjzvFLp8J/d9+MsxQwe7P0WfISz0JE3fn4=";
};
cargoHash = "sha256-W8HCpGuDkq8XfdrSvYfAHyX+oh30/bX29qdclN4P5yo=";
env = {
OPENSSL_NO_VENDOR = 1;
};
nativeBuildInputs = [
cargo-tauri.hook
nodejs
npmHooks.npmConfigHook
pkg-config
rustPlatform.bindgenHook
wrapGAppsHook3
];
buildInputs = [
openssl
webkitgtk_4_0
gtk3
libsoup
];
npmRoot = "..";
sourceRoot = "${src.name}/src-tauri";
buildAndTestDir = ".";
meta = {
homepage = "https://github.com/btpf/Alexandria";
changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}";
description = "Minimalistic cross-platform eBook reader";
maintainers = with lib.maintainers; [ bot-wxt1221 ];
mainProgram = "alexandria";
platforms = [
"x86_64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
license = lib.licenses.gpl3Plus;
};
}

View File

@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
libGL
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libX11
];

View File

@ -89,7 +89,7 @@ rustPlatform.buildRustPackage rec {
# be the common case, so just make them available, don't link them.
postInstall = ''
wrapProgramArgs=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr
xorg.libX11 xorg.libXcursor xorg.libXi
]})
'' + lib.optionalString useXWayland ''
wrapProgramArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]})

View File

@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec {
wrapProgram "$out/bin/cosmic-edit" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland
xorg.libX11 xorg.libXcursor xorg.libXi vulkan-loader libxkbcommon wayland
]}
'';

View File

@ -104,7 +104,6 @@ rustPlatform.buildRustPackage rec {
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
]}
'';

View File

@ -0,0 +1,80 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
electron,
nix-update-script,
makeBinaryWrapper,
}:
let
version = "2.1.2";
in
buildNpmPackage {
pname = "gfn-electron";
inherit version;
src = fetchFromGitHub {
owner = "hmlendea";
repo = "gfn-electron";
rev = "refs/tags/v${version}";
hash = "sha256-kTnM4wSDqP2V8hb4mDhbQYpVYouSnUkjuuCfITb/xgY=";
};
npmDepsHash = "sha256-27N0hWOfkLQGaGspm4aCoVF6PWiUOAKs+JzbdQV94lo=";
nativeBuildInputs = [ makeBinaryWrapper ];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = true;
# FIXME: Git dependency node_modules/register-scheme contains install scripts,
# but has no lockfile, which is something that will probably break.
forceGitDeps = true;
makeCacheWritable = true;
buildPhase = ''
runHook preBuild
# NOTE: Upstream explicitly opts to not build an ASAR as it would cause all
# text to disappear in the app.
npm exec electron-builder -- \
--dir \
-c.electronDist=${electron.dist} \
-c.electronVersion=${electron.version}
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r dist/*-unpacked $out/dist
install -Dm644 com.github.hmlendea.geforcenow-electron.desktop -t $out/share/applications
install -Dm644 icon.png $out/share/icons/hicolor/512x512/apps/geforcenow-electron.png
runHook postInstall
'';
postFixup = ''
makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \
--add-flags "--no-sandbox --disable-gpu-sandbox" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \
--replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \
--replace-fail "Icon=nvidia" "Icon=geforcenow-electron"
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Linux Desktop client for Nvidia's GeForce NOW game streaming service";
homepage = "https://github.com/hmlendea/gfn-electron";
license = with lib.licenses; [ gpl3Only ];
platforms = lib.intersectLists lib.platforms.linux electron.meta.platforms;
maintainers = with lib.maintainers; [ pluiedev ];
mainProgram = "geforcenow-electron";
};
}

View File

@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec {
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit

View File

@ -4,35 +4,55 @@
fetchFromGitHub,
gitUpdater,
nixosTests,
bash,
cmake,
inotify-tools,
pkg-config,
mir,
libxkbcommon,
swaybg,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "miriway";
version = "24.09";
version = "24.10.1";
src = fetchFromGitHub {
owner = "Miriway";
repo = "Miriway";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-/0txc9ynC3rj9tbHwYNlDe2C1DlmjoE2Q2/uoBz2GFg=";
hash = "sha256-jpXsvr2HnfMCJh851oS+IiQLSmL9C1bnaG6IPSq5xrA=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'DESTINATION /usr/lib/systemd' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}/systemd'
'';
strictDeps = true;
# Source has a path "systemd/usr/{libexec,lib}/...", don't break references to that
dontFixCmake = true;
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
bash
mir
libxkbcommon
];
postInstall = ''
substituteInPlace $out/bin/miriway-background \
--replace-fail 'exec swaybg' 'exec ${lib.getExe swaybg}'
substituteInPlace $out/bin/miriway-run \
--replace-fail 'inotifywait -qq' '${lib.getExe' inotify-tools "inotifywait"} -qq'
'';
passthru = {
updateScript = gitUpdater { rev-prefix = "v"; };
providedSessions = [ "miriway" ];

File diff suppressed because it is too large Load Diff

View File

@ -4,6 +4,7 @@
dbus,
eudev,
fetchFromGitHub,
fetchpatch,
libdisplay-info,
libglvnd,
libinput,
@ -25,15 +26,23 @@
rustPlatform.buildRustPackage rec {
pname = "niri";
version = "0.1.9";
version = "0.1.10";
src = fetchFromGitHub {
owner = "YaLTeR";
repo = "niri";
rev = "refs/tags/v${version}";
hash = "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=";
hash = "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=";
};
patches = [
# Fix scrolling not working with missing mouse config
(fetchpatch {
url = "https://github.com/YaLTeR/niri/commit/1951d2a9f262196a706f2645efb18dac3c4d6839.patch";
hash = "sha256-P/0LMYZ4HD0iG264BMnK4sLNNLmtbefF230GyC+t6qg=";
})
];
postPatch = ''
patchShebangs resources/niri-session
substituteInPlace resources/niri.service \
@ -43,8 +52,8 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"smithay-0.3.0" = "sha256-/3BO66yVoo63+5rwrZzoxhSTncvLyHdvtSaApFj3fBg=";
"libspa-0.8.0" = "sha256-R68TkFbzDFA/8Btcar+0omUErLyBMm4fsmQlCvfqR9o=";
"smithay-0.3.0" = "sha256-nSM7LukWHO2n2eWz5ipFNkTCYDvx/VvPXnKVngJFU0U=";
"libspa-0.8.0" = "sha256-kp5x5QhmgEqCrt7xDRfMFGoTK5IXOuvW2yOW02B8Ftk=";
};
};
@ -86,9 +95,14 @@ rustPlatform.buildRustPackage rec {
+ lib.optionalString withDbus ''
install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal
''
+ lib.optionalString withSystemd ''
+ lib.optionalString (withSystemd || withDinit) ''
install -Dm0755 resources/niri-session -t $out/bin
''
+ lib.optionalString withSystemd ''
install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/lib/systemd/user
''
+ lib.optionalString withDinit ''
install -Dm0644 resources/dinit/niri{-shutdown,} -t $out/lib/dinit.d/user
'';
env = {

View File

@ -0,0 +1,31 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nitrokey-udev-rules";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Nitrokey";
repo = "nitrokey-udev-rules";
rev = "v${finalAttrs.version}";
hash = "sha256-uq1+YQg+oe5UFphpy1AdxEYaPFyRle6ffYOPoU6Li28=";
};
installPhase = ''
install -D 41-nitrokey.rules -t $out/etc/udev/rules.d
'';
meta = with lib; {
description = "udev rules for Nitrokey devices";
homepage = "https://github.com/Nitrokey/nitrokey-udev-rules";
license = [ licenses.cc0 ];
maintainers = with maintainers; [
frogamic
robinkrahl
];
};
})

View File

@ -0,0 +1,44 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "nzp-assets";
version = "0-unstable-2024-09-28-13-34-48";
src = fetchFromGitHub {
owner = "nzp-team";
repo = "assets";
rev = "4a7b1b787061c1c7c17ab3b59a8e0e0f44c9546f";
hash = "sha256-gCTC/76r0ITIDLIph9uivq0ZJGaPUmlBGizdCUxJrng=";
};
outputs = [
"out"
"pc"
];
# TODO: add more outputs for other ports
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r common/* $out
mkdir -p $pc
cp -r pc/* $pc
chmod -R +w $pc/nzp
cp -r $out/* $pc/nzp
runHook postInstall
'';
meta = {
description = "Game asset repository for Nazi Zombies: Portable";
homepage = "https://github.com/nzp-team/assets";
license = with lib.licenses; [ cc-by-sa-40 ];
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ pluiedev ];
};
}

View File

@ -0,0 +1,176 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
ninja,
pkg-config,
makeWrapper,
zip,
gettext,
libpng,
zlib,
gnutls,
libGL,
xorg,
alsa-lib,
libjpeg,
libogg,
libvorbis,
libopus,
dbus,
fontconfig,
SDL2,
bullet,
openexr,
sqlite,
addDriverRunpath,
enableEGL ? true,
libglvnd,
enableVulkan ? true,
vulkan-headers,
vulkan-loader,
enableWayland ? true,
wayland,
libxkbcommon,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nzp-fteqw";
version = "0-unstable-2024-09-11-20-07-31";
src = fetchFromGitHub {
owner = "nzp-team";
repo = "fteqw";
rev = "593345a7f03245fc45580ac252857e5db5105033";
hash = "sha256-ANDHh4PKh8fAvbBiiW47l1XeGOCes0Sg595+65NFG6w=";
};
nativeBuildInputs = [
cmake
ninja
makeWrapper
pkg-config
zip
gettext
];
buildInputs =
[
libGL
xorg.libX11
xorg.libXrandr
xorg.libXcursor
xorg.libXScrnSaver
dbus
fontconfig
libjpeg
libpng
alsa-lib
libogg
libvorbis
libopus
SDL2
gnutls
zlib
bullet
]
++ lib.optional enableEGL libglvnd
++ lib.optionals enableWayland [
wayland
libxkbcommon
]
++ lib.optional enableVulkan vulkan-headers;
cmakeFlags = [
(lib.cmakeFeature "FTE_BUILD_CONFIG" "${finalAttrs.src}/engine/common/config_nzportable.h")
# Disable optional tools - only keep FTEQCC
(lib.cmakeBool "FTE_TOOL_IQM" false)
(lib.cmakeBool "FTE_TOOL_IMAGE" false)
(lib.cmakeBool "FTE_TOOL_QTV" false)
(lib.cmakeBool "FTE_TOOL_MASTER" false)
];
postInstall = ''
mv $out/games $out/bin
'';
postFixup =
let
# grep for `Sys_LoadLibrary` for more.
# Some of the deps listed in the source code are actually not active
# due to being either disabled by the nzportable profile (e.g. lua, bz2),
# available in /run/opengl-driver,
# or statically linked (e.g. libpng, libjpeg, zlib, freetype)
# Some of them are also just deprecated by better backend options
# (SDL audio is preferred over ALSA, OpenAL and PulseAudio, for example)
libs = [
addDriverRunpath.driverLink
# gl/gl_vidlinuxglx.c
xorg.libX11
xorg.libXrandr
xorg.libXxf86vm
xorg.libXxf86dga
xorg.libXi
xorg.libXcursor
libGL
libvorbis
sqlite # server/sv_sql.c
SDL2 # a lot of different files
gnutls # common/net_ssl_gnutls.c
openexr # client/image.c
(placeholder "out")
] ++ lib.optional enableWayland wayland ++ lib.optional enableVulkan vulkan-loader;
in
''
wrapProgram $out/bin/fteqw \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}"
'';
meta = {
description = "Nazi Zombies: Portable's fork of Spike's FTEQW engine/client";
longDescription = ''
This package contains only the FTEQW engine, and none of the assets used in NZ:P.
Please use the `nzportable` package for an out-of-the-box NZ:P experience.
FTEQW supports several graphics options.
You can specify those graphics option by overriding the FTEQW package, like this:
```nix
nzp-fteqw.override {
enableVulkan = true;
}
```
And in the game, you need to run `setrenderer <renderer>` to change the current renderer.
Supported graphics options are as follows:
- `enableEGL`: Enable the OpenGL ES renderer (`egl`). Enabled by default.
- `enableVulkan`: Enable the Vulkan renderer (`xvk`). Enabled by default.
- `enableWayland`: Enable native Wayland support, instead of using X11.
Adds up to two renderers, based on whether EGL and Vulkan are installed: `wlgl` and `wlvk`.
Seems to be currently broken and currently not enabled by default.
'';
homepage = "https://github.com/nzp-team/fteqw";
license = lib.licenses.gpl2Plus;
# See README
platforms = [
"x86_64-linux"
"i686-linux"
"armv7l-linux"
"aarch64-linux"
"x86_64-windows"
"i686-windows"
];
maintainers = with lib.maintainers; [ pluiedev ];
mainProgram = "fteqw";
};
})

View File

@ -0,0 +1,84 @@
{
lib,
callPackage,
writeShellApplication,
}:
let
assets = callPackage ./assets.nix { };
quakec = callPackage ./quakec.nix { };
fteqw = callPackage ./fteqw.nix { };
# We use the youngest version of all of the dependencies as the version number.
# This is similar to what upstream uses, except ours is a bit more accurate
# since we don't rely on a CI to run at an arbitrary time.
dateString =
lib.pipe
[
assets
fteqw
quakec
]
[
# Find the youngest (most recently updated) version
(lib.foldl' (acc: p: if lib.versionOlder acc p.version then p.version else acc) "")
(lib.splitString "-")
(lib.sublist 2 6) # drop the first two segments (0 and unstable) and only keep the date
lib.concatStrings
];
version = "2.0.0-indev+${dateString}";
in
writeShellApplication {
name = "nzportable";
text = ''
runDir=''${XDG_DATA_HOME:-$HOME/.local/share}/nzportable
data=${assets.pc}
relinkGameFiles() {
mkdir -p "$runDir"/nzp
# Remove existing links
find "$runDir" -type l -exec rm {} +
# Link game files
ln -s $data/default.fmf "$runDir"
ln -st "$runDir"/nzp $data/nzp/* ${quakec.fte}/*
# Write current version
echo "${version}" > "$runDir"/nzp/version.txt
}
if [[ ! -d $runDir ]]; then
echo "Game directory $runDir not found. Assuming first launch"
echo "Linking game files"
relinkGameFiles
else
currentVersion=$(<"$runDir"/nzp/version.txt)
if [[ "${version}" != "$currentVersion" ]]; then
echo "Version mismatch! (saved version $currentVersion != current version ${version})"
echo "Relinking game files"
relinkGameFiles
fi
fi
exec ${lib.getExe fteqw} -basedir "$runDir" "$@"
'';
derivationArgs = {
inherit version;
passthru = {
updateScript = callPackage ./update.nix { };
inherit assets quakec fteqw;
};
};
meta = {
inherit (fteqw.meta) platforms;
description = "Call of Duty: Zombies demake, powered by various Quake sourceports (PC version)";
homepage = "https://docs.nzp.gay";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ pluiedev ];
mainProgram = "nzportable";
};
}

View File

@ -0,0 +1,64 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
python3,
nzportable,
}:
stdenvNoCC.mkDerivation {
pname = "nzp-quakec";
version = "0-unstable-2024-10-12-12-03-59";
src = fetchFromGitHub {
owner = "nzp-team";
repo = "quakec";
rev = "01e95c4dab91ce0e8b7387d2726d9ee307792ae7";
hash = "sha256-h4llx3tzeoI1aHLokM7NqkZJWuo6rcrmWfb0pDQL+zM=";
};
outputs = [
"out"
"fte"
];
nativeBuildInputs = [ python3 ];
buildInputs = with python3.pkgs; [
colorama
fastcrc
pandas
nzportable.fteqw
];
buildPhase = ''
runHook preBuild
python3 bin/qc_hash_generator.py -i tools/asset_conversion_table.csv -o source/server/hash_table.qc
mkdir -p build/{fte,standard}
fteqcc -srcfile progs/csqc.src
fteqcc -O3 -DFTE -srcfile progs/ssqc.src
fteqcc -O3 -srcfile progs/ssqc.src
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out $fte
cp -r build/standard/* $out
cp -r build/fte/* $fte
runHook postInstall
'';
meta = {
description = "QuakeC repository for Nazi Zombies: Portable";
homepage = "https://github.com/nzp-team/quakec";
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux ++ darwin;
maintainers = with lib.maintainers; [ pluiedev ];
};
}

View File

@ -0,0 +1,41 @@
{
lib,
writeShellApplication,
jq,
curl,
nix-prefetch-git,
common-updater-scripts,
}:
lib.getExe (writeShellApplication {
name = "nzp-updater";
runtimeInputs = [
jq
curl
nix-prefetch-git
common-updater-scripts
];
text = ''
youngest=0
update() {
repo=$1
tag=$2
prefetch=$(nix-prefetch-git "https://github.com/nzp-team/$repo" --rev "$tag")
timestamp=$(echo "$prefetch" | jq -r '.date | strptime("%Y-%m-%dT%H:%M:%S%z") | mktime | strftime("%Y-%m-%d-%H-%M-%S")')
rev=$(echo "$prefetch" | jq -r ".rev")
hash=$(echo "$prefetch" | jq -r ".hash")
if [[ $youngest -lt $timestamp ]]; then
youngest=$timestamp
fi
update-source-version "$UPDATE_NIX_ATTR_PATH.$repo" "0-unstable-$timestamp" "$hash" --rev="$rev"
}
update fteqw bleeding-edge
update assets newest
update quakec bleeding-edge
'';
})

View File

@ -61,7 +61,7 @@ let
-t $out/share/applications/
for size in 16 24 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
magick ${icon} -background none -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
magick -background none ${icon} -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
done
runHook postInstall
'';

View File

@ -1,467 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "anstream"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
[[package]]
name = "anstyle-parse"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748"
dependencies = [
"windows-sys",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
"windows-sys",
]
[[package]]
name = "clap"
version = "4.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
dependencies = [
"clap_builder",
"clap_derive",
]
[[package]]
name = "clap_builder"
version = "4.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim",
]
[[package]]
name = "clap_derive"
version = "4.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "clap_lex"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "comemo"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4"
dependencies = [
"comemo-macros",
"siphasher",
]
[[package]]
name = "comemo-macros"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "ecow"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02"
dependencies = [
"serde",
]
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "hashbrown"
version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
[[package]]
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "indexmap"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
dependencies = [
"equivalent",
"hashbrown",
]
[[package]]
name = "memchr"
version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]]
name = "once_cell"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "pin-project-lite"
version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "prettypst"
version = "1.1.0"
dependencies = [
"clap",
"serde",
"thiserror",
"toml",
"typst-syntax",
]
[[package]]
name = "proc-macro2"
version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2",
]
[[package]]
name = "serde"
version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_spanned"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
dependencies = [
"serde",
]
[[package]]
name = "siphasher"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe"
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
version = "2.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "thiserror"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "toml"
version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]
[[package]]
name = "toml_datetime"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
"winnow",
]
[[package]]
name = "tracing"
version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
"pin-project-lite",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-attributes"
version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "tracing-core"
version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
dependencies = [
"once_cell",
]
[[package]]
name = "typst-syntax"
version = "0.10.0"
source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c"
dependencies = [
"comemo",
"ecow",
"once_cell",
"serde",
"tracing",
"unicode-ident",
"unicode-math-class",
"unicode-script",
"unicode-segmentation",
"unscanny",
]
[[package]]
name = "unicode-ident"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-math-class"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65"
[[package]]
name = "unicode-script"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
[[package]]
name = "unicode-segmentation"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "unscanny"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47"
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
[[package]]
name = "windows_i686_gnu"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
[[package]]
name = "windows_i686_msvc"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "winnow"
version = "0.5.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94"
dependencies = [
"memchr",
]

View File

@ -5,21 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "prettypst";
version = "unstable-2023-12-06";
version = "unstable-2024-10-20";
src = fetchFromGitHub {
owner = "antonWetzel";
repo = "prettypst";
rev = "bf46317ecac4331f101b2752de5328de5981eeba";
hash = "sha256-wPayP/693BKIrHrRkx4uY0UuZRoCGPNW8LB3Z0oSBi4=";
rev = "a724b56de0527faf0f1f1eecb17d0b847872411c";
hash = "sha256-CVvcrytEG2q6kPiGBMfy/oQCD63Gm2AenvLUhCUx6fw=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"typst-syntax-0.10.0" = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s=";
};
};
cargoHash = "sha256-zUeCthQ2fQ1P0gxN5XXg6a+Op8JFMrzU02Mh0mpwv30=";
meta = {
changelog = "https://github.com/antonWetzel/prettypst/blob/${src.rev}/changelog.md";

View File

@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton9-18";
version = "GE-Proton9-20";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-NoRNM61Y9q8ksOXPeDV/NaIqHblWjXtK3tXcX5UEwkI=";
hash = "sha256-1twCv81KO1fcRcIb4H7VtAjtcKrX+DymsYdf885eOWo=";
};
outputs = [

View File

@ -8,13 +8,13 @@
rustPlatform.buildRustPackage rec {
pname = "proton-vpn-local-agent";
version = "0-unstable-2024-10-10";
cargoHash = "sha256-yAeqx9zo4xz4g/klo10vMEcecc8npIUY8tkV/nq11WA=";
version = "1.0.0";
cargoHash = "sha256-TE2iqxTC6UH7pCM1wKEwaujMenNIp4LE+oy545tGmL0=";
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "python-proton-vpn-local-agent";
rev = "01332194d217d91a514ecaebcdfbfa3d21ccd1ed";
rev = version;
hash = "sha256-I+tbVQzD4xJUsoRF8TU/2EMldVqtfxY3E7PQN3ks0mA=";
};

View File

@ -57,7 +57,6 @@ rustPlatform.buildRustPackage {
wayland
xorg.libX11
xorg.libXcursor
xorg.libXrandr
xorg.libXi
xorg.libxcb
xorg.libXrender

View File

@ -20,7 +20,7 @@
}:
let
rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ]
rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXi ]
++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ];
in
rustPlatform.buildRustPackage rec {

View File

@ -3,7 +3,6 @@
, rustPlatform
, darwin
, libX11
, openssl
, pkg-config
, stdenv
@ -11,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "smartcat";
version = "1.7.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "efugier";
repo = "smartcat";
rev = "refs/tags/${version}";
hash = "sha256-62yvXrhk9JO7JBfD7tNFjba2nHxdqAVyMIW3q+2Aomc=";
hash = "sha256-QoMBQ/Xjh/xbsE9HthUKwm5v2tiN1tC2u6I/aOeO6ws=";
};
cargoHash = "sha256-y0EA6pDxAO4mxZE+k15LUrjxsDD4A/KxvJltZL9Lqgc=";
cargoHash = "sha256-SAv2tgo5jBSsVhLM2FR5S9Sg0yZBghSKKSV9hhUCvCk=";
nativeBuildInputs = [
pkg-config
@ -28,7 +27,6 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
openssl
libX11
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit

View File

@ -28,22 +28,25 @@
, stdenv
, darwin
, makeBinaryWrapper
# passthru
, nix-update-script
}:
assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaudio" "rodio" "portaudio" "jackaudio" "rodiojack" "sdl" "gstreamer" ];
rustPlatform.buildRustPackage rec {
pname = "spotify-player";
version = "0.20.0";
version = "0.20.1";
src = fetchFromGitHub {
owner = "aome510";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-heycCm2Nwyo+DegMKeXZ+dF+ZqiFT/6P08/28buJc6I=";
hash = "sha256-SKlESIw8eAyAqR1HVW004yyL2nNVEnb4/xmf0ch3ZMo=";
};
cargoHash = "sha256-U3a/6uF7vOV3QnxqPnooBdvjyyIPLnQXiXtTwKeHAxA=";
cargoHash = "sha256-VlJ8Bz4EY2rERyOn6ifC7JAL5Mvjt0ZOzlPBOwiH6WA=";
nativeBuildInputs = [
pkg-config
@ -93,12 +96,16 @@ rustPlatform.buildRustPackage rec {
--prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}"
'';
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Terminal spotify player that has feature parity with the official client";
homepage = "https://github.com/aome510/spotify-player";
changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}";
mainProgram = "spotify_player";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dit7ya xyven1 _71zenith ];
maintainers = with lib.maintainers; [ dit7ya xyven1 _71zenith caperren ];
};
}

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.26.0";
version = "1.27.3";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-yfQSGmLWXyOI5slB8AMcVTfQQKUXY3mBaeDPya4KtKo=";
hash = "sha256-4vIRhhBvK2R0nAdG4zDTJ+6F3WOI9sAB/ongBMnzsWk=";
};
cargoHash = "sha256-WuYAE2msctMf+7C1h5pNGyjrEInnT6PxfZ94bZhzB5w=";
cargoHash = "sha256-cn1jy8kQ6R+JU6w/sqcNP+uzSKKg3V4H97qnJAIESd0=";
meta = with lib; {
description = "Source code spell checker";

View File

@ -0,0 +1,54 @@
{
stdenv,
fetchFromGitHub,
multimarkdown,
libnotify,
udev,
systemdLibs,
glib,
pkg-config,
lib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "udev-block-notify";
version = "0.7.11";
src = fetchFromGitHub {
owner = "eworm-de";
repo = "udev-block-notify";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-A0uhfb2mEAAJgxRkv+MWTk/9oFiz3r7deAlu1Kpk+CI=";
};
nativeBuildInputs = [
multimarkdown
pkg-config
];
buildInputs = [
libnotify
udev
systemdLibs
glib
];
installPhase = ''
runHook preInstall
substituteInPlace systemd/udev-block-notify.service \
--replace-fail '/usr/bin/udev-block-notify' "$out/bin/udev-block-notify"
install -D -m0755 udev-block-notify $out/bin/udev-block-notify
install -D -m0644 systemd/udev-block-notify.service $out/lib/systemd/user/udev-block-notify.service
runHook postInstall
'';
meta = {
homepage = "https://github.com/eworm-de/udev-block-notify";
description = "Notify about udev block events";
mainProgram = "udev-block-notify";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ danbulant ];
platforms = lib.platforms.linux;
};
})

View File

@ -15,9 +15,7 @@
let
python = python3.override {
packageOverrides = final: prev: {
django = prev.django_5.overridePythonAttrs (old: {
dependencies = old.dependencies ++ prev.django_5.optional-dependencies.argon2;
});
django = prev.django_5;
sentry-sdk = prev.sentry-sdk_2;
djangorestframework = prev.djangorestframework.overridePythonAttrs (old: {
# https://github.com/encode/django-rest-framework/discussions/9342
@ -28,10 +26,12 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "weblate";
version = "5.7.2";
version = "5.8.3";
pyproject = true;
disabled = python.pythonOlder "3.11";
outputs = [
"out"
"static"
@ -41,18 +41,9 @@ python.pkgs.buildPythonApplication rec {
owner = "WeblateOrg";
repo = "weblate";
rev = "refs/tags/weblate-${version}";
hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y=";
hash = "sha256-Kmna23jhhFRJ0ExplYNPFEaIAJxmwHU2azivfKHHnjs=";
};
pythonRelaxDeps = [
# https://github.com/WeblateOrg/weblate/commit/9695f912b0d24ae999d9442bb49719b4bb552696
"qrcode"
# https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7
"rapidfuzz"
# https://github.com/WeblateOrg/weblate/commit/3e34566fd7c151e1983586586bd7651cefe79585
"redis"
];
patches = [
# FIXME This shouldn't be necessary and probably has to do with some dependency mismatch.
./cache.lock.patch
@ -93,6 +84,7 @@ python.pkgs.buildPythonApplication rec {
cssselect
cython
cyrtranslit
dateparser
diff-match-patch
django-appconf
django-celery-beat
@ -105,6 +97,7 @@ python.pkgs.buildPythonApplication rec {
django-otp-webauthn
django
djangorestframework
drf-spectacular
filelock
fluent-syntax
gitpython
@ -142,8 +135,10 @@ python.pkgs.buildPythonApplication rec {
weblate-language-data
weblate-schemas
]
++ django.optional-dependencies.argon2
++ python-redis-lock.optional-dependencies.django
++ celery.optional-dependencies.redis;
++ celery.optional-dependencies.redis
++ drf-spectacular.optional-dependencies.sidecar;
optional-dependencies = {
postgres = with python.pkgs; [ psycopg ];

View File

@ -75,13 +75,13 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "yosys";
version = "0.46";
version = "0.47";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-OnSKsX5G8Tc6AMFCmuWg6AekJvvG+K5Zr5rZZll+c/o=";
hash = "sha256-9u9aAPTZyt9vzZwryor3GRCGzs/mu2/XtM0XzV7uHfk=";
fetchSubmodules = true;
leaveDotGit = true;
postFetch = ''

View File

@ -87,5 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.asl20;
maintainers = with maintainers; [ hzeller ];
platforms = platforms.all;
broken = versionAtLeast yosys.version "0.47";
};
})

View File

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "anthropic";
version = "0.35.0";
version = "0.39.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "anthropics";
repo = "anthropic-sdk-python";
rev = "refs/tags/v${version}";
hash = "sha256-/lA44YwUWwm8ZswCBneT3sutcpQ2GPv0S2bHTUGiwwg=";
hash = "sha256-lpW+waHvwgbhK7EnPZy/XI8gK3a8JjFflPqUFbDN1z8=";
};
build-system = [

View File

@ -5,14 +5,14 @@
buildPythonPackage rec {
pname = "csv2md";
version = "1.3.0";
version = "1.4.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "lzakharov";
repo = "csv2md";
rev = "v${version}";
hash = "sha256-INwZRbyJmyDd5SV7PBdqUc/3FO91upTgaxBfP/Giaw4=";
hash = "sha256-CzURejGIxsD7IBSbAYXz0kj5oX47e+uN13fqd56CM1A=";
};
pythonImportsCheck = [ "csv2md" ];

View File

@ -8,15 +8,16 @@
buildPythonPackage rec {
pname = "diff-match-patch";
version = "20230430";
format = "pyproject";
version = "20241021";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-lTAZzbnJ0snke1sSvP889HRvxFmOtAYHb6H8J+ah8Vw=";
pname = "diff_match_patch";
inherit version;
hash = "sha256-vq5XqZ+kgIRTKTXuKWi4Zh24YYYuyCxvIfSs3W2DUHM=";
};
nativeBuildInputs = [ flit-core ];
dependencies = [ flit-core ];
nativeCheckInputs = [ unittestCheckHook ];

View File

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "django-otp-webauthn";
version = "0.3.0";
version = "0.4.0";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "django_otp_webauthn";
hash = "sha256-+Y46/PDeXL9zayoZykaU63faQmnLHzYPmqJJeRBx+hs=";
hash = "sha256-BXwIjQjynTjFK+bNML5i35qxQ7TJeb4Xc+duS6Y+5Fk=";
};
build-system = [ hatchling ];

View File

@ -3,7 +3,6 @@
buildPythonPackage,
chardet,
docutils,
fetchpatch,
fetchPypi,
pbr,
pygments,
@ -27,15 +26,6 @@ buildPythonPackage rec {
hash = "sha256-EiXzAUThzJfjiNuvf+PpltKJdHOlOm2uJo3d4hw1S5g=";
};
patches = [
# https://github.com/PyCQA/doc8/pull/146
(fetchpatch {
name = "remove-setuptools-scm-git-archive.patch";
url = "https://github.com/PyCQA/doc8/commit/06416e95041db92e4295b13ab596351618f6b32e.patch";
hash = "sha256-IIE3cDNOx+6RLjidGrokyazaX7MOVbMKUb7yQIM5sI0=";
})
];
nativeBuildInputs = [
setuptools-scm
wheel

View File

@ -93,6 +93,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "drf_spectacular" ];
optional-dependencies.sidecar = [ drf-spectacular-sidecar ];
meta = with lib; {
description = "Sane and flexible OpenAPI 3 schema generation for Django REST framework";
homepage = "https://github.com/tfranzel/drf-spectacular";

View File

@ -0,0 +1,59 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
rustPlatform,
pytestCheckHook,
pytest-benchmark,
nix-update-script,
}:
let
pname = "fastcrc";
version = "0.3.2";
src = fetchFromGitHub {
owner = "overcat";
repo = "fastcrc";
rev = "refs/tags/v${version}";
hash = "sha256-yLrv/zqsjgygJAIJtztwxlm4s9o9EBVsCyx1jUXd7hA=";
};
in
buildPythonPackage {
inherit pname version src;
pyproject = true;
disabled = pythonOlder "3.7";
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook
];
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-wSE7548L+ymNjN9TfygAGY1BrssXOPGXlmE83wV7zb4=";
};
pythonImportsCheck = [ "fastcrc" ];
nativeCheckInputs = [
pytestCheckHook
pytest-benchmark
];
# Python source files interfere with testing
preCheck = ''
rm -r fastcrc
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Hyper-fast Python module for computing CRC(8, 16, 32, 64) checksum";
homepage = "https://fastcrc.readthedocs.io/en/latest/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pluiedev ];
};
}

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "githubkit";
version = "0.11.11";
version = "0.11.14";
pyproject = true;
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "yanyongyu";
repo = "githubkit";
rev = "refs/tags/v${version}";
hash = "sha256-/jtTNQ9r4JJAXLIEEO7lR0IhpJ5vzbV0mNTdKgkH1FE=";
hash = "sha256-nZzsBxPRmqHTaYVogWsdaGbzwBsVr08qcvAekk3O4FM=";
};
pythonRelaxDeps = [ "hishel" ];

View File

@ -29,6 +29,10 @@ buildPythonPackage rec {
build-system = [ setuptools ];
preCheck = ''
export HOME=$(mktemp -d)
'';
dependencies = [
cryptography
requests
@ -44,10 +48,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "globus_sdk" ];
meta = with lib; {
meta = {
description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API";
homepage = "https://github.com/globus/globus-sdk-python";
changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}";
license = licenses.asl20;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ bot-wxt1221 ];
};
}

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "google-ai-generativelanguage";
version = "0.6.10";
version = "0.6.12";
pyproject = true;
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_ai_generativelanguage";
inherit version;
hash = "sha256-b6ZCyWTYcoAG/n6HcQJvwLWZrg6+r4PK9VCUHo5pNFU=";
hash = "sha256-v6A3iIAwYcgMAF4o+rXZb0Zfzxx9KKHu+xYx+0oqtn8=";
};
build-system = [ setuptools ];

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-iam-logging";
version = "1.3.5";
version = "1.4.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_iam_logging";
inherit version;
hash = "sha256-B/OE8m6CpTddR+nAv9OP/y1V1c32/cUZPzfptAOuMrw=";
hash = "sha256-+7rRPIPXmxMbcTRqKTfYXciH1Op760Vm2d969zqJNnM=";
};
build-system = [ setuptools ];

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-generativeai";
version = "0.8.2";
version = "0.8.3";
pyproject = true;
disabled = pythonOlder "3.9";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "google";
repo = "generative-ai-python";
rev = "refs/tags/v${version}";
hash = "sha256-7l7Tg4sCdRtYnDwrQBA4rUIz4gO2YGf+3qn7OQRMCDc=";
hash = "sha256-XHYO2bH95Naoha2ZLpkP0YCq60qqiQPz+YzU6O4pInQ=";
};
pythonRelaxDeps = [ "google-ai-generativelanguage" ];

View File

@ -0,0 +1,135 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
altair,
cryptography,
jinja2,
jsonschema,
marshmallow,
mistune,
numpy,
packaging,
pandas,
posthog,
pydantic,
pyparsing,
python-dateutil,
requests,
ruamel-yaml,
scipy,
tqdm,
tzlocal,
# test
pytestCheckHook,
pytest-mock,
pytest-order,
pytest-random-order,
click,
flaky,
freezegun,
invoke,
moto,
psycopg2,
requirements-parser,
responses,
sqlalchemy,
}:
buildPythonPackage rec {
pname = "great-expectations";
version = "1.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "great-expectations";
repo = "great_expectations";
rev = "refs/tags/${version}";
hash = "sha256-TV07vmc0XdP6ICv7Kws79zACCsahZ6FlhplJHbpDFNk=";
};
postPatch = ''
substituteInPlace tests/conftest.py --replace 'locale.setlocale(locale.LC_ALL, "en_US.UTF-8")' ""
'';
build-system = [ setuptools ];
dependencies = [
altair
cryptography
jinja2
jsonschema
marshmallow
mistune
numpy
packaging
pandas
posthog
pydantic
pyparsing
python-dateutil
requests
ruamel-yaml
scipy
tqdm
tzlocal
];
pythonRelaxDeps = [
"altair"
"pandas"
"posthog"
];
nativeCheckInputs = [
pytestCheckHook
pytest-mock
pytest-order
pytest-random-order
click
flaky
freezegun
invoke
moto
psycopg2
requirements-parser
responses
sqlalchemy
] ++ moto.optional-dependencies.s3 ++ moto.optional-dependencies.sns;
disabledTestPaths = [
# try to access external URLs:
"tests/integration/cloud/rest_contracts"
"tests/integration/spark"
# moto-related import errors:
"tests/actions"
"tests/data_context"
"tests/datasource"
"tests/execution_engine"
# locale-related rendering issues, mostly:
"tests/core/test__docs_decorators.py"
"tests/expectations/test_expectation_atomic_renderers.py"
"tests/render"
];
disabledTests = [
# tries to access network:
"test_checkpoint_run_with_data_docs_and_slack_actions_emit_page_links"
"test_checkpoint_run_with_slack_action_no_page_links"
];
pythonImportsCheck = [ "great_expectations" ];
pytestFlagsArray = [ "-m 'not spark and not postgresql and not snowflake'" ];
meta = {
description = "Library for writing unit tests for data validation";
homepage = "https://docs.greatexpectations.io";
changelog = "https://github.com/great-expectations/great_expectations/releases/tag/${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ bcdarwin ];
};
}

View File

@ -1,37 +1,45 @@
{
lib,
stdenv,
buildPythonPackage,
docstring-to-markdown,
fetchFromGitHub,
pythonOlder,
# build-system
poetry-core,
# dependencies
docstring-to-markdown,
jedi,
lsprotocol,
poetry-core,
pygls,
pydantic,
pyhamcrest,
pygls,
# tests
pytestCheckHook,
pyhamcrest,
python-lsp-jsonrpc,
pythonOlder,
stdenv,
}:
buildPythonPackage rec {
pname = "jedi-language-server";
version = "0.42.0";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "pappasam";
repo = pname;
repo = "jedi-language-server";
rev = "refs/tags/v${version}";
hash = "sha256-KWkKIKiaRR26CctDFrHJAITM+nmRKGxLeC5HHwVZz4s=";
};
nativeBuildInputs = [ poetry-core ];
build-system = [
poetry-core
];
propagatedBuildInputs = [
dependencies = [
docstring-to-markdown
jedi
lsprotocol
@ -57,12 +65,12 @@ buildPythonPackage rec {
pythonImportsCheck = [ "jedi_language_server" ];
meta = with lib; {
meta = {
description = "Language Server for the latest version(s) of Jedi";
mainProgram = "jedi-language-server";
homepage = "https://github.com/pappasam/jedi-language-server";
changelog = "https://github.com/pappasam/jedi-language-server/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ doronbehar ];
changelog = "https://github.com/pappasam/jedi-language-server/blob/v${version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ doronbehar ];
};
}

View File

@ -2,13 +2,17 @@
lib,
buildPythonPackage,
fetchPypi,
setuptools,
setuptools-scm,
dill,
dnslib,
dnspython,
plux,
pyaes,
pyotp,
python-jose,
requests,
python-dateutil,
tabulate,
# Sensitive downstream dependencies
@ -18,7 +22,7 @@
buildPythonPackage rec {
pname = "localstack-ext";
version = "3.7.2";
format = "setuptools";
pyproject = true;
src = fetchPypi {
pname = "localstack_ext";
@ -26,32 +30,31 @@ buildPythonPackage rec {
hash = "sha256-gd+HyZnezgtKrSKJOYtxUZHTPMrrpKWQHGvaIs9FyVs=";
};
postPatch = ''
build-system = [
setuptools
setuptools-scm
];
pythonRemoveDeps = [
# Avoid circular dependency
sed -i '/localstack>=/d' setup.cfg
"localstack"
"build"
];
# Pip is unable to resolve attr logic, so it will emit version as 0.0.0
substituteInPlace setup.cfg \
--replace "version = attr: localstack_ext.__version__" "version = ${version}"
cat setup.cfg
substituteInPlace setup.cfg \
--replace "dill==0.3.2" "dill~=0.3.0" \
--replace "requests>=2.20.0,<2.26" "requests~=2.20"
'';
propagatedBuildInputs = [
dependencies = [
dill
dnslib
dnspython
plux
pyaes
pyotp
python-jose
requests
tabulate
];
python-dateutil
] ++ python-jose.optional-dependencies.cryptography;
pythonImportsCheck = [ "localstack_ext" ];
pythonImportsCheck = [ "localstack" ];
# No tests in repo
doCheck = false;
@ -60,10 +63,10 @@ buildPythonPackage rec {
inherit localstack;
};
meta = with lib; {
meta = {
description = "Extensions for LocalStack";
homepage = "https://github.com/localstack/localstack";
license = licenses.asl20;
license = lib.licenses.asl20;
maintainers = [ ];
};
}

View File

@ -19,6 +19,7 @@
rich,
semver,
setuptools,
setuptools-scm,
tailer,
}:
@ -34,7 +35,10 @@ buildPythonPackage rec {
hash = "sha256-8xdP/qpmfqmXDt1gNhzkAGlBR6dJYznKr9+/Un6N7mA=";
};
build-system = [ setuptools ];
build-system = [
setuptools
setuptools-scm
];
dependencies = [
apispec

View File

@ -162,6 +162,7 @@ buildPythonPackage rec {
pyyaml
py-partiql-parser
];
sns = [ ];
stepfunctions = [
antlr4-python3-runtime
jsonpath-ng

View File

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "proton-vpn-api-core";
version = "0.35.5";
version = "0.36.4";
pyproject = true;
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "python-proton-vpn-api-core";
rev = "v${version}";
hash = "sha256-YdBsA8qKcWpR+L/I9rEFntR448kaxEjYuGDPS1ynsMU=";
hash = "sha256-K2uti5QPSK+er8pLiSTrdxRZeKtAaGPj/N3zoIpJhHw=";
};
build-system = [
@ -67,6 +67,7 @@ buildPythonPackage rec {
disabledTests = [
# Permission denied: '/run'
"test_ensure_configuration_file_is_created"
"test_ovpnconfig_with_certificate"
"test_ovpnconfig_with_settings"
"test_wireguard_config_content_generation"
"test_wireguard_with_non_certificate"

View File

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "proton-vpn-network-manager";
version = "0.9.1";
version = "0.9.4";
pyproject = true;
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "python-proton-vpn-network-manager";
rev = "refs/tags/v${version}";
hash = "sha256-dwWEcLowNlIoxeVQnEpmI+PK18DQRiW4A4qfWHSqRw8=";
hash = "sha256-9VoJyQfT9rUXK1vkQrUPvWogVYTbDLhSq3JDu3gJwg8=";
};
nativeBuildInputs = [

View File

@ -8,6 +8,7 @@
fetchFromGitHub,
pyopenssl,
pythonOlder,
pytest-asyncio,
pytestCheckHook,
requests,
setuptools,
@ -38,7 +39,10 @@ buildPythonPackage rec {
requests
];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "switchbot" ];

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
version = "0.10.4";
version = "0.11.0b1";
pyproject = true;
disabled = pythonOlder "3.11";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
hash = "sha256-7dRwZKthEAtVvOsKUXgkCE5zwUtcJgSJZiaHXJwZ+9w=";
hash = "sha256-kLrdhwIUdmZh08I7XOHT2ciiVn8JE9lcfVcMJf05bkk=";
};
build-system = [ setuptools ];

View File

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "scikit-rf";
version = "1.3.0";
version = "1.4.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "scikit-rf";
repo = "scikit-rf";
rev = "refs/tags/v${version}";
hash = "sha256-cYQDoEX33fjxekTA2COHMvcLxCFCD7g9bp3y9sE4uUU=";
hash = "sha256-tUMOTRazs531OKGUZbh+Ee1omkFY3CAUAMmpKcNCdZU=";
};
postPatch = ''
@ -65,6 +65,7 @@ buildPythonPackage rec {
sphinx
nbsphinx
openpyxl
nbval
];
};
@ -72,7 +73,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytest-mock
nbval
matplotlib
pyvisa
openpyxl

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1262";
version = "3.0.1263";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-4OySojZI2efUkeZAmUxOPQ/yEnOd7PA6cuOJPNv4bNU=";
hash = "sha256-B61d8zyrOixqAy9sk4yiipB0xO3eHP5Pi8HfUVs/LeI=";
};
build-system = [ setuptools ];

View File

@ -39,7 +39,7 @@
}:
let
version = "0.24.0";
version = "0.25.0";
pname = "tensorflow-probability";
# first build all binaries and generate setup.py using bazel
@ -49,7 +49,7 @@ let
owner = "tensorflow";
repo = "probability";
rev = "refs/tags/v${version}";
hash = "sha256-V6aw4NtGOHlvcbgLWMH29x81eck1PyzV93ANelvpL4c=";
hash = "sha256-LXQfGFgnM7WYUQjJ2Y3jskdeJ/dEKz+Afg+UOQjv5kc=";
};
nativeBuildInputs = [
absl-py

View File

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "translate-toolkit";
version = "3.13.4";
version = "3.14.1";
pyproject = true;
build-system = [ setuptools-scm ];
@ -30,7 +30,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "translate_toolkit";
inherit version;
hash = "sha256-d0q4xpN37xeLSmQMBrDGZlGjAj4hHfkazGUHzl89UHI=";
hash = "sha256-IUjEN8Up1Or4nFo71WkDduq+6Xw8ObfUgkABp88zPoY=";
};
dependencies = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "wordcloud";
version = "1.9.3";
version = "1.9.4";
pyproject = true;
@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-qapzjWPtZ0pA8Mwxrbg/TKX8GV8Dpq/24BDR9YB9HFg=";
hash = "sha256-snPYpd7ZfT6tkEBGtJRk3LcRGe5534dQcqTBBcrdNHo=";
};
postPatch = ''

View File

@ -16,14 +16,14 @@
buildPythonApplication rec {
pname = "cvise";
version = "2.10.0";
version = "2.11.0";
format = "other";
src = fetchFromGitHub {
owner = "marxin";
repo = "cvise";
rev = "refs/tags/v${version}";
hash = "sha256-0gk4O1q90eH1FMhj4ncNVqX/MfVyaU0nckh1xny2wlM=";
hash = "sha256-xaX3QMnTKXTXPuLzui0e0WgaQNvbz8u1JNRBkfe4QWg=";
};
patches = [

View File

@ -31,16 +31,16 @@ let
in
buildGoModule rec {
pname = "netbird";
version = "0.30.2";
version = "0.31.0";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "netbird";
rev = "v${version}";
hash = "sha256-8PIReuWnD7iMesSWAo6E4J+mWNAa7lHKwBWsCsXUG+E=";
hash = "sha256-e3oiIVma4p3tAfDUwKC9zzgTWDjqXZSWsykR47eE+kE=";
};
vendorHash = "sha256-KScynPcMZ90XZy/N5X3aQfKuVl/JOCJmd8luNxChkZk=";
vendorHash = "sha256-kEwGJ2+xe7ct9ckMAE4l+2cBYcUXpoDVM3DohtzHqeY=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;

View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ggshield";
version = "1.32.2";
version = "1.33.0";
pyproject = true;
src = fetchFromGitHub {
owner = "GitGuardian";
repo = "ggshield";
rev = "refs/tags/v${version}";
hash = "sha256-8Nrmfbu1ChuJU4lSbaqIxNagkTJoKTeooUWnMKtIVx0=";
hash = "sha256-qvvCBJ56wC56p6tOCb5hh+J7Y/Hec/YgDKNmDbbWNig=";
};
pythonRelaxDeps = true;

View File

@ -824,7 +824,6 @@ mapAliases {
neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
newlibCross = newlib; # Added 2024-09-06
newlib-nanoCross = newlib-nano; # Added 2024-09-06
nitrokey-udev-rules = libnitrokey; # Added 2023-03-25
nix-direnv-flakes = nix-direnv;
nix-ld-rs = nix-ld; # Added 2024-08-17
nix-repl = throw (

View File

@ -4382,6 +4382,8 @@ self: super: with self; {
fastapi-sso = callPackage ../development/python-modules/fastapi-sso { };
fastcrc = callPackage ../development/python-modules/fastcrc { };
fast-histogram = callPackage ../development/python-modules/fast-histogram { };
fastavro = callPackage ../development/python-modules/fastavro { };
@ -5484,6 +5486,8 @@ self: super: with self; {
greatfet = callPackage ../development/python-modules/greatfet { };
great-expectations = callPackage ../development/python-modules/great-expectations { };
great-tables = callPackage ../development/python-modules/great-tables { };
greeclimate = callPackage ../development/python-modules/greeclimate { };