Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-12-10 00:02:18 +00:00 committed by GitHub
commit b5ff56aec7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 1422 additions and 2941 deletions

View file

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
patchPhase = ''
sed -i 's@/usr/@$(out)/@g' Makefile
substituteInPlace Makefile \
--replace /tmp/test.wav $NIX_BUILD_TOP/${sourceRoot}/test.wav
'';
makeFlags = [

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "vgmstream";
version = "1879";
version = "1896";
src = fetchFromGitHub {
owner = "vgmstream";
repo = "vgmstream";
rev = "refs/tags/r${version}";
sha256 = "sha256-m7M9oIEym/jzuw2HAbjdF6fZsfTew1KK0g1D4SePiiE=";
sha256 = "sha256-1BWJgV631MxxzdUtK8f+XRb9cqfhjlwN2LgWI0VmIHE=";
};
passthru.updateScript = nix-update-script {

View file

@ -1,67 +0,0 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, pkg-config
, boost, openssl, unbound
, pcsclite, readline, libsodium, hidapi
, rapidjson
, curl, sqlite
, trezorSupport ? true
, libusb1
, protobuf
, python3
}:
stdenv.mkDerivation rec {
pname = "oxen";
version = "9.1.3";
src = fetchFromGitHub {
owner = "oxen-io";
repo = "oxen-core";
rev = "v${version}";
sha256 = "11g3wqn0syk47yfcsdql5737kpad8skwdxhifn2yaz9zy8n3xqqb";
fetchSubmodules = true;
};
# Required for static linking, the only supported install path
lbzmqsrc = fetchurl {
url = "https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz";
hash = "sha512-TBjXhAhRecWx/LdTqTgTCVoSyNNJcPLhv8pkmb5snWd2nHHGi3ylT/GBsgOQBDFw6Jczwi92/x6kZJSBT3CVsQ==";
};
postPatch = ''
# remove vendored libraries
rm -r external/rapidjson
sed -i s,/lib/,/lib64/, external/loki-mq/cmake/local-libzmq//LocalLibzmq.cmake
'';
postInstall = ''
rm -R $out/lib $out/include
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
boost openssl unbound
pcsclite readline
libsodium hidapi rapidjson
protobuf curl sqlite
] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ];
cmakeFlags = [
# "-DUSE_DEVICE_TREZOR=ON"
# "-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
# It build with shared libs but doesn't install them. Fail.
# "-DBUILD_SHARED_LIBS=ON"
"-DLIBZMQ_TARBALL_URL=${lbzmqsrc}"
] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
meta = with lib; {
description = "Private cryptocurrency based on Monero";
homepage = "https://oxen.io/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.viric ];
# Fails to build on gcc-10 due to boost being built with gcc-12.
broken = true;
};
}

View file

@ -20,13 +20,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "setzer";
version = "62";
version = "63";
src = fetchFromGitHub {
owner = "cvfosammmm";
repo = "Setzer";
rev = "v${version}";
hash = "sha256-CynYWzFnsr5FoNwBlK4k8c+EE22NP0OrpEFrSiEtxUU=";
hash = "sha256-/DAd3Neypx/H9mPVC9VkvpdQhLRNIBoR8GXxuIdJF0Y=";
};
format = "other";

View file

@ -2749,8 +2749,8 @@ let
publisher = "nvarner";
# Please update the corresponding binary (typst-lsp) when updating
# this extension.
version = "0.11.0";
sha256 = "sha256-fs+CBg3FwzTn608dm9EvfF2UrI2Sa5hsm0OK/WQyy6o=";
version = "0.12.0";
sha256 = "sha256-5DwpgDstKJXo9jEWORXKr3B6Hnd/YOktiaJL2RFWCSA=";
};
nativeBuildInputs = [ jq moreutils ];

View file

@ -1,10 +1,10 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake
{ stdenv, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake
, qtbase, qtxmlpatterns, qttools, qtwebengine, libGL, fontconfig, openssl, poppler, wrapQtAppsHook
, ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg
, libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }:
let
importer = stdenv.mkDerivation rec {
importer = stdenv.mkDerivation {
pname = "openboard-importer";
version = "unstable-2016-10-08";
@ -23,15 +23,15 @@ let
install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter
'';
};
in stdenv.mkDerivation {
in stdenv.mkDerivation (finalAttrs: {
pname = "openboard";
version = "unstable-2022-11-28";
version = "1.7.0";
src = fetchFromGitHub {
owner = "OpenBoard-org";
repo = "OpenBoard";
rev = "9de37af2df1a7c0d88f71c94ab2db1815d082862";
sha256 = "sha256-TiKrSyxtF1g1bepCoFxoxGOdREXhsMrS3g8uZKSiugg=";
rev = "v${finalAttrs.version}";
hash = "sha256-OSAogtZoMisyRziv63ag9w8HQaaRdz0J28jQZR7cTMM=";
};
postPatch = ''
@ -115,4 +115,4 @@ in stdenv.mkDerivation {
maintainers = with maintainers; [ fufexan ];
platforms = platforms.linux;
};
}
})

View file

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "girara";
version = "0.4.0";
version = "0.4.1";
outputs = [ "out" "dev" ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "pwmt";
repo = "girara";
rev = version;
sha256 = "sha256-dzWdiFGJ45JcH+wNwq2P3NZeWwHXAvXR1eJC85mYy7M=";
sha256 = "sha256-47ff7NBunVvYlCEQN/LwTRG33aButisVvdwxlh28LUM=";
};
nativeBuildInputs = [

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.120.4";
version = "0.121.1";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-eBDlX+3Gb4bWRJ0ITwlx1c3q1RCFK2tyuKn9SALHbhI=";
hash = "sha256-XNOp0k2t5Tv4HKKz3ZqL/sAdiYedOACaZ/1T7t7/Q1A=";
};
vendorHash = "sha256-kUKnoUQzLbi0ssxvK2viNTHLtqx8vaHLYXO8ZWU2rmw=";
vendorHash = "sha256-J/me67pC+YWjGIQP6q1c+vsSXFxXoLZV7AyDv3+606k=";
doCheck = false;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tippecanoe";
version = "2.35.0";
version = "2.37.1";
src = fetchFromGitHub {
owner = "felt";
repo = "tippecanoe";
rev = finalAttrs.version;
hash = "sha256-l19p/Ql1gaNJpmDH46jwLgUUmJ5YTYRQi6DdayAd84Q=";
hash = "sha256-BS9QBNLAg1VB290Mu0/V3oYLH/XfGcvZp5dVg4WQGck=";
};
buildInputs = [ sqlite zlib ];

View file

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "kaniko";
version = "1.18.0";
version = "1.19.0";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "kaniko";
rev = "v${version}";
hash = "sha256-EMBCJc9x4oduFSHMYajc/Pf8nHwRP7qMsvJUbnDkjdk=";
hash = "sha256-XtEI+DJMbBRcvBqsbVCDhVZiXNKqNvmQAmTSLmWB5o4=";
};
vendorHash = null;

