Merge master into staging-nixos
This commit is contained in:
+29
-1
@@ -1,6 +1,27 @@
|
||||
{ runTest, pkgs, ... }:
|
||||
|
||||
let
|
||||
authKey = pkgs.writeText "auth-key" "1234ABCD";
|
||||
cfsslConfig = pkgs.writeText "config.json" (
|
||||
builtins.toJSON {
|
||||
# also see `cfssl print-defaults config`
|
||||
auth_keys = {
|
||||
my_key = {
|
||||
type = "standard";
|
||||
key = "file:${authKey}";
|
||||
};
|
||||
};
|
||||
signing = {
|
||||
default = {
|
||||
expiry = "168h";
|
||||
auth_key = "my_key";
|
||||
usages = [
|
||||
"digital signature"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
mkSpec =
|
||||
{
|
||||
host,
|
||||
@@ -18,6 +39,7 @@ let
|
||||
label = "www_ca";
|
||||
profile = "three-month";
|
||||
remote = "localhost:8888";
|
||||
auth_key_file = toString authKey;
|
||||
};
|
||||
certificate = {
|
||||
group = "nginx";
|
||||
@@ -75,7 +97,10 @@ let
|
||||
];
|
||||
networking.extraHosts = "127.0.0.1 imp.example.org decl.example.org";
|
||||
|
||||
services.cfssl.enable = true;
|
||||
services.cfssl = {
|
||||
enable = true;
|
||||
configFile = toString cfsslConfig;
|
||||
};
|
||||
systemd.services.cfssl.after = [
|
||||
"cfssl-init.service"
|
||||
"networking.target"
|
||||
@@ -90,6 +115,9 @@ let
|
||||
User = "cfssl";
|
||||
Type = "oneshot";
|
||||
WorkingDirectory = config.services.cfssl.dataDir;
|
||||
# matches systemd.services.cfssl to run setup transparently
|
||||
StateDirectory = baseNameOf config.services.cfssl.dataDir;
|
||||
StateDirectoryMode = 700;
|
||||
};
|
||||
script = ''
|
||||
${pkgs.cfssl}/bin/cfssl genkey -initca ${
|
||||
|
||||
@@ -84,7 +84,10 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://xournalpp.github.io/";
|
||||
changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
maintainers = with lib.maintainers; [
|
||||
sikmir
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "xournalpp";
|
||||
};
|
||||
|
||||
@@ -136,6 +136,7 @@ stdenv.mkDerivation {
|
||||
maintainers = with lib.maintainers; [
|
||||
robberer
|
||||
muscaln
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "Fritzing";
|
||||
|
||||
@@ -32,7 +32,10 @@ appimageTools.wrapType2 {
|
||||
changelog = "https://github.com/arduino/arduino-ide/releases/tag/${version}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "arduino-ide";
|
||||
maintainers = with lib.maintainers; [ clerie ];
|
||||
maintainers = with lib.maintainers; [
|
||||
clerie
|
||||
iedame
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -41,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "bloodspilot-client-sdl";
|
||||
homepage = "http://bloodspilot.sf.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
maintainers = with lib.maintainers; [
|
||||
raskin
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -28,7 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "xpilots";
|
||||
homepage = "http://bloodspilot.sf.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
maintainers = with lib.maintainers; [
|
||||
raskin
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "doxygen-awesome-css";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jothepro";
|
||||
repo = "doxygen-awesome-css";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nUp9uYW3p5laen+pRjwRnDvUA+PsGWtniTZ4ZE5Lg0w=";
|
||||
hash = "sha256-Q+1+Y8AsR3fZxYwewaBBKHIu0uwuYFZmUByHg17KZ9o=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@@ -32,7 +32,10 @@ appimageTools.wrapType2 {
|
||||
license = licenses.unfree; # no license listed
|
||||
mainProgram = "fflogs";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ keysmashes ];
|
||||
maintainers = with maintainers; [
|
||||
keysmashes
|
||||
iedame
|
||||
];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -89,6 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cc-by-sa-30
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -48,6 +48,7 @@ let
|
||||
maintainers = with maintainers; [
|
||||
sikmir
|
||||
soupglasses
|
||||
iedame
|
||||
];
|
||||
license = with licenses; [
|
||||
gpl3
|
||||
|
||||
@@ -25,6 +25,7 @@ let
|
||||
maintainers = with maintainers; [
|
||||
voidless
|
||||
sikmir
|
||||
iedame
|
||||
];
|
||||
license = licenses.geogebra;
|
||||
sourceProvenance = with sourceTypes; [
|
||||
|
||||
@@ -2,41 +2,20 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
installShellFiles,
|
||||
asciidoctor,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-gone";
|
||||
version = "1.2.5";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swsnr";
|
||||
repo = "git-gone";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4BhFombZCmv/GNG2OcNlWNKTk2h65yKn1ku734gCBCQ=";
|
||||
hash = "sha256-/8ujbZ7FQTZzTG4HnHg6v3rWhxt2PuSGwIJpBVTxhfM=";
|
||||
};
|
||||
|
||||
# remove if updating to rust 1.85
|
||||
postPatch = ''
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace-fail "[package]" ''$'cargo-features = ["edition2024"]\n[package]'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-VjnnrVN+uST99paImI1uNj34CNozid7ZiPslJqvmKCs=";
|
||||
|
||||
# remove if updating to rust 1.85
|
||||
env.RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
asciidoctor
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
asciidoctor --backend=manpage git-gone.1.adoc -o git-gone.1
|
||||
installManPage git-gone.1
|
||||
'';
|
||||
cargoHash = "sha256-93nZhZOtti28FetuOYtvh6LOtQJV+cEHbOkrJ+3m1m4=";
|
||||
|
||||
meta = {
|
||||
description = "Cleanup stale Git branches of merge requests";
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ladybird";
|
||||
version = "0-unstable-2025-09-19";
|
||||
version = "0-unstable-2025-10-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LadybirdBrowser";
|
||||
repo = "ladybird";
|
||||
rev = "5bd867f1dcb1f1b1c1397c4615ce7f091c8370aa";
|
||||
hash = "sha256-/SPWjgHiWgrLThgAxBt9gZVELH+rrJWkfhxnuKEIxd8=";
|
||||
rev = "62c00712faa2cd923f18feb3c72a1348aef51145";
|
||||
hash = "sha256-0sJeSCW5OkhjnQL/vKwi63xOfg63cPFN/jAVrH0Bk/A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -21,14 +21,14 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "libsignal-ffi";
|
||||
# must match the version used in mautrix-signal
|
||||
# see https://github.com/mautrix/signal/issues/401
|
||||
version = "0.80.3";
|
||||
version = "0.84.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8iJQ7MpsR0aaNHGUTFGIlLzKP+njsQK/XY/FyDpWu7c=";
|
||||
hash = "sha256-fTXiNgto1m6PlGQQuBUPaWkS5fHTVunCn3eGKjmQlHM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
||||
env.BORING_BSSL_PATH = "${boringssl-wrapper}";
|
||||
env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
|
||||
|
||||
cargoHash = "sha256-iKYkZ2iG825hTsB5vH110+uNRTsSocRXyXAVy3eTRJE=";
|
||||
cargoHash = "sha256-qnj9bVnnS76Sk9DfMprJn2xrc2G30yVXz3fTjjY3gnA=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -84,7 +84,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "City building game";
|
||||
mainProgram = "lincity-ng";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
maintainers = with lib.maintainers; [
|
||||
raskin
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
gettext,
|
||||
libX11,
|
||||
libXext,
|
||||
xorgproto,
|
||||
@@ -21,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-e0y9Ef/Uy+15oKrbJfKxw04lqCARgvuyWc4vRQ/lAV0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
|
||||
|
||||
buildInputs = [
|
||||
libICE
|
||||
libpng12
|
||||
@@ -66,6 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
sed -e 's@\[MPS_INFO_CHARS\]@[MPS_INFO_CHARS+8]@' -i mps.c -i mps.h
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
sed -i '/\#include \"malloc.h\"/d' readpng.c
|
||||
''}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -74,7 +81,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
homepage = "https://sourceforge.net/projects/lincity";
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
# ../lcintl.h:14:10: fatal error: 'libintl.h' file not found
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
glew,
|
||||
glfw,
|
||||
glm,
|
||||
gmp,
|
||||
kissfftFloat,
|
||||
libXau,
|
||||
libXdmcp,
|
||||
@@ -33,11 +34,12 @@
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
zlib,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
cef = cef-binary.overrideAttrs (oldAttrs: {
|
||||
version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/be0fc25e72203310f268221a132c5d765874b02c/CMakeLists.txt#L47
|
||||
version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/b39f12757908eda9f4c1039613b914606568bb84/CMakeLists.txt#L47
|
||||
__intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD
|
||||
gitRevision = "cbc1c5b";
|
||||
chromiumVersion = "135.0.7049.52";
|
||||
@@ -52,14 +54,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "linux-wallpaperengine";
|
||||
version = "0-unstable-2025-05-17";
|
||||
version = "0-unstable-2025-09-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Almamu";
|
||||
repo = "linux-wallpaperengine";
|
||||
rev = "be0fc25e72203310f268221a132c5d765874b02c";
|
||||
rev = "b39f12757908eda9f4c1039613b914606568bb84";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Wkxt6c5aSMJnQPx/n8MeNKLQ8YmdFilzhJ1wQooKprI=";
|
||||
hash = "sha256-Lm4BixK+PBCN/I+ecoYfoD96zS9UysEDOfponFy3SDU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -79,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
glew
|
||||
glfw
|
||||
glm
|
||||
gmp
|
||||
kissfftFloat
|
||||
libXau
|
||||
libXdmcp
|
||||
@@ -117,10 +120,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
meta = {
|
||||
description = "Wallpaper Engine backgrounds for Linux";
|
||||
homepage = "https://github.com/Almamu/linux-wallpaperengine";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "linux-wallpaperengine";
|
||||
maintainers = [ ];
|
||||
platforms = [
|
||||
|
||||
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Third person ninja rabbit fighting game";
|
||||
mainProgram = "lugaru";
|
||||
homepage = "https://osslugaru.gitlab.io";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
olm,
|
||||
libsignal-ffi,
|
||||
zlib,
|
||||
versionCheckHook,
|
||||
# This option enables the use of an experimental pure-Go implementation of
|
||||
# the Olm protocol instead of libolm for end-to-end encryption. Using goolm
|
||||
@@ -19,13 +20,14 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "0.8.7";
|
||||
version = "25.10";
|
||||
tag = "v0.2510.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "signal";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dzE6CncAja/6GoeYFuCcxRfd60ybNnCL9HzdMXyfh0k=";
|
||||
tag = tag;
|
||||
hash = "sha256-Bz4jBI/lLhCxZW7JmaX6dlVwbB3dLXn5v/8gMKcFKSE=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@@ -35,13 +37,19 @@ buildGoModule rec {
|
||||
# must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo
|
||||
# see https://github.com/mautrix/signal/issues/401
|
||||
libsignal-ffi
|
||||
zlib
|
||||
];
|
||||
|
||||
tags = lib.optional withGoolm "goolm";
|
||||
|
||||
CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];
|
||||
|
||||
vendorHash = "sha256-BYTAXhm7hjNa2DN/dcd77zOiDUGb7FC6y3I8FxwQvMI=";
|
||||
vendorHash = "sha256-Sur29i5ih7xK85maVAaq9cwWJVGtwS7hPOxQI4YduNI=";
|
||||
|
||||
ldflags = [
|
||||
"-X"
|
||||
"main.Tag=${tag}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
|
||||
@@ -14,27 +14,35 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.12.5";
|
||||
version = "25.10";
|
||||
tag = "v0.2510.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FywU4nT/EjEqiC+67FWi3Ni63NI8nqJka6bPdfq1c30=";
|
||||
tag = tag;
|
||||
hash = "sha256-jJIVlK4vTJpwjugKNtWZhO31t7YX+q3W+ZmU1w/itvM=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (!withGoolm) olm;
|
||||
tags = lib.optional withGoolm "goolm";
|
||||
|
||||
vendorHash = "sha256-LjlI5zqM1GS+7Sx1mqiwZHM4mPifX7MyLbqEckb90Jo=";
|
||||
vendorHash = "sha256-LvGapdyGYXNUsC0qniwdoA3pUrOivfFq+nEilw5xFNM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X"
|
||||
"main.Tag=${tag}"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tulir/mautrix-whatsapp";
|
||||
description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
|
||||
homepage = "https://github.com/mautrix/whatsapp";
|
||||
description = "Matrix-WhatsApp puppeting bridge";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
vskilet
|
||||
|
||||
@@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://khumba.net/projects/nvd";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "nvd";
|
||||
maintainers = with lib.maintainers; [ khumba ];
|
||||
maintainers = with lib.maintainers; [
|
||||
khumba
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.6.33";
|
||||
version = "0.6.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+dxE+rYqVzjuTgV/PYb9fOW0kE4o+uf+h1IB0b1SU1M=";
|
||||
hash = "sha256-crjBVR0ZXUYck4pyLNb1IO9IoQ6MFBnCKEBsi0/JXCI=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ztoLi386RTJXTxt8PjRQtrqY4y7clSOc7UbxdtoXFaI=";
|
||||
npmDepsHash = "sha256-ofw/leDcfrc+Bp93s9BkB3WFs8qQgiWUag7gvdPJdlo=";
|
||||
|
||||
# See https://github.com/open-webui/open-webui/issues/15880
|
||||
npmFlags = [
|
||||
|
||||
@@ -58,7 +58,10 @@ stdenv.mkDerivation {
|
||||
homepage = "https://gitlab.com/idevecore/pomodoro";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "pomodoro";
|
||||
maintainers = with lib.maintainers; [ aleksana ];
|
||||
maintainers = with lib.maintainers; [
|
||||
aleksana
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rerun";
|
||||
version = "0.25.1";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rerun-io";
|
||||
repo = "rerun";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YppVNVfVqOATLCoUvpeYYrhivKBb6f4G1JCG1Bl+cjc=";
|
||||
hash = "sha256-aJKrC8cDYHpOEUdzLKJP7t/hn/fOFz2aulz+8BsuXZk=";
|
||||
};
|
||||
|
||||
# The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
|
||||
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-jUn7b6t5hS7KjdymxTTP8mKLT671QgKrv7R9uiOkmJU=";
|
||||
cargoHash = "sha256-oRmOydykTPL8YwyFdD/OqDhHXlUnY5NJewfIQkdMaC4=";
|
||||
|
||||
cargoBuildFlags = [ "--package rerun-cli" ];
|
||||
cargoTestFlags = [ "--package rerun-cli" ];
|
||||
|
||||
@@ -172,6 +172,7 @@ stdenv.mkDerivation {
|
||||
maintainers = with lib.maintainers; [
|
||||
carloscraveiro
|
||||
tomasajt
|
||||
iedame
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "toot";
|
||||
version = "0.50.1";
|
||||
version = "0.51.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihabunek";
|
||||
repo = "toot";
|
||||
tag = version;
|
||||
hash = "sha256-qcxJeUDRYVFcyrvecG5xGy02O7otj1fg0HgBMuGS1d4=";
|
||||
hash = "sha256-A3ValIMDPcfrvOdOJIkeurT+fAj1TzGf6cy12yaaBQE=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3Packages; [ pytest ];
|
||||
|
||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Open-source Android/Desktop remake of Civ V";
|
||||
mainProgram = "unciv";
|
||||
homepage = "https://github.com/yairm210/Unciv";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.mpl20;
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -44,7 +44,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Multiplayer X11 space combat game";
|
||||
homepage = "http://xpilot.sf.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
maintainers = with lib.maintainers; [
|
||||
raskin
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -101,7 +101,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.208.4";
|
||||
version = "0.208.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-t8HSmvTaMtpJH0y21zpqP8vkG1rhYn/uXVccNaj9dcc=";
|
||||
hash = "sha256-6B0A6cMCTFGYRrAekTjHo667WcS9aTZbrjaGxKP6QfA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-0Ezuyvj0xSKFJtHB1kgUvyojcMV1RISOtutmlvWIZVM=";
|
||||
cargoHash = "sha256-wOhzHMh1nhWTpzzw7phOmhHMV4h7S+e+2SUkK4RK2b8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbxmpp";
|
||||
version = "6.3.0";
|
||||
version = "6.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "gajim";
|
||||
repo = "python-nbxmpp";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-s29d3SqmnFuqnr7B6u7N+kPKfccMlmTIoQGtjOe1ipg=";
|
||||
hash = "sha256-osT6arHZ+ac9NAfyVU/ArT78QCTfq3rPPmwdhvTMg14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
# tests
|
||||
datafusion,
|
||||
pytestCheckHook,
|
||||
tomli,
|
||||
torch,
|
||||
}:
|
||||
|
||||
@@ -67,6 +68,7 @@ buildPythonPackage {
|
||||
nativeCheckInputs = [
|
||||
datafusion
|
||||
pytestCheckHook
|
||||
tomli
|
||||
torch
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user