Merge master into staging-nixos
This commit is contained in:
@@ -142,6 +142,8 @@
|
||||
|
||||
- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.
|
||||
|
||||
- `carla` no longer support `gtk2` override.
|
||||
|
||||
- The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld.
|
||||
|
||||
- `pcp` has been removed because the upstream repo was archived and it hasn't been updated since 2021.
|
||||
|
||||
@@ -685,12 +685,6 @@
|
||||
githubId = 260983;
|
||||
name = "Adrien Lemaire";
|
||||
};
|
||||
AdsonCicilioti = {
|
||||
name = "Adson Cicilioti";
|
||||
email = "adson.cicilioti@live.com";
|
||||
github = "AdsonCicilioti";
|
||||
githubId = 6278398;
|
||||
};
|
||||
adsr = {
|
||||
email = "as@php.net";
|
||||
github = "adsr";
|
||||
|
||||
@@ -377,7 +377,7 @@ let
|
||||
|
||||
hashedPasswordFile = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = cfg.users.${name}.passwordFile;
|
||||
default = config.passwordFile;
|
||||
defaultText = literalExpression "null";
|
||||
description = ''
|
||||
The full path to a file that contains the hash of the user's
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
alsa-lib,
|
||||
file,
|
||||
fluidsynth,
|
||||
@@ -13,11 +12,9 @@
|
||||
pkg-config,
|
||||
python3Packages,
|
||||
which,
|
||||
gtk2 ? null,
|
||||
gtk3 ? null,
|
||||
qtbase ? null,
|
||||
withFrontend ? true,
|
||||
withGtk2 ? true,
|
||||
withGtk3 ? true,
|
||||
withQt ? true,
|
||||
wrapQtAppsHook ? null,
|
||||
@@ -62,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libsndfile
|
||||
]
|
||||
++ lib.optional withQt qtbase
|
||||
++ lib.optional withGtk2 gtk2
|
||||
++ lib.optional withGtk3 gtk3;
|
||||
|
||||
propagatedBuildInputs = finalAttrs.pythonPath;
|
||||
@@ -77,11 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
filename="$(basename -- "$file")"
|
||||
substituteInPlace "$file" --replace-fail '--with-appname="$0"' "--with-appname=\"$filename\""
|
||||
done
|
||||
''
|
||||
+ lib.optionalString withGtk2 ''
|
||||
# Will try to dlopen() libgtk-x11-2.0 at runtime when using the bridge.
|
||||
substituteInPlace source/bridges-ui/Makefile \
|
||||
--replace-fail '$(CXX) $(OBJS_GTK2)' '$(CXX) $(OBJS_GTK2) -lgtk-x11-2.0'
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.0.17";
|
||||
hash = "sha256-8R0BvDfQDJmWD038mywNVIYtmgzyzwSEbqnCHQBpjg8=";
|
||||
version = "2.0.22";
|
||||
hash = "sha256-ystT5nHh0ivpFLwhHr6Uw5PyubkdY/kWm841wzIfyJ4=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,105 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
ocamlPackages,
|
||||
gnome2,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
glib,
|
||||
libtool,
|
||||
libpng,
|
||||
bison,
|
||||
expat,
|
||||
fontconfig,
|
||||
gd,
|
||||
pango,
|
||||
libjpeg,
|
||||
libwebp,
|
||||
libX11,
|
||||
libXaw,
|
||||
}:
|
||||
# We need an old version of Graphviz for format compatibility reasons.
|
||||
# This version is vulnerable, but monotone-viz will never feed it bad input.
|
||||
let
|
||||
graphviz_2_0 = import ./graphviz-2.0.nix {
|
||||
inherit
|
||||
lib
|
||||
stdenv
|
||||
fetchurl
|
||||
pkg-config
|
||||
libX11
|
||||
libpng
|
||||
libjpeg
|
||||
expat
|
||||
libXaw
|
||||
bison
|
||||
libtool
|
||||
fontconfig
|
||||
pango
|
||||
gd
|
||||
libwebp
|
||||
;
|
||||
};
|
||||
in
|
||||
let
|
||||
inherit (gnome2) libgnomecanvas;
|
||||
in
|
||||
let
|
||||
inherit (ocamlPackages) ocaml lablgtk camlp4;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.2";
|
||||
pname = "monotone-viz";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
ocaml
|
||||
camlp4
|
||||
];
|
||||
buildInputs = [
|
||||
lablgtk
|
||||
libgnomecanvas
|
||||
glib
|
||||
graphviz_2_0
|
||||
];
|
||||
src = fetchurl {
|
||||
url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
|
||||
sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
|
||||
};
|
||||
|
||||
prePatch = "ln -s . a; ln -s . b";
|
||||
patchFlags = [ "-p0" ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/monotone-viz/raw/c9f4c1bebe01bb471df05d8a37ca4b6d630574ec/f/monotone-viz-1.0.2-dot.patch";
|
||||
hash = "sha256-e348703+IzM4m/3cpe6Z9VebZgTK8+3lRLdaTfXHwSI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/monotone-viz/raw/c9f4c1bebe01bb471df05d8a37ca4b6d630574ec/f/monotone-viz-1.0.2-new-stdio.patch";
|
||||
hash = "sha256-9xQzJ+oYz06fDFOe1YOOisEZnwiwShqr2Rt7IXiu6Zo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/monotone-viz/raw/c9f4c1bebe01bb471df05d8a37ca4b6d630574ec/f/monotone-viz-1.0.2-typefix.patch";
|
||||
hash = "sha256-52VGXDJKx4ZGvZRO8QCXdTGsWR0m1pqQnEOby7PMQdg=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
appendToVar configureFlags "--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/monotone-viz" --prefix PATH : "${graphviz_2_0}/bin/"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Monotone ancestry visualiser";
|
||||
mainProgram = "monotone-viz";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
libX11,
|
||||
libpng,
|
||||
libjpeg,
|
||||
expat,
|
||||
libXaw,
|
||||
bison,
|
||||
libtool,
|
||||
fontconfig,
|
||||
pango,
|
||||
gd,
|
||||
libwebp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphviz";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-${version}.tar.gz";
|
||||
sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libX11
|
||||
libpng
|
||||
libjpeg
|
||||
expat
|
||||
libXaw
|
||||
bison
|
||||
libtool
|
||||
fontconfig
|
||||
pango
|
||||
gd
|
||||
libwebp
|
||||
];
|
||||
|
||||
hardeningDisable = [
|
||||
"format"
|
||||
"fortify"
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-pngincludedir=${libpng.dev}/include"
|
||||
"--with-pnglibdir=${libpng.out}/lib"
|
||||
"--with-jpegincludedir=${libjpeg.dev}/include"
|
||||
"--with-jpeglibdir=${libjpeg.out}/lib"
|
||||
"--with-expatincludedir=${expat.dev}/include"
|
||||
"--with-expatlibdir=${expat.out}/lib"
|
||||
"--with-ltdl-include=${libtool}/include"
|
||||
"--with-ltdl-lib=${libtool.lib}/lib"
|
||||
]
|
||||
++ lib.optional (libX11 == null) "--without-x";
|
||||
|
||||
meta = {
|
||||
description = "Program for visualising graphs";
|
||||
homepage = "http://www.graphviz.org/";
|
||||
branch = "2.0";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -17,13 +17,13 @@ in
|
||||
buildKodiAddon rec {
|
||||
pname = "jellyfin";
|
||||
namespace = "plugin.video.jellyfin";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-kodi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5CJenvNmyNwrlNfF4jPap99oj21T96TeExbod8+KKTA=";
|
||||
sha256 = "sha256-Pi8q64VykEfyIm9VlNOkWFeEhEhl7D6KLnNLpVsY+iU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python ];
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
let
|
||||
pname = "altus";
|
||||
version = "5.7.1";
|
||||
version = "5.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
name = "altus-${version}.AppImage";
|
||||
url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage";
|
||||
hash = "sha256-G0jKBnobMKJWZmLtyYLpdruNxEVGt5rZHPFJYJkY8Y4=";
|
||||
hash = "sha256-sB4ONFLTNN2Dd3LIVtpXIGTyHDFcXako7nlKxzNEOtA=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -80,6 +80,21 @@ stdenv.mkDerivation rec {
|
||||
stripLen = 1;
|
||||
}
|
||||
} avidemux_core/ffmpeg_package/patches/
|
||||
|
||||
# Those CMake versions are deprecated and is no longer supported by CMake > 4
|
||||
# https://github.com/NixOS/nixpkgs/issues/445447
|
||||
substituteInPlace {avidemux_plugins,avidemux_core,avidemux/{cli,qt4}}/CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.0)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace avidemux/gtk/CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.6)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace avidemux/qt4/xdg_data/CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.8.11)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace addons/fontGen/CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.8)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -64,7 +64,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
rawkode
|
||||
AdsonCicilioti
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -84,6 +84,8 @@ stdenv.mkDerivation rec {
|
||||
install -Dm0755 build/mobical "$out/bin/mobical"
|
||||
install -Dm0644 src/ccadical.h "$dev/include/ccadical.h"
|
||||
install -Dm0644 src/cadical.hpp "$dev/include/cadical.hpp"
|
||||
install -Dm0644 src/cadical.hpp "$dev/include/cadical/cadical.hpp"
|
||||
install -Dm0644 src/tracer.hpp "$dev/include/cadical/tracer.hpp"
|
||||
install -Dm0644 build/libcadical.a "$lib/lib/libcadical.a"
|
||||
mkdir -p "$out/share/doc/${pname}/"
|
||||
install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}/"
|
||||
|
||||
@@ -21,6 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/COMMAND git describe.*\(>>.*\)/COMMAND echo ${finalAttrs.src.rev} \1/' canokey-core/CMakeLists.txt
|
||||
|
||||
# CMake 2.8.12 is deprecated and is no longer supported by CMake > 4
|
||||
# https://github.com/NixOS/nixpkgs/issues/445447
|
||||
substituteInPlace canokey-core/canokey-crypto/mbedtls/CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.8.12)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -31,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=incompatible-pointer-types"
|
||||
(lib.optionalString stdenv.cc.isClang "-Wno-error=documentation")
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.15",
|
||||
"version": "2.0.22",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.15",
|
||||
"version": "2.0.22",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.17";
|
||||
version = "2.0.22";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-uQ+iosjjs6dUT8MtnFwubJqp85pBtBYkmIXTlRGufQw=";
|
||||
hash = "sha256-SDXYXEb7Vi150Hx04y9kd+Owzu11VSqVRgej36P2khU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-g03tfNJjx/KIUu14/mqranKR4G8mo9ig74iRgCdiJuE=";
|
||||
npmDepsHash = "sha256-kphPXek1YoEs4yvikOYg/CmkKuq1rMUJC6Rkrhydkxo=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell --pure -i bash --packages nodejs nix-update git
|
||||
#!nix-shell --pure --keep NIX_PATH -i bash --packages nodejs nix-update git
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
|
||||
@@ -28,6 +28,14 @@ stdenvForCppNetlib.mkDerivation rec {
|
||||
./0001-Compatibility-with-boost-1.83.patch
|
||||
];
|
||||
|
||||
# CMake 2.8 is deprecated and is no longer supported by CMake > 4
|
||||
# https://github.com/NixOS/nixpkgs/issues/445447
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.8)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
# io_service.hpp has been removed in boost 1.87+
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cvc5";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc5";
|
||||
repo = "cvc5";
|
||||
rev = "cvc5-${version}";
|
||||
hash = "sha256-w8rIGPG9BTEPV9HG2U40A4DYYnC6HaWbzqDKCRhaT00=";
|
||||
tag = "cvc5-${version}";
|
||||
hash = "sha256-nxJjrpWZfYPuuKN4CWxOHEuou4r+MdK0AjdEPZHZbHI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "gh-gei";
|
||||
version = "1.18.1";
|
||||
version = "1.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "gh-gei";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZMFom0irZa63Nzx7wViinmN6yRfiHxQFprJdIx1Ak2Y=";
|
||||
hash = "sha256-3c9wrBm7sKrQaNhAe5uwGEEXQEfSLHBJJ/XFC2pc12Q=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;
|
||||
|
||||
@@ -161,6 +161,8 @@ stdenv.mkDerivation rec {
|
||||
installCheckPhase = ''
|
||||
# Avoid trying to write logs to homeless-shelter
|
||||
export HOME=$(mktemp -d)
|
||||
# Prevent Python from writing bytecode to ensure build determinism
|
||||
export PYTHONDONTWRITEBYTECODE=1
|
||||
$out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
|
||||
$out/bin/gsutil version | grep -w "$(cat platform/gsutil/VERSION)"
|
||||
'';
|
||||
|
||||
@@ -81,6 +81,8 @@ symlinkJoin {
|
||||
postBuild = ''
|
||||
sed -i ';' $out/google-cloud-sdk/bin/.gcloud-wrapped
|
||||
sed -i -e "s#${google-cloud-sdk}#$out#" "$out/google-cloud-sdk/bin/gcloud"
|
||||
# Prevent Python from writing bytecode to ensure build determinism
|
||||
export PYTHONDONTWRITEBYTECODE=1
|
||||
${installCheck}
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nats-streaming-server";
|
||||
version = "0.25.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "nats-io";
|
||||
repo = "nats-streaming-server";
|
||||
sha256 = "sha256-i5fNxeJQXiyy+9NOGT1X68u9Pztxvnnba64rxIgjbZc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r6RDHGAt83sKyMHvG3927rZroWdnTQFb8zTrmlc0W5U=";
|
||||
|
||||
# tests fail and ask to `go install`
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "NATS Streaming System Server";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.swdunlop ];
|
||||
homepage = "https://nats.io/";
|
||||
mainProgram = "nats-streaming-server";
|
||||
};
|
||||
}
|
||||
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# CMake 3.0 is deprecated and is no longer supported by CMake > 4
|
||||
# inline of https://github.com/google/nsync/pull/27
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 2.8.12)" \
|
||||
"cmake_minimum_required (VERSION 3.10)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# Needed for case-insensitive filesystems like on macOS
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2025-10-05";
|
||||
version = "0-unstable-2025-10-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "cdc782ce0836f3d5566fafb93cb43cbae21b3f58";
|
||||
hash = "sha256-uXa78bFhCYkMCOTdNnQJLu7Yz3do+hZBUG3TIZWv544=";
|
||||
rev = "f85802feeaa5f414184398b38e9916cfd5a2e25c";
|
||||
hash = "sha256-JlG7TpLICeRrTl+4MVe9UUF4nezeHiKcE+C8pwsca4M=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
zlib,
|
||||
ncurses,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "somatic-sniper";
|
||||
version = "1.0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "genome";
|
||||
repo = "somatic-sniper";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lk7p9sp6mp50f6w1nppqhr40fcwy1asw06ivw8w8jvvnwaqf987";
|
||||
};
|
||||
|
||||
patches = [ ./somatic-sniper.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
zlib
|
||||
ncurses
|
||||
];
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Identify single nucleotide positions that are different between tumor and normal";
|
||||
mainProgram = "bam-somaticsniper";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/genome/somatic-sniper";
|
||||
maintainers = with maintainers; [ jbedo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 6d5a180..7254292 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH
|
||||
)
|
||||
|
||||
include(TestHelper)
|
||||
-include(VersionHelper)
|
||||
+#include(VersionHelper)
|
||||
include(ProjectHelper)
|
||||
|
||||
# NOTE: for sniper we want the exe suffix to be like 0.7.4, not just 0.7
|
||||
diff --git a/vendor/samtools.patch b/vendor/samtools.patch
|
||||
index f173017..654f878 100644
|
||||
--- a/vendor/samtools.patch
|
||||
+++ b/vendor/samtools.patch
|
||||
@@ -6,7 +6,7 @@ diff -Nuar a/Makefile b/Makefile
|
||||
|
||||
samtools:lib $(AOBJS)
|
||||
- $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -lz -L. -lbam
|
||||
-+ $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -L. -lbam -lz
|
||||
++ $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lncurses -L. -lbam -lz
|
||||
|
||||
razip:razip.o razf.o
|
||||
$(CC) $(CFLAGS) -o $@ razf.o razip.o -lz
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svd2rust";
|
||||
version = "0.37.0";
|
||||
version = "0.37.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-42Yz6BGmT5EcS3N5x6aHyvnfpnYqicje2rtPx3z+Bu0=";
|
||||
hash = "sha256-50g5YVmVYTLYJdaWXk91OYdlghDchkyHXS9j2Z7IXSw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pSZrLhEZwbnbjiIHmU5bcpHOEcodgD1mVgO6oI7zTG4=";
|
||||
cargoHash = "sha256-poP1az7Hv/qPrTUvqHbd7aylJrI9LGBMu88g+pFmXF4=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sydbox";
|
||||
version = "3.39.1";
|
||||
version = "3.40.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Sydbox";
|
||||
repo = "sydbox";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LJHZb4TGo+Lep7yiej2G1H6mXAoEk5ixn/lGDxAWqvg=";
|
||||
hash = "sha256-hO17Rm4gOSCVlmVZTZdJ2qh9pzdrl8Ay9uU6w7V4RPo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mUeJ3A2HW2pXWXW3Abb+aqTaZjVrchYJNCJCDC2Em9s=";
|
||||
cargoHash = "sha256-y6FvIH3+daDsYP18BpsoYKsshvpVcSU7s/tjPdnudtY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandoc
|
||||
|
||||
@@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ AdsonCicilioti ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "annotatedyaml";
|
||||
version = "1.0.0";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "annotatedyaml";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bVXhKm69A5FIXYY2yq7jXPIK7lSCQD20a3oX1GdqOLY=";
|
||||
hash = "sha256-+4H3StCZ58TDV6LSXyeC6+Vn56W19+bIO4AdsJEfHI0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
pyopenssl,
|
||||
pytest-asyncio_0_21,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
@@ -56,7 +56,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio_0_21
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
];
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ buildPythonPackage rec {
|
||||
.png files. clickgen is using anicursorgen and xcursorgen under the hood.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AdsonCicilioti ];
|
||||
maintainers = [ ];
|
||||
# fails with:
|
||||
# ld: unknown option: -zdefs
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "robotframework-seleniumlibrary";
|
||||
version = "6.7.1";
|
||||
version = "6.8.0";
|
||||
pyproject = true;
|
||||
|
||||
# no tests included in PyPI tarball
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "robotframework";
|
||||
repo = "SeleniumLibrary";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pKAOVycckUCe93wMk9kql1lY6WeUTiS4lk/skDAfKCY=";
|
||||
hash = "sha256-TyYlcmoV5q3mfV4II/7P/SApfSNd3yC1EFYcuHllcyQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
grafanaPlugin {
|
||||
pname = "grafana-exploretraces-app";
|
||||
version = "1.1.3";
|
||||
zipHash = "sha256-0i9ndLOUXisJJk2sV0Xt0NC8KNn2k5/cIRS/G0jS8Ks=";
|
||||
version = "1.2.0";
|
||||
zipHash = "sha256-QXBOODMgFJvPLgr1Gr6mkpW2YJwYlDO/ZXL3BlEhEJ0=";
|
||||
meta = with lib; {
|
||||
description = "Opinionated traces app";
|
||||
license = licenses.agpl3Only;
|
||||
|
||||
@@ -1781,6 +1781,7 @@ mapAliases {
|
||||
mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11
|
||||
mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01
|
||||
mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23
|
||||
monotoneViz = throw "monotoneViz was removed because it relies on a broken version of graphviz"; # added 2025-10-19
|
||||
moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
|
||||
moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30
|
||||
morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26
|
||||
@@ -1816,6 +1817,7 @@ mapAliases {
|
||||
namazu = throw "namazu has been removed, as it was broken"; # Added 2025-08-25
|
||||
nanoblogger = throw "nanoblogger has been removed as upstream stopped developement in 2013"; # Added 2025-09-10
|
||||
nasc = throw "'nasc' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
|
||||
nats-streaming-server = throw "'nats-streaming-server' has been removed as critical bug fixes and security fixes will no longer be performed as of June of 2023"; # added 2025-10-13
|
||||
ncdu_2 = ncdu; # Added 2022-07-22
|
||||
neardal = throw "neardal has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
|
||||
neocities-cli = neocities; # Added 2024-07-31
|
||||
@@ -2423,6 +2425,7 @@ mapAliases {
|
||||
snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
|
||||
snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
|
||||
soldat-unstable = opensoldat; # Added 2022-07-02
|
||||
somatic-sniper = throw "somatic-sniper has been removed as it was archived in 2020 and fails to build."; # Added 2025-10-14
|
||||
soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07
|
||||
soundkonverter = throw "'soundkonverter' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
|
||||
soundOfSorting = sound-of-sorting; # Added 2023-07-07
|
||||
|
||||
@@ -11876,10 +11876,6 @@ with pkgs;
|
||||
lua = lua5;
|
||||
};
|
||||
|
||||
monotoneViz = callPackage ../applications/version-management/monotone-viz {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
|
||||
};
|
||||
|
||||
moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
|
||||
|
||||
mopidyPackages =
|
||||
|
||||
@@ -14450,16 +14450,6 @@ self: super: with self; {
|
||||
|
||||
pytest-asyncio_0 = callPackage ../development/python-modules/pytest-asyncio/0.nix { };
|
||||
|
||||
pytest-asyncio_0_21 = pytest-asyncio.overridePythonAttrs (old: rec {
|
||||
version = "0.21.2";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "pytest-dev";
|
||||
repo = "pytest-asyncio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AVVvdo/CDF9IU6l779sLc7wKz5h3kzMttdDNTPLYxtQ=";
|
||||
};
|
||||
});
|
||||
|
||||
pytest-base-url = callPackage ../development/python-modules/pytest-base-url { };
|
||||
|
||||
pytest-bdd = callPackage ../development/python-modules/pytest-bdd { };
|
||||
|
||||
Reference in New Issue
Block a user