View file

@ -9,14 +9,14 @@
}:
buildGoModule rec {
pname = "openshift";
version = "4.13.0";
gitCommit = "e561d37";
version = "4.14.0";
gitCommit = "0c63f9d";
src = fetchFromGitHub {
owner = "openshift";
repo = "oc";
rev = "e561d37285c8bde273ce00d086bea599a9cdd3be";
hash = "sha256-/ar96N+MSy0DPdza3UWiyolg1EZPBR6LCku4GV+HppM=";
rev = "0c63f9da2694c080257111616c60005f32a5bf47";
hash = "sha256-viNSRwGNB0TGgw501cQuj4ajmAgvqk4vj2RmW8/DCB8=";
};
vendorHash = null;
@ -62,6 +62,5 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ offline bachp moretea stehessel ];
mainProgram = "oc";
platforms = platforms.unix;
};
}

View file

@ -56,11 +56,11 @@
stdenv.mkDerivation rec {
pname = "webex";
version = "43.8.0.26955";
version = "43.11.0.27795";
src = fetchurl {
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230814223338/Webex_ubuntu.7z";
sha256 = "6c754d65fffbcbbb2ca303e1f8c1e5688da190eea3d3b67c77361abc6e2bb85b";
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20231108131957/Webex_ubuntu.7z";
sha256 = "e7a30481840a4a56c7ac38fa9efb487c722758ad9ac875432e86232d6a8e6466";
};
nativeBuildInputs = [

View file

@ -6,25 +6,24 @@
}:
stdenv.mkDerivation rec {
version = "20230517";
version = "20231103";
pname = "neomutt";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = version;
sha256 = "sha256-1i0STaJulJP0LWdNfLLIEKVapfkcguYRnbc+psWlVE4=";
sha256 = "sha256-9/XYgQjOdIwDpoJz5kNmiRBdoSod9l7Yl0u4e20KDPw=";
};
patches = [
# https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144
./fix-open-very-large-mailbox.patch
# https://github.com/neomutt/neomutt/issues/4128
(fetchpatch {
# https://github.com/neomutt/neomutt/pull/3933
name = "disable-incorrect-tests.patch";
url = "https://github.com/neomutt/neomutt/compare/f624551b86cdb53224b5b48304a808ca2815111e...a9a1d99e6c0fdf367188125451300fa89d3e801a.patch";
hash = "sha256-Plei063T8XyXF4/7/nAb6/4OyXz72vBAXHwls9WL1vM=";
excludes = [".github/workflows/macos.yml"];
name = "fix-attr-color-copy.patch";
url = "https://github.com/neomutt/neomutt/commit/24f8644c28e602206a63fae53c4eb3d32426ce0c.patch";
hash = "sha256-8qcW9hb6yxEZICRYgl6ZhPQDrI6nZN9NH+40GhTgR0o=";
})
];

View file

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
pname = "homebank";
version = "5.7.2";
version = "5.7.3";
src = fetchurl {
url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
hash = "sha256-Mx1++I2Q8/NMpmEPfxjonpNUQ7GLCRqH2blL11Vjme8=";
hash = "sha256-ad8XKlmazWZim/mLNmnsFSy5Oni7yv3HQxYX3SXzXcU=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];

View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "deepgit";
version = "4.3.1";
version = "4.4";
src = fetchurl {
url = "https://www.syntevo.com/downloads/deepgit/deepgit-linux-${lib.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
hash = "sha256-Ovd9MjgpMJvNySW/FPXYVtpLoCSQP1W1nlcNkgI7sgA=";
hash = "sha256-ILqwXDyW7/hZzoSxxaxv4bF5xsB/JFaOBYAJFb7xmdk=";
};
nativeBuildInputs = [

View file

@ -5,31 +5,29 @@ let
inherit (lib) hasPrefix hasSuffix removeSuffix;
escapedList = with lib; concatMapStringsSep " " (s: "'${escape [ "'" ] s}'");
fileName = pathStr: lib.last (lib.splitString "/" pathStr);
nameFromPath = pathStr:
let fN = fileName pathStr; in
if hasSuffix ".lua" fN then
fN
else if !(hasPrefix "." fN) then
"${fN}.lua"
else
null
;
scriptsDir = "$out/share/mpv/scripts";
# similar to `lib.extends`, but with inverted precedence and recursive update
extendedBy = args: orig: self:
let super = args self;
in lib.recursiveUpdate (orig super) super
;
in
lib.makeOverridable (
lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy
(if lib.isFunction args then args else (_: args)) (
{ pname
, extraScripts ? []
, ... }@args:
let
# either passthru.scriptName, inferred from scriptPath, or from pname
scriptName = (args.passthru or {}).scriptName or (
if args ? scriptPath && nameFromPath args.scriptPath != null
then nameFromPath args.scriptPath
if args ? scriptPath
then fileName args.scriptPath
else "${pname}.lua"
);
scriptPath = args.scriptPath or "./${scriptName}";
in
stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate {
in {
dontBuild = true;
preferLocalBuild = true;
@ -59,5 +57,5 @@ lib.makeOverridable (
passthru = { inherit scriptName; };
meta.platforms = lib.platforms.all;
} args)
)
})
))

View file

@ -22,7 +22,7 @@ in lib.recurseIntoAttrs
sponsorblock = callPackage ./sponsorblock.nix { };
thumbfast = callPackage ./thumbfast.nix { inherit buildLua; };
thumbnail = callPackage ./thumbnail.nix { inherit buildLua; };
uosc = callPackage ./uosc.nix { };
uosc = callPackage ./uosc.nix { inherit buildLua; };
visualizer = callPackage ./visualizer.nix { };
vr-reversal = callPackage ./vr-reversal.nix { };
webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };

View file

@ -1,42 +1,50 @@
{ stdenvNoCC, lib, fetchFromGitHub, makeFontsConf }:
{ lib
, fetchFromGitHub
, fetchpatch
, makeFontsConf
, buildLua
, buildGoModule
}:
stdenvNoCC.mkDerivation (finalAttrs: {
buildLua (finalAttrs: {
pname = "uosc";
version = "4.7.0";
version = "5.1.1";
scriptPath = "src/uosc";
src = fetchFromGitHub {
owner = "tomasklaen";
repo = "uosc";
rev = finalAttrs.version;
hash = "sha256-JqlBjhwRgmXl6XfHYTwtNWZj656EDHjcdWOlCgihF5I=";
hash = "sha256-+4k8T1yX3IRXK3XkUShsuJSH9w1Zla7CaRENcIqX4iM=";
};
postPatch = ''
substituteInPlace scripts/uosc.lua \
--replace "mp.find_config_file('scripts')" "\"$out/share/mpv/scripts\""
'';
tools = buildGoModule {
pname = "uosc-bin";
inherit (finalAttrs) version src;
vendorHash = "sha256-nkY0z2GiDxfNs98dpe+wZNI3dAXcuHaD/nHiZ2XnZ1Y=";
};
dontBuild = true;
# Patch lua script to get the path to its `ziggy` binary form the environment
patches = [
# uosc#814: Support overriding `ziggy_path` via environment variable
(fetchpatch {
url = "https://github.com/tomasklaen/uosc/commit/4fdf68a1bcb510824d66f35ecc7672a6452a44b2.patch";
hash = "sha256-igUqFf8e7LVIIjGxACdIWAeZxjF/yqaCL4QRXrzNQXk=";
})
];
installPhase = ''
runHook preInstall
mkdir -p $out/share/mpv/
cp -r scripts $out/share/mpv
cp -r fonts $out/share
runHook postInstall
'';
passthru.scriptName = "uosc.lua";
# the script uses custom "texture" fonts as the background for ui elements.
# In order for mpv to find them, we need to adjust the fontconfig search path.
postInstall = "cp -r src/fonts $out/share";
passthru.extraWrapperArgs = [
"--set"
"FONTCONFIG_FILE"
(toString (makeFontsConf {
fontDirectories = [ "${finalAttrs.finalPackage}/share/fonts" ];
}))
"--set"
"MPV_UOSC_ZIGGY"
(lib.getExe' finalAttrs.tools "ziggy")
];
meta = with lib; {

View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "bruno";
version = "1.3.1";
version = "1.4.0";
src = fetchurl {
url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb";
hash = "sha256-vZNl5qdK8hztfGaQCL6RnWlL8hPJaL/GBh7AOT5D3Js=";
hash = "sha256-yCYI2c9M19d1+BpnM7YJLkZk8Vdix+YSWCa5qsCMBxw=";
};
nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ];

View file

@ -8,14 +8,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "debianutils";
version = "5.14";
version = "5.15";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "debianutils";
rev = "debian/${finalAttrs.version}";
hash = "sha256-gbqtBFWq6KtmGLvGkmhpSHkpoDglfAT1KjDoZ4Y0SbI=";
hash = "sha256-o9HPiJCKcTJSoVDCjUcYPkqa6wnAuvCFOFhPdPSKS3A=";
};
nativeBuildInputs = [

File diff suppressed because it is too large Load diff

View file

@ -1,45 +0,0 @@
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, udev
}:
let
rev = "491a587342a5d79366a25d803b7065169314279c";
in rustPlatform.buildRustPackage {
pname = "framework-system-tools";
version = "unstable-2023-11-14";
src = fetchFromGitHub {
owner = "FrameworkComputer";
repo = "framework-system";
inherit rev;
hash = "sha256-qDtW4DvY19enCfkOBRaako9ngAkmSreoNWlL4QE2FAk=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
udev
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"smbios-lib-0.9.1" = "sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo=";
"uefi-0.20.0" = "sha256-/3WNHuc27N89M7s+WT64SHyFOp7YRyzz6B+neh1vejY=";
};
};
meta = with lib; {
description = "Rust libraries and tools to interact with the framework system.";
homepage = "https://github.com/FrameworkComputer/framework-system";
mainProgram = "framework_tool";
license = licenses.bsd3;
maintainers = with maintainers; [ kloenk leona ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -1,6 +1,6 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
pname = "framework-tool";
# Latest stable version 0.1.0 has an ssh:// git URL in Cargo.lock,
@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/FrameworkComputer/framework-system";
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ nickcao ];
maintainers = with maintainers; [ nickcao leona kloenk ];
mainProgram = "framework_tool";
};
}

View file

@ -17,13 +17,13 @@
assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "2.30.7";
version = "2.31.6";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${finalAttrs.version}";
hash = "sha256-W0hcIeWbgORWBYuNbVJRA8NNnuBEG8HMLeVBxXtd2VQ=";
hash = "sha256-gptWmATDwcSOUE5YYLEi6r/gVIVk0+nCeynxhD1ra/c=";
};
postPatch = ''

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "uxn";
version = "unstable-2023-11-12";
version = "unstable-2023-12-05";
src = fetchFromSourcehut {
owner = "~rabbits";
repo = "uxn";
rev = "86c46be310032bc6588bdc813fae1bc235fac60b";
hash = "sha256-qyFIJORrjONwyasDvO3COUcE4VJAjZEa3QJDQ+rhwqY=";
rev = "14bf95ba390f9cb84c23ed084b69787efe253e06";
hash = "sha256-oQAt9jDO0FZm6+6bBt/nDimkbiKsvuhsxnFcsNWvop8=";
};
outputs = [ "out" "projects" ];

View file

@ -0,0 +1,55 @@
{ lib
, fetchFromGitHub
, stdenvNoCC
, inkscape
, python3Packages
, xcursorgen
}:
stdenvNoCC.mkDerivation {
pname = "vimix-cursors";
version = "2020-02-24-unstable-2021-09-18";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "vimix-cursors";
rev = "9bc292f40904e0a33780eda5c5d92eb9a1154e9c";
hash = "sha256-zW7nJjmB3e+tjEwgiCrdEe5yzJuGBNdefDdyWvgYIUU=";
};
nativeBuildInputs = [
inkscape
python3Packages.cairosvg
xcursorgen
];
postPatch = ''
patchShebangs .
'';
buildPhase = ''
runHook preBuild
HOME="$NIX_BUILD_ROOT" ./build.sh
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -dm 755 $out/share/icons
for color in "" "-white"; do
cp -pr "dist$color/" "$out/share/icons/Vimix$color-cursors"
done
runHook postInstall
'';
meta = with lib; {
description = "An X cursor theme inspired by Materia design";
homepage = "https://github.com/vinceliuice/Vimix-cursors";
license = licenses.gpl3Only;
maintainers = with maintainers; [ ambroisie ];
platforms = platforms.linux;
};
}

View file

@ -6,18 +6,24 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wamr";
version = "1.2.3";
version = "1.3.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wasm-micro-runtime";
rev = "WAMR-${finalAttrs.version}";
hash = "sha256-bnia0ORC0YajO7I3XDMdpjlktDqOiXDlGcf12N1G+eg=";
hash = "sha256-h+IwCdufimmkVk2XUAFtDcV+5dJWohRc1kmh3zgDKIg=";
};
nativeBuildInputs = [ cmake ];
sourceRoot = "${finalAttrs.src.name}/product-mini/platforms/linux";
sourceRoot = let
platform = if stdenv.isLinux then
"linux"
else if stdenv.isDarwin then
"darwin"
else throw "unsupported platform";
in "${finalAttrs.src.name}/product-mini/platforms/${platform}";
meta = with lib; {
description = "WebAssembly Micro Runtime";

View file

@ -1,35 +0,0 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
pname = "clucene-core";
version = "0.9.21b";
src = fetchurl {
url = "mirror://sourceforge/clucene/clucene-core-${version}.tar.bz2";
sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317";
};
patches = [ ./gcc6.patch ];
env.NIX_CFLAGS_COMPILE = toString [
"-std=c++11"
];
meta = with lib; {
broken = stdenv.isDarwin;
description = "Core library for full-featured text search engine";
longDescription = ''
CLucene is a high-performance, scalable, cross platform, full-featured,
open-source indexing and searching API. Specifically, CLucene is the guts
of a search engine, the hard stuff. You write the easy stuff: the UI and
the process of selecting and parsing your data files to pump them into
the search engine yourself, and any specialized queries to pull it back
for display or further processing.
CLucene is a port of the very popular Java Lucene text search engine API.
'';
homepage = "https://clucene.sourceforge.net";
platforms = platforms.unix;
license = with licenses; [ asl20 lgpl2 ];
};
}

View file

@ -1,146 +0,0 @@
https://bugzilla.redhat.com/show_bug.cgi?id=998477
diff -up clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h
--- clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 2008-10-23 12:44:35.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h 2013-08-27 13:17:35.754234297 -0500
@@ -58,7 +58,7 @@ public:
__cl_refcount--;
return __cl_refcount;
}
- virtual ~LuceneBase(){};
+ virtual ~LuceneBase() throw(CLuceneError&) {};
};
class LuceneVoidBase{
diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp
--- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 2013-08-27 13:17:35.754234297 -0500
+++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp 2013-08-27 13:18:02.844949386 -0500
@@ -94,7 +94,7 @@ CompoundFileReader::CompoundFileReader(D
)
}
-CompoundFileReader::~CompoundFileReader(){
+CompoundFileReader::~CompoundFileReader() throw(CLuceneError&) {
close();
}
diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h
--- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 2008-10-23 12:44:37.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h 2013-08-27 13:17:35.755234286 -0500
@@ -95,7 +95,7 @@ protected:
public:
CompoundFileReader(CL_NS(store)::Directory* dir, char* name);
- ~CompoundFileReader();
+ ~CompoundFileReader() throw(CLuceneError&);
CL_NS(store)::Directory* getDirectory();
const char* getName() const;
diff -up clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.cpp
--- clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 2008-10-23 12:44:37.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/index/Term.cpp 2013-08-27 13:17:35.755234286 -0500
@@ -81,7 +81,7 @@ Term::Term(const TCHAR* fld, const TCHAR
set(fld,txt);
}
-Term::~Term(){
+Term::~Term() throw (CLuceneError&) {
//Func - Destructor.
//Pre - true
//Post - The instance has been destroyed. field and text have been deleted if pre(intrn) is false
diff -up clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.h
--- clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 2008-10-23 12:44:37.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/index/Term.h 2013-08-27 13:17:35.755234286 -0500
@@ -68,7 +68,7 @@ class Term:LUCENE_REFBASE {
Term(const TCHAR* fld, const TCHAR* txt);
///Destructor.
- ~Term();
+ ~Term() throw(CLuceneError&);
///Returns the field of this term, an interned string. The field indicates
///the part of a document which this term came from.
diff -up clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/Directory.h
--- clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 2008-10-23 12:44:36.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/store/Directory.h 2013-08-27 13:17:35.756234276 -0500
@@ -41,7 +41,7 @@ CL_NS_DEF(store)
public:
DEFINE_MUTEX(THIS_LOCK)
- virtual ~Directory(){ };
+ virtual ~Directory() throw(CLuceneError&) { };
// Returns an null terminated array of strings, one for each file in the directory.
char** list() const{
diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp
--- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 2008-10-23 13:01:52.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp 2013-08-27 13:17:35.756234276 -0500
@@ -368,7 +368,7 @@ void FSDirectory::FSIndexInput::readInte
strcat(buffer,name);
}
- FSDirectory::~FSDirectory(){
+ FSDirectory::~FSDirectory() throw(CLuceneError&) {
}
void FSDirectory::list(vector<string>* names) const{ //todo: fix this, ugly!!!
diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h
--- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 2008-10-23 13:00:43.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h 2013-08-27 13:17:35.756234276 -0500
@@ -155,7 +155,7 @@
///Destructor - only call this if you are sure the directory
///is not being used anymore. Otherwise use the ref-counting
///facilities of _CLDECDELETE
- ~FSDirectory();
+ ~FSDirectory() throw(CLuceneError&);
/// Get a list of strings, one for each file in the directory.
void list(vector<string>* names) const;
diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp
--- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500
@@ -219,7 +219,7 @@ CL_NS_DEF(store)
{
}
- RAMDirectory::~RAMDirectory(){
+ RAMDirectory::~RAMDirectory() throw(CLuceneError&) {
//todo: should call close directory?
}
diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h
--- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h 2013-08-27 13:17:35.757234265 -0500
@@ -131,7 +131,7 @@ CL_NS_DEF(store)
///Destructor - only call this if you are sure the directory
///is not being used anymore. Otherwise use the ref-counting
///facilities of dir->close
- virtual ~RAMDirectory();
+ virtual ~RAMDirectory() throw(CLuceneError&);
RAMDirectory(Directory* dir);
/**
diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp
--- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500
@@ -16,7 +16,7 @@ CL_NS_USE(util)
{
transOpen = false;
}
- TransactionalRAMDirectory::~TransactionalRAMDirectory(){
+ TransactionalRAMDirectory::~TransactionalRAMDirectory() throw(CLuceneError&) {
}
bool TransactionalRAMDirectory::archiveOrigFileIfNecessary(const char* name) {
diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h
--- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500
+++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h 2013-08-27 13:17:35.757234265 -0500
@@ -44,7 +44,7 @@ CL_NS_DEF(store)
public:
TransactionalRAMDirectory();
- virtual ~TransactionalRAMDirectory();
+ virtual ~TransactionalRAMDirectory() throw(CLuceneError&);
bool transIsOpen() const;
void transStart();

View file

@ -23,7 +23,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with lib; {
homepage = "https://github.com/ralphbean/bugwarrior";
homepage = "https://github.com/GothenburgBitFactory/bugwarrior";
description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior";
license = licenses.gpl3Plus;
platforms = platforms.all;

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "jsbeautifier";
version = "1.14.9";
version = "1.14.11";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-xzjrw2tHvZTkym3RepAEw8x07a1YLKHWDg5dWUWmPLk=";
hash = "sha256-a2Mlgepg3RwTPNJaSK0Ye0uR9SZiPEsPtUQ++AUlBQU=";
};
propagatedBuildInputs = [

View file

@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "labelbox";
version = "3.56.0";
version = "3.57.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "Labelbox";
repo = "labelbox-python";
rev = "refs/tags/v.${version}";
hash = "sha256-JRh14XpW/iGeBWrslm7weCP/vyJ7eZICqRgQpE2wjXs=";
hash = "sha256-pAJGgkIWBjBF+9aWGhAz+QZtSiOlip3SIYI4nRQj/oQ=";
};
postPatch = ''

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "logbook";
version = "1.6.0";
version = "1.7.0.post0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "getlogbook";
repo = "logbook";
rev = "refs/tags/${version}";
hash = "sha256-2K6fM6MFrh3l0smhSz8RFd79AIOXQZJQbNLTJM4WZUo=";
hash = "sha256-bqfFSd7CPYII/3AJCMApqmAYrAWjecOb3JA17FPFMIc=";
};
nativeBuildInputs = [

View file

@ -25,6 +25,7 @@ buildPythonPackage rec {
homepage = "https://github.com/cloudishBenne/protonup-ng";
description = "CLI program and API to automate the installation and update of GloriousEggroll's Proton-GE";
license = licenses.gpl3Only;
maintainers = with maintainers; [ Madouura ];
maintainers = with maintainers; [ Madouura cafkafk ];
mainProgram = "protonup";
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ginkgo";
version = "2.13.1";
version = "2.13.2";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "sha256-r2tAYH8E1j/gC+IRwcOv0Frcgd2RKEZjVzmuzOOhR7A=";
sha256 = "sha256-F1hpbNYahv7eCvDAXsAtjaVqpjIGjplgLvR64yxMtjM=";
};
vendorHash = "sha256-5dEKb+KnUZTxSSoaOH1GpqMmYdLcXKMs2nq0SvR2pUs=";

File diff suppressed because it is too large Load diff

View file

@ -9,19 +9,19 @@ rustPlatform.buildRustPackage rec {
pname = "typst-lsp";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "nvarner";
repo = "typst-lsp";
rev = "v${version}";
hash = "sha256-L0d+fDCLxU/XHC99VlIcZdiO3RohtWfoRnUPGIHodcc=";
hash = "sha256-7T5BxAq67mHve2FeYCN0L63e+2LE7agG1LgmKy5y1bc=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"typst-0.9.0" = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc=";
"typst-0.10.0" = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s=";
"typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
"typstfmt_lib-0.2.6" = "sha256-UUVbnxIj7kQVpZvSbbB11i6wAvdTnXVk5cNSNoGBeRM=";
};

View file

@ -12,16 +12,16 @@
buildGoModule rec {
pname = "runme";
version = "2.0.2";
version = "2.0.5";
src = fetchFromGitHub {
owner = "stateful";
repo = "runme";
rev = "v${version}";
hash = "sha256-9BXDYcIV31KLDauBzRnMs55jAKu+56WkgSrE/V+gje4=";
hash = "sha256-l1ZTCLy9T+VrmFPzkjXCgIAFkotZ18BA8EYfM0HCCOA=";
};
vendorHash = "sha256-xQuxoizcxut4qjXqgMEWMROiG53goxEXQas5n/2NiaY=";
vendorHash = "sha256-vYSheywz9ZyQ0aNWFpUEn/hrrktKAhV+VLYv74k+/nM=";
nativeBuildInputs = [
installShellFiles

View file

@ -25,14 +25,14 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "slint-lsp";
version = "1.3.0";
version = "1.3.2";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-ikOKpQHMLPCC2IfqWvW0I1auiCdyIZZMu6nMGle/bE0=";
sha256 = "sha256-zNTel91c1ECg4z7xIu37GcSWHTxTKtxpGjH3TpiFQ1k=";
};
cargoHash = "sha256-tprtlG/M2ItE7Ay/9QWrZQHdVEPYD9hDJ+uPR8pq1Xk=";
cargoHash = "sha256-pT3z6t1W/DitH/GJJIJhQawslodKzIkCyO0yd9OlvAg=";
nativeBuildInputs = [ cmake pkg-config fontconfig ];
buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]

View file

@ -1,98 +1,147 @@
{ stdenv, lib, fetchurl, buildEnv, makeWrapper
, xorg, alsa-lib, at-spi2-core, dbus, glib, gtk3, atk, pango, freetype
, fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, expat, systemd
, libcap, libdrm, libxkbcommon
{ alsa-lib
, at-spi2-core
, atk
, autoPatchelfHook
, buildEnv
, cairo
, cups
, dbus
, expat
, fetchurl
, ffmpeg
, fontconfig
, freetype
, gdk-pixbuf
, glib
, gtk3
, lib
, libcap
, libdrm
, libnotify
, ffmpeg, libxcb, cups
, sqlite, udev
, libuuid
, libxcb
, libxkbcommon
, makeWrapper
, mesa
, nspr
, nss
, pango
, sdk ? false
, sqlite
, stdenv
, systemd
, udev
, wrapGAppsHook
, xorg
}:
let
bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
else "ia32";
bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else "ia32";
nwEnv = buildEnv {
name = "nwjs-env";
paths = [
xorg.libX11 xorg.libXrender glib gtk3 atk at-spi2-core pango cairo gdk-pixbuf
freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage
xorg.libXext xorg.libXfixes mesa nss nspr expat dbus
xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
xorg.libXScrnSaver xorg.libxshmfence cups
libcap libdrm libnotify
alsa-lib
at-spi2-core
atk
cairo
cups
dbus
expat
fontconfig
freetype
gdk-pixbuf
glib
gtk3
libcap
libdrm
libnotify
libxkbcommon
mesa
nspr
nss
pango
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxshmfence
# libnw-specific (not chromium dependencies)
ffmpeg libxcb
ffmpeg
libxcb
# chromium runtime deps (dlopend)
sqlite udev
libuuid
sqlite
udev
];
extraOutputsToInstall = [ "lib" "out" ];
};
in stdenv.mkDerivation rec {
version = "0.82.0";
in
stdenv.mkDerivation {
pname = "nwjs";
version = "0.54.1";
inherit version;
src = if sdk then fetchurl {
url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then
"sha256-1qeU4+EIki0M7yJPkRuzFwMdswfDOni5gltdmM6A/ds=" else
"sha256-wDEGePE9lrKa6OAzeiDLhVj992c0TJgiMHb8lJ4PF80=";
} else fetchurl {
url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then
"sha256-TACEM06K2t6dDXRD44lSW7GRi77yzSW4BZJw8gT+fl4=" else
"sha256-yX9knqFV5VQTT3TJDmQoDgt17NqH8fLt+bLQAqKleTU=";
src =
let flavor = if sdk then "sdk-" else "";
in fetchurl {
url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz";
hash = {
"sdk-ia32" = "sha256-aIRnZDslOhoD5F0coX43VNFWGEImPU5oq9Roc4jYfsY=";
"sdk-x64" = "sha256-rKbnNAq9AVjSUjTipYze2VHiVi0RnZZsdQj1725DPd0=";
"ia32" = "sha256-pA53+A+EtS7m6026jPlC3vFxb2iheS4peDJFNkQAf/s=";
"x64" = "sha256-hRih8o8hBbYBEes3Z62PSMIC720SLRa3t2rL/5LaJAE=";
}."${flavor + bits}";
};
# we have runtime deps like sqlite3 that should remain
dontPatchELF = true;
nativeBuildInputs = [
autoPatchelfHook
(wrapGAppsHook.override { inherit makeWrapper; })
];
buildInputs = [ nwEnv ];
appendRunpaths = map (pkg: (lib.getLib pkg) + "/lib") [ nwEnv stdenv.cc.libc stdenv.cc.cc ];
preFixup = ''
gappsWrapperArgs+=(
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
)
'';
installPhase = ''
runHook preInstall
installPhase =
let ccPath = lib.makeLibraryPath [ stdenv.cc.cc ];
in ''
mkdir -p $out/share/nwjs
cp -R * $out/share/nwjs
find $out/share/nwjs
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0
libpath="$out/share/nwjs/lib/"
for f in "$libpath"/*.so; do
patchelf --set-rpath "${nwEnv}/lib:${ccPath}:$libpath" "$f"
done
patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${ccPath}:$libpath" $out/share/nwjs/nw
# check, whether all RPATHs are correct (all dependencies found)
checkfile=$(mktemp)
for f in "$libpath"/*.so "$out/share/nwjs/nw"; do
(echo "$f:";
ldd "$f" ) > "$checkfile"
done
if <"$checkfile" grep -e "not found"; then
cat "$checkfile"
exit 1
fi
mkdir -p $out/bin
ln -s $out/share/nwjs/nw $out/bin
mkdir $out/lib
ln -s $out/share/nwjs/lib/libnw.so $out/lib/libnw.so
'';
nativeBuildInputs = [ makeWrapper ];
runHook postInstall
'';
meta = with lib; {
description = "An app runtime based on Chromium and node.js";
homepage = "https://nwjs.io/";
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ maintainers.offline ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = [ maintainers.mikaelfangel ];
mainProgram = "nw";
license = licenses.bsd3;
};
}

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "pyenv";
version = "2.3.32";
version = "2.3.35";
src = fetchFromGitHub {
owner = "pyenv";
repo = "pyenv";
rev = "refs/tags/v${version}";
hash = "sha256-miJ/WONNDieLryD2J9JmkmSCG5Iesg2N2GT/FI9NGY0=";
hash = "sha256-tNTHRSzYCelByEt8bN7BhUBGQCAJfZVjWIYTr0VhbO4=";
};
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vultr-cli";
version = "2.20.0";
version = "2.21.0";
src = fetchFromGitHub {
owner = "vultr";
repo = pname;
rev = "v${version}";
hash = "sha256-3Zd507yAymmQRgybm96VD413kId0/kMxIHbmUh8j6Kk=";
hash = "sha256-sIxAl4mI29RfJbGk/pvCSxUva8O9sXcwEIWBfY+h72Q=";
};
vendorHash = "sha256-OVoOCExAU6cDyWhSpk4hkhBZpWehH+4/vU/X81w9XgA=";
vendorHash = "sha256-d4EK9SLmIyt/N+29a7p7nxHkX0m0pAOMH7+G1tLbJGk=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
version = "4.8.13";
version = "4.9.6";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
hash = "sha256-16TpsKNLcm6lbi4exYxDZWfmRsvfAhT1ktP36zC9Psg=";
hash = "sha256-YF8lnICqTyPJWD0BqJ7GUu+ywGhPOhNUUzTPIq4QpPM=";
};
dontUnpack = true;

View file

@ -678,23 +678,23 @@ let
VBOXGUEST = option no;
DRM_VBOXVIDEO = option no;
XEN = option yes;
XEN_DOM0 = option yes;
PCI_XEN = option yes;
HVC_XEN = option yes;
HVC_XEN_FRONTEND = option yes;
XEN_SYS_HYPERVISOR = option yes;
SWIOTLB_XEN = option yes;
XEN_BACKEND = option yes;
XEN_BALLOON = option yes;
XEN_BALLOON_MEMORY_HOTPLUG = option yes;
XEN_EFI = option yes;
XEN_HAVE_PVMMU = option yes;
XEN_MCE_LOG = option yes;
XEN_PVH = option yes;
XEN_PVHVM = option yes;
XEN_SAVE_RESTORE = option yes;
XEN_SELFBALLOONING = whenOlder "5.3" yes;
XEN = mkIf stdenv.is64bit (option yes);
XEN_DOM0 = mkIf stdenv.is64bit (option yes);
PCI_XEN = mkIf stdenv.is64bit (option yes);
HVC_XEN = mkIf stdenv.is64bit (option yes);
HVC_XEN_FRONTEND = mkIf stdenv.is64bit (option yes);
XEN_SYS_HYPERVISOR = mkIf stdenv.is64bit (option yes);
SWIOTLB_XEN = mkIf stdenv.is64bit (option yes);
XEN_BACKEND = mkIf stdenv.is64bit (option yes);
XEN_BALLOON = mkIf stdenv.is64bit (option yes);
XEN_BALLOON_MEMORY_HOTPLUG = mkIf stdenv.is64bit (option yes);
XEN_EFI = mkIf stdenv.is64bit (option yes);
XEN_HAVE_PVMMU = mkIf stdenv.is64bit (option yes);
XEN_MCE_LOG = mkIf stdenv.is64bit (option yes);
XEN_PVH = mkIf stdenv.is64bit (option yes);
XEN_PVHVM = mkIf stdenv.is64bit (option yes);
XEN_SAVE_RESTORE = mkIf stdenv.is64bit (option yes);
XEN_SELFBALLOONING = mkIf stdenv.is64bit (whenOlder "5.3" yes);
# Enable device detection on virtio-mmio hypervisors
VIRTIO_MMIO_CMDLINE_DEVICES = yes;

View file

@ -59,11 +59,11 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
version = "535.43.19";
version = "535.43.20";
persistencedVersion = "535.98";
settingsVersion = "535.98";
sha256_64bit = "sha256-zxyZnXpNQuYJ17NDm3s8P/7GzQ4xD4Q4oCZA0ei+Wqs=";
openSha256 = "sha256-K14Av5fCda1J9o5pkQBhmwW34d2hgqrF3J99FWPsNjM=";
sha256_64bit = "sha256-PVs+AnVbJhriAHlxVEV81fqT4n92edv0cQyAGvuUgPw=";
openSha256 = "sha256-xqjitZRsIvbE98zzSQNorkCguDJt53eCxKYBxIZQwVM=";
settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s=";
persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM=";
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";

View file

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.32.7.7621-871adbd44";
version = "1.32.8.7639-fb6452ebf";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "0894hwbl05rsv80p3k0wjs1hv5jwn2zakv758kzx1dvqcmjzhy2w";
sha256 = "sha256-v9Fb5dlgIWqXfL9a4GkbGDEzYueyHs8P8R6TSyXDLrc=";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "0r2i4y00pcd6hkrypzmgd03w4vj2hchhicgdy3zdwjmfk3aqs4jf";
sha256 = "sha256-jdGVAdvm7kjxTP3CQ5w6dKZbfCRwSy9TrtxRHaV0/cs=";
};
outputs = [ "out" "basedb" ];

View file

@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
pname = "snac2";
version = "2.42";
version = "2.43";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "grunfink";
repo = pname;
rev = version;
hash = "sha256-cLSbmEZj5lyMtZMM2vaWqdrXFk1/VPws9yBPhSUka2E=";
hash = "sha256-253uibzgo5p3DtODrZelZeULcd16lR7ueEOWidm6zOE=";
};
buildInputs = [ curl openssl ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "wakapi";
version = "2.9.2";
version = "2.10.0";
src = fetchFromGitHub {
owner = "muety";
repo = pname;
rev = version;
sha256 = "sha256-BRIcStqRzwoFG9HkWBpfumeCzbrSI0Hg//a0iDQtNw8=";
sha256 = "sha256-CyMzhEKaTiLODjXbHqkqEJNeCsssCjmdVOzg3vXVjJY=";
};
vendorHash = "sha256-SqkE4vTT+QoLhKrQcGa2L5WmD+fCX7vli4FjgwLnqjg=";
vendorHash = "sha256-+FYeaIQXHZyrik/9OICl2zk+OA8X9bry7JCQbdf9QGs=";
# Not a go module required by the project, contains development utilities
excludedPackages = [ "scripts" ];

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libmodsecurity";
version = "3.0.10";
version = "3.0.11";
src = fetchFromGitHub {
owner = "SpiderLabs";
repo = "ModSecurity";
rev = "v${version}";
sha256 = "sha256-VaoPpJ0twuGWU7G9AvKK4kq9Ed0BeG2J7B81sOuJVrE=";
sha256 = "sha256-dbAX4lokmiUc+glhTG0PPaD/WEXcoQX0AQ/WZwJQYPY=";
fetchSubmodules = true;
};

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vals";
version = "0.28.0";
version = "0.30.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "variantdev";
repo = pname;
sha256 = "sha256-6sKwRYbWaKrnMLU+G4/s3CTjUYeovsWttAvk1MnIFPI=";
sha256 = "sha256-3nzbib/oNrbnvjJ+4Z3zU2h6HSnemPap2fvufJKQIdk=";
};
vendorHash = "sha256-CwRhtC+Ome/oyTSd8rPpQ3TgBkFb9CM3XRc0k2g2lHU=";
vendorHash = "sha256-6i6CHa3kNe9QW87l6KjShxX/qpf1U+1c9oUoPBi1qO4=";
ldflags = [
"-s"

File diff suppressed because it is too large Load diff

View file

@ -11,13 +11,13 @@ assert nvidiaSupport -> stdenv.isLinux;
rustPlatform.buildRustPackage rec {
pname = "zenith";
version = "0.14.0";
version = "0.14.0-unstable-2023-11-21";
src = fetchFromGitHub {
owner = "bvaisvil";
repo = pname;
rev = version;
sha256 = "sha256-GrrdE9Ih8x8N2HN+1NfxfthfHbufLAT/Ac+ZZWW5Zg8=";
rev = "0ed09e6a68c1517b4d050f5e3163421718226040";
hash = "sha256-vw/ar2Qi06HxPfPsfcxtfRhMTqY4FCE+7tCfe9sLEv0=";
};
# remove cargo config so it can find the linker on aarch64-linux
@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
+ lib.optionalString nvidiaSupport ", and NVIDIA GPU usage";
homepage = "https://github.com/bvaisvil/zenith";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ wegank ];
platforms = platforms.unix;
};
}

View file

@ -154,6 +154,7 @@ mapAliases ({
clash = throw "'clash' has been removed, upstream gone. Consider using 'clash-meta' instead."; # added 2023-11-10
clasp = clingo; # added 2022-12-22
claws-mail-gtk3 = claws-mail; # Added 2021-07-10
clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09
cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09
code-server = throw "'code-server' has been removed from nixpkgs, as it was depending on EOL Node.js and is unmaintained."; # Added 2023-10-30
codimd = hedgedoc; # Added 2020-11-29
@ -270,6 +271,7 @@ mapAliases ({
foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20
fractal-next = fractal; # added 2023-11-25
framework-system-tools = framework-tool; # added 2023-12-09
fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
fx_cast_bridge = fx-cast-bridge; # added 2023-07-26
@ -687,6 +689,7 @@ mapAliases ({
orchis = orchis-theme; # Added 2021-06-09
oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10
osxfuse = macfuse-stubs; # Added 2021-03-20
oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09
### P ###

View file

@ -16205,6 +16205,7 @@ with pkgs;
ghdl-llvm = callPackage ../development/compilers/ghdl {
backend = "llvm";
inherit (llvmPackages_15) llvm;
};
gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { };
@ -20865,11 +20866,7 @@ with pkgs;
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
clucene_core_1 = callPackage ../development/libraries/clucene-core {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
clucene_core = clucene_core_1;
clucene_core = clucene_core_2;
clutter = callPackage ../development/libraries/clutter { };
@ -37173,9 +37170,6 @@ with pkgs;
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { };
oxen = callPackage ../applications/blockchains/oxen
{ stdenv = gcc10StdenvCompat; boost = boost179; };
masari = callPackage ../applications/blockchains/masari { };
napari = with python3Packages; toPythonApplication napari;