Merge master into staging-next
This commit is contained in:
@@ -507,8 +507,8 @@ pkgs/servers/authelia/ @06kellyjac @dit7ya @nicomem
|
||||
pkgs/by-name/oc/octodns/ @anthonyroussel
|
||||
|
||||
# Teleport
|
||||
/pkgs/build-support/teleport @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger
|
||||
pkgs/by-name/te/teleport* @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger
|
||||
/pkgs/build-support/teleport @arianvp @justinas @sigma @tomberek @techknowlogick @JuliusFreudenberger
|
||||
pkgs/by-name/te/teleport* @arianvp @justinas @sigma @tomberek @techknowlogick @JuliusFreudenberger
|
||||
|
||||
# Warp-terminal
|
||||
pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @FlameFlag @johnrtitor
|
||||
|
||||
@@ -287,6 +287,8 @@
|
||||
Use `python3Packages.ddgs` instead.
|
||||
See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0)
|
||||
|
||||
- `ra-multiplex` has been renamed to/replaced by `lspmux`. Its wrapper no longer includes `rust-analyzer`.
|
||||
|
||||
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -8837,11 +8837,6 @@
|
||||
githubId = 32936898;
|
||||
name = "Wu Zhenyu";
|
||||
};
|
||||
freezeboy = {
|
||||
github = "freezeboy";
|
||||
githubId = 13279982;
|
||||
name = "freezeboy";
|
||||
};
|
||||
frenetic00 = {
|
||||
github = "frenetic00";
|
||||
githubId = 50942055;
|
||||
|
||||
@@ -35,8 +35,7 @@ let
|
||||
user = "sa";
|
||||
};
|
||||
logger.console = "true";
|
||||
media.path = "${stateDirectory}/media";
|
||||
templates.root = "${stateDirectory}/templates";
|
||||
web.override = "${stateDirectory}/override";
|
||||
};
|
||||
|
||||
in
|
||||
@@ -95,11 +94,9 @@ in
|
||||
wants = [ "network-online.target" ];
|
||||
|
||||
preStart = ''
|
||||
# Copy new templates into our state directory.
|
||||
cp -a --update=none ${pkgs.traccar}/templates ${stateDirectory}
|
||||
test -f '${configFilePath}' && rm -f '${configFilePath}'
|
||||
|
||||
# Substitute the configFile from Envvars read from EnvironmentFile
|
||||
# Perform envvars substition read from environmentFile
|
||||
old_umask=$(umask)
|
||||
umask 0177
|
||||
${lib.getExe pkgs.envsubst} \
|
||||
@@ -110,6 +107,7 @@ in
|
||||
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
WorkingDirectory = "${pkgs.traccar}";
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
|
||||
ExecStart = "${lib.getExe pkgs.traccar} ${configFilePath}";
|
||||
LockPersonality = true;
|
||||
@@ -132,11 +130,6 @@ in
|
||||
StateDirectory = "traccar";
|
||||
SuccessExitStatus = 143;
|
||||
Type = "simple";
|
||||
# Set the working directory to traccar's package.
|
||||
# Traccar only searches for the DB migrations relative to it's WorkingDirectory and nothing worked to
|
||||
# work around this. To avoid copying the migrations over to the state directory, we use the package as
|
||||
# WorkingDirectory.
|
||||
WorkingDirectory = "${pkgs.traccar}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -456,6 +456,8 @@ in
|
||||
|
||||
package = lib.mkPackageOption pkgs "tor" { };
|
||||
|
||||
obfs4Package = lib.mkPackageOption pkgs "obfs4" { };
|
||||
|
||||
enableGeoIP =
|
||||
lib.mkEnableOption ''
|
||||
use of GeoIP databases.
|
||||
@@ -1253,7 +1255,7 @@ in
|
||||
BridgeRelay = true;
|
||||
ExtORPort.port = lib.mkDefault "auto";
|
||||
ServerTransportPlugin.transports = lib.mkDefault [ "obfs4" ];
|
||||
ServerTransportPlugin.exec = lib.mkDefault "${lib.getExe pkgs.obfs4} managed";
|
||||
ServerTransportPlugin.exec = lib.mkDefault "${lib.getExe cfg.obfs4Package} managed";
|
||||
}
|
||||
// lib.optionalAttrs (cfg.relay.role == "private-bridge") {
|
||||
ExtraInfoStatistics = false;
|
||||
@@ -1326,7 +1328,7 @@ in
|
||||
systemd.services.tor = {
|
||||
description = "Tor Daemon";
|
||||
documentation = [ "man:tor(8)" ];
|
||||
path = [ pkgs.tor ];
|
||||
path = [ cfg.package ];
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
@@ -1557,6 +1557,7 @@ in
|
||||
tor = runTest ./tor.nix;
|
||||
tpm-ek = handleTest ./tpm-ek { };
|
||||
tpm2 = runTest ./tpm2.nix;
|
||||
traccar = runTest ./traccar.nix;
|
||||
# tracee requires bpf
|
||||
tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { };
|
||||
traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix;
|
||||
|
||||
+1
-4
@@ -5,10 +5,7 @@ let
|
||||
in
|
||||
{
|
||||
name = "n8n";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
freezeboy
|
||||
k900
|
||||
];
|
||||
meta.maintainers = with lib.maintainers; [ k900 ];
|
||||
|
||||
node.pkgsReadOnly = false;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "plikd";
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ freezeboy ];
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
name = "traccar";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ frederictobiasc ];
|
||||
};
|
||||
nodes.machine = {
|
||||
services.traccar = {
|
||||
enable = true;
|
||||
settings.mail.smtp.host = "$SMTP_HOST";
|
||||
environmentFile = pkgs.writeText "traccar.env" ''
|
||||
SMTP_HOST=smtp.example.com
|
||||
'';
|
||||
};
|
||||
};
|
||||
testScript = ''
|
||||
machine.wait_for_unit("traccar.service")
|
||||
|
||||
# Check that environment variables were substituted
|
||||
t.assertIn("smtp.example.com", machine.succeed("cat /var/lib/traccar/config.xml"), "environment substitution failed")
|
||||
|
||||
machine.wait_for_open_port(8082)
|
||||
|
||||
# Check that we get the traccar login page
|
||||
t.assertIn("Traccar", machine.wait_until_succeeds("curl -sf http://localhost:8082/"), "Traccar frontend seems unreachable")
|
||||
|
||||
# Register the first admin user
|
||||
register_data = """
|
||||
{
|
||||
"email": "admin@example.com",
|
||||
"name": "admin",
|
||||
"password": "admin123"
|
||||
}
|
||||
"""
|
||||
|
||||
t.assertIn(
|
||||
"\"administrator\":true",
|
||||
machine.succeed(
|
||||
"curl -s -X POST "
|
||||
"-H 'Content-Type: application/json' "
|
||||
f"-d '{register_data}' "
|
||||
"http://localhost:8082/api/users"
|
||||
),
|
||||
"Unexpected registration response"
|
||||
)
|
||||
'';
|
||||
}
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "snes9x";
|
||||
version = "0-unstable-2025-10-16";
|
||||
version = "0-unstable-2025-11-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snes9xgit";
|
||||
repo = "snes9x";
|
||||
rev = "abfc018c90799eb55b773fc46d486167d8b3c762";
|
||||
hash = "sha256-7PXUGUfhieYz8rLDhfLq09AcJbEcTLC/peYYN/B07c4=";
|
||||
rev = "83ebd9d9d94521dde231beac0ad5ca253bd767f1";
|
||||
hash = "sha256-ZH6UnwtvtaTQLyFG4FyK+I1rjDibuA4lL2EuR8zGL0E=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -516,11 +516,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"hashicorp_azurerm": {
|
||||
"hash": "sha256-kFjvjaUDmiK3IfO/hioTTTkUetij4CSYJ359bxmpG40=",
|
||||
"hash": "sha256-U7KmukBPLrHyWgkM3yaRIoKtnXONDRxZGIaTFIKfvOk=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v4.51.0",
|
||||
"rev": "v4.52.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -202,7 +202,6 @@ buildGoModule (finalAttrs: {
|
||||
justinas
|
||||
sigma
|
||||
tomberek
|
||||
freezeboy
|
||||
techknowlogick
|
||||
juliusfreudenberger
|
||||
];
|
||||
|
||||
@@ -91,7 +91,7 @@ python3Packages.buildPythonApplication rec {
|
||||
changelog = "https://github.com/EnterpriseDB/barman/blob/${src.tag}/RELNOTES.md";
|
||||
mainProgram = "barman";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
https://datatracker.ietf.org/doc/html/rfc7932
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
pkgConfigModules = [
|
||||
"libbrotlidec"
|
||||
"libbrotlienc"
|
||||
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://colobot.info/";
|
||||
description = "Game data for colobot";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://colobot.info/";
|
||||
description = "Real-time strategy game with programmable bots";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "container";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-${finalAttrs.version}-installer-signed.pkg";
|
||||
hash = "sha256-YDh6bIWUc1muXqEqy0Z6gvLZHr3MQwgsuBHGVNY1ZDg=";
|
||||
hash = "sha256-RGL6a8EY+rOC5Er9zHfbMrYHQY4LyApOUPcFP1haOGY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,10 +21,7 @@ buildNpmPackage rec {
|
||||
description = "Commitizen command line utility";
|
||||
homepage = "https://commitizen.github.io/cz-cli";
|
||||
changelog = "https://github.com/commitizen/cz-cli/releases/tag/v${version}";
|
||||
maintainers = with lib.maintainers; [
|
||||
freezeboy
|
||||
natsukium
|
||||
];
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
description = "Live coding demos without Context Switching";
|
||||
homepage = "https://github.com/dgageot/demoit";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.freezeboy ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "demoit";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.83.0";
|
||||
version = "2.83.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WcD2q7Lnqmz8frFjZKAgN55Khgc1uVMzEbVBGoQc3Mc=";
|
||||
hash = "sha256-LBrWxlHPb9qG+IszymvqFqHFvvzveG4jZAkxivpbL5o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sLCqUqo/0qsLpHjH81tJ/M2LD0X/kr8hToDFgZ8/wP8=";
|
||||
|
||||
@@ -83,7 +83,6 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://gitlab.com/gitlab-org/cli";
|
||||
changelog = "https://gitlab.com/gitlab-org/cli/-/releases/v${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [
|
||||
freezeboy
|
||||
luftmensch-luftmensch
|
||||
anthonyroussel
|
||||
];
|
||||
|
||||
@@ -39,6 +39,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://www.iannix.org/";
|
||||
license = lib.licenses.lgpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lspmux";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "p2502";
|
||||
repo = "lspmux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-WNmejKA1wXbu7+cwxBu1tv0kUunt1LAcGP48fWon/b4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Um4BZ1QTHCilOslo/GR7cGvPCX1xNitf6WU8QaehAaE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Share one language server instance between multiple LSP clients to save resources";
|
||||
mainProgram = "lspmux";
|
||||
homepage = "https://codeberg.org/p2502/lspmux";
|
||||
license = with licenses; [ eupl12 ];
|
||||
maintainers = with maintainers; [ mrcjkb ];
|
||||
};
|
||||
})
|
||||
@@ -9,15 +9,15 @@
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "MelMatchEQ.lv2";
|
||||
version = "0.1";
|
||||
version = "0.1-unstable-2025-01-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brummer10";
|
||||
repo = "MelMatchEQ.lv2";
|
||||
rev = "v${version}";
|
||||
sha256 = "1s805jgb9msxfq9047s7pxrngizb00w8sm4z94iii80ba65rd20x";
|
||||
rev = "bee24593209d5c53fdafa62cb43aeeab6c5e880f";
|
||||
hash = "sha256-eceY79s1X0gv0SsC4jJsFh7tq3VxQhcY9/bfJqYUxmk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -30,11 +30,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/brummer10/MelMatchEQ.lv2";
|
||||
description = "Profiling EQ using a 26 step Mel Frequency Band";
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ magnetophon ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,10 +27,7 @@ appimageTools.wrapType2 {
|
||||
description = "French TV service";
|
||||
homepage = "https://www.molotov.tv/";
|
||||
license = with licenses; [ unfree ];
|
||||
maintainers = with maintainers; [
|
||||
apeyroux
|
||||
freezeboy
|
||||
];
|
||||
maintainers = with maintainers; [ apeyroux ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "molotov";
|
||||
};
|
||||
|
||||
@@ -24,7 +24,7 @@ buildNpmPackage rec {
|
||||
description = "Command-line collection runner for Postman";
|
||||
mainProgram = "newman";
|
||||
changelog = "https://github.com/postmanlabs/newman/releases/tag/v${version}";
|
||||
maintainers = with lib.maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
rustPlatform,
|
||||
rust-analyzer,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ra-multiplex";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pr2502";
|
||||
repo = "ra-multiplex";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aBrn9g+MGXLAsOmHqw1Tt6NPFGJTyYv/L9UI/vQU4i8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NVE/ROk6x1R0D5eyOzz1gYPvgG0lX5L2tCuZGIS9kzs=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ra-multiplex \
|
||||
--suffix PATH : ${lib.makeBinPath [ rust-analyzer ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multiplexer for rust-analyzer";
|
||||
mainProgram = "ra-multiplex";
|
||||
homepage = "https://github.com/pr2502/ra-multiplex";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ norfair ];
|
||||
};
|
||||
}
|
||||
@@ -7,12 +7,12 @@
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "25.2.10";
|
||||
version = "25.2.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kw/nQjIwNZGEfFRmBqNdXQPVadK0BQY3ha6S4E0Bc8A=";
|
||||
sha256 = "sha256-MOfQ/7aCbC5zdEB+hyIAgbRLfpSdSIjKigfUPTSqqr8=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
@@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
inherit doCheck src version;
|
||||
modRoot = "./src/go/rpk";
|
||||
runVend = false;
|
||||
vendorHash = "sha256-a3dEfu7bpjanOOWg3EMXpAOllrsEAFQhV86OMe0lP2o=";
|
||||
vendorHash = "sha256-N9RZ5qRbh8B0g+A3UUutOnAeob0eR2jO9kmrlADT0iQ=";
|
||||
|
||||
ldflags = [
|
||||
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://snap7.sourceforge.net/";
|
||||
description = "Step7 Open Source Ethernet Communication Suite";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'AM_PATH_XML2(2.6.0, [], AC_MSG_ERROR(Fatal error: Need libxml2 >= 2.6.0))' \
|
||||
'PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.6.0])' \
|
||||
--replace-fail 'XML_CPPFLAGS' 'XML_CFLAGS' \
|
||||
--replace-fail 'XML_CPPFLAGS' 'XML_CFLAGS'
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Darwin binutils don't support D option for ar
|
||||
|
||||
@@ -28,10 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/trunk-rs/trunk";
|
||||
description = "Build, bundle & ship your Rust WASM application to the web";
|
||||
mainProgram = "trunk";
|
||||
maintainers = with maintainers; [
|
||||
freezeboy
|
||||
ctron
|
||||
];
|
||||
maintainers = with maintainers; [ ctron ];
|
||||
license = with licenses; [ asl20 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
asciidoctor,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zzz";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jirutka";
|
||||
repo = "zzz";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gm/fzhgGM2kns051PKY223uesctvMj9LmLc4btUsTt8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace zzz.c --replace-fail \
|
||||
'setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", 1);' 'setenv("PATH", "/run/wrappers/bin:/run/current-system/sw/bin", 1);'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ asciidoctor ];
|
||||
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"sysconfdir=$(out)/etc"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Simple program to suspend or hibernate your computer";
|
||||
mainProgram = "zzz";
|
||||
homepage = "https://github.com/jirutka/zzz";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aanderse ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/accounts-sso/signond";
|
||||
description = "Signon Daemon for Qt";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,6 +34,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/mpcabd/python-arabic-reshaper";
|
||||
changelog = "https://github.com/mpcabd/python-arabic-reshaper/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,6 +30,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/click-contrib/click-help-colors";
|
||||
changelog = "https://github.com/click-contrib/click-help-colors/blob/${version}/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,30 +16,23 @@
|
||||
|
||||
# tests
|
||||
pyarrow,
|
||||
pytest-flake8,
|
||||
pytestCheckHook,
|
||||
scikit-image,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-image";
|
||||
version = "2024.5.3";
|
||||
version = "2025.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = "dask-image";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kXCAqJ2Zgo/2Khvo2YcK+n4oGM219GyQ2Hsq9re1Lac=";
|
||||
hash = "sha256-+nzYthnobcemunMcAWwRpHOQy6yFtjdib/7VZqWEiqc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dask_image/ndinterp/__init__.py \
|
||||
--replace-fail "out_bounds.ptp(axis=1)" "np.ptp(out_bounds, axis=1)"
|
||||
|
||||
substituteInPlace tests/test_dask_image/test_imread/test_core.py \
|
||||
--replace-fail "fh.save(" "fh.write("
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
@@ -55,6 +48,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pyarrow
|
||||
pytest-flake8
|
||||
pytestCheckHook
|
||||
scikit-image
|
||||
];
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
config,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -22,7 +23,7 @@
|
||||
click,
|
||||
einops,
|
||||
numpy,
|
||||
pynvml,
|
||||
nvidia-ml-py,
|
||||
tabulate,
|
||||
torch,
|
||||
tqdm,
|
||||
@@ -41,6 +42,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-e9PfLfU0DdoLKlXiHylCbGd125c7Iw9y4NDIOAP0xHs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# TODO: remove patch with update to v0.5.2+
|
||||
# Switch pynvml to nvidia-ml-py
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/flashinfer-ai/flashinfer/commit/a42f99255d68d1a54b689bd4985339c6b44963a6.patch?full_index=1";
|
||||
hash = "sha256-3XJFcdQeZ/c5fwiQvd95z4p9BzTn8pjle21WzeBxUgk=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -86,7 +96,7 @@ buildPythonPackage rec {
|
||||
click
|
||||
einops
|
||||
numpy
|
||||
pynvml
|
||||
nvidia-ml-py
|
||||
tabulate
|
||||
torch
|
||||
tqdm
|
||||
@@ -104,6 +114,9 @@ buildPythonPackage rec {
|
||||
scenarios.
|
||||
'';
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ breakds ];
|
||||
maintainers = with lib.maintainers; [
|
||||
breakds
|
||||
daniel-fahey
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -44,6 +44,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/googleapis/python-crc32c";
|
||||
changelog = "https://github.com/googleapis/python-crc32c/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ buildPythonPackage rec {
|
||||
description = "Wrapper around the DogStatsd client";
|
||||
homepage = "https://paperspace.com";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ buildPythonPackage rec {
|
||||
description = "Python utils and helpers library for Gradient";
|
||||
homepage = "https://github.com/Paperspace/gradient-utils";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -48,6 +48,6 @@ buildPythonPackage rec {
|
||||
homepage = "http://hyperopt.github.io/hyperopt/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -38,6 +38,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/rhgrant10/ndjson";
|
||||
changelog = "https://github.com/rhgrant10/ndjson/blob/v${version}/HISTORY.rst";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,6 +31,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/pywbem/nocasedict";
|
||||
changelog = "https://github.com/pywbem/nocasedict/blob/${version}/docs/changes.rst";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -37,6 +37,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/pywbem/nocaselist";
|
||||
changelog = "https://github.com/pywbem/nocaselist/blob/${version}/docs/changes.rst";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -35,6 +35,6 @@ buildPythonPackage rec {
|
||||
description = "Set of classes to help create extensions of Python in the C++ language";
|
||||
homepage = "https://sourceforge.net/projects/cxx/";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -42,6 +42,6 @@ buildPythonPackage rec {
|
||||
description = "Pure python implementation of the BiDi layout algorithm";
|
||||
mainProgram = "pybidi";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -41,6 +41,6 @@ buildPythonPackage rec {
|
||||
mainProgram = "snap7-server";
|
||||
homepage = "https://github.com/gijzelaerr/python-snap7";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,6 +23,6 @@ buildPythonPackage rec {
|
||||
description = "Sockjs server";
|
||||
homepage = "https://github.com/aio-libs/sockjs";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
uvicorn,
|
||||
pydantic,
|
||||
aioprometheus,
|
||||
pynvml,
|
||||
nvidia-ml-py,
|
||||
openai,
|
||||
pyzmq,
|
||||
tiktoken,
|
||||
@@ -314,6 +314,13 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove vendored pynvml entirely
|
||||
rm vllm/third_party/pynvml.py
|
||||
substituteInPlace tests/utils.py \
|
||||
--replace-fail "from vllm.third_party.pynvml import" "from pynvml import"
|
||||
substituteInPlace vllm/utils/__init__.py \
|
||||
--replace-fail "import vllm.third_party.pynvml" "import pynvml"
|
||||
|
||||
# pythonRelaxDeps does not cover build-system
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "torch ==" "torch >=" \
|
||||
@@ -442,7 +449,7 @@ buildPythonPackage rec {
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cupy
|
||||
pynvml
|
||||
nvidia-ml-py
|
||||
flashinfer
|
||||
];
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weaviate-client";
|
||||
version = "4.17.0";
|
||||
version = "4.18.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate-python-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4/8HDxS6PKnYt1LaMuXQtMeb4HNFjaagLfQ8xuyLXLo=";
|
||||
hash = "sha256-y4fUTZEQsQS3MrvZWM8QlQS+NeNAlXYz+THVFr8znPU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -49,9 +49,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/Phynix/yamlloader";
|
||||
changelog = "https://github.com/Phynix/yamlloader/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
freezeboy
|
||||
sarahec
|
||||
];
|
||||
maintainers = with lib.maintainers; [ sarahec ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Virtual camera driver for Linux";
|
||||
homepage = "https://github.com/webcamoid/akvcam";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Only;
|
||||
};
|
||||
|
||||
@@ -22,7 +22,7 @@ let
|
||||
meta = with lib; {
|
||||
homepage = "https://plik.root.gg/";
|
||||
description = "Scalable & friendly temporary file upload system";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
license = licenses.mit;
|
||||
mainProgram = "plik";
|
||||
};
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
|
||||
version = "2.23.0";
|
||||
version = "2.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = "timescaledb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wgRaWxGr48p8xMc+yOQEN196KAKyptMCk/UFKn23cos=";
|
||||
hash = "sha256-ltf26lCXXF909fewB+UvLrviK9CX5ZPmN0huPh0goOs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Free and open-source learning management system (LMS) written in PHP";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://moodle.org/";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1332,6 +1332,7 @@ mapAliases {
|
||||
quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
|
||||
quorum = throw "'quorum' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-07
|
||||
qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
|
||||
ra-multiplex = lib.warnOnInstantiate "'ra-multiplex' has been renamed to/replaced by 'lspmux'" lspmux; # Added 2025-10-27
|
||||
radicale3 = throw "'radicale3' has been renamed to/replaced by 'radicale'"; # Converted to throw 2025-10-27
|
||||
railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27
|
||||
rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27
|
||||
|
||||
Reference in New Issue
Block a user