mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-01 01:33:20 +00:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
commit
5005a65bcc
@ -94,6 +94,8 @@
|
||||
for `stateVersion` ≥ 24.11. (It was previously using SQLite for structured
|
||||
data and the filesystem for blobs).
|
||||
|
||||
- `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details.
|
||||
|
||||
- `zx` was updated to v8, which introduces several breaking changes.
|
||||
See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information.
|
||||
|
||||
|
||||
@ -63,7 +63,7 @@ in
|
||||
|
||||
systemd = lib.mkIf cfg.systemd.setPath.enable {
|
||||
user.extraConfig = ''
|
||||
DefaultEnvironment="PATH=$PATH:/run/current-system/sw/bin:/etc/profiles/per-user/%u/bin:/run/wrappers/bin"
|
||||
DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH"
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@ -237,6 +237,8 @@ in {
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
StateDirectory = mkIf (hasPrefix "/var/lib/jenkins" cfg.home) "jenkins";
|
||||
# For (possible) socket use
|
||||
RuntimeDirectory = "jenkins";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -264,9 +264,12 @@ in {
|
||||
enable = true;
|
||||
package = kdePackages.kwallet-pam;
|
||||
};
|
||||
kde.kwallet = {
|
||||
enable = true;
|
||||
package = kdePackages.kwallet-pam;
|
||||
kde = {
|
||||
allowNullPassword = true;
|
||||
kwallet = {
|
||||
enable = true;
|
||||
package = kdePackages.kwallet-pam;
|
||||
};
|
||||
};
|
||||
kde-fingerprint = lib.mkIf config.services.fprintd.enable { fprintAuth = true; };
|
||||
kde-smartcard = lib.mkIf config.security.pam.p11.enable { p11Auth = true; };
|
||||
|
||||
@ -116,7 +116,7 @@ in
|
||||
] # TODO: NetworkManager doesn't belong here
|
||||
++ optional config.networking.networkmanager.enable networkmanagerapplet
|
||||
++ optional config.powerManagement.enable xfce4-power-manager
|
||||
++ optionals config.hardware.pulseaudio.enable [
|
||||
++ optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
|
||||
pavucontrol
|
||||
# volume up/down keys support:
|
||||
# xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
|
||||
|
||||
@ -120,11 +120,15 @@ stdenv.mkDerivation {
|
||||
# Prevent double wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
env = rec {
|
||||
libdir = "${placeholder "out"}/lib/spotify";
|
||||
librarypath = "${lib.makeLibraryPath deps}:${libdir}";
|
||||
};
|
||||
|
||||
installPhase =
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
libdir=$out/lib/spotify
|
||||
mkdir -p $libdir
|
||||
mv ./usr/* $out/
|
||||
|
||||
@ -147,16 +151,6 @@ stdenv.mkDerivation {
|
||||
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath $rpath $out/share/spotify/spotify
|
||||
|
||||
librarypath="${lib.makeLibraryPath deps}:$libdir"
|
||||
wrapProgramShell $out/share/spotify/spotify \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
${lib.optionalString (deviceScaleFactor != null) ''
|
||||
--add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
|
||||
''} \
|
||||
--prefix LD_LIBRARY_PATH : "$librarypath" \
|
||||
--prefix PATH : "${gnome.zenity}/bin" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
# fix Icon line in the desktop file (#48062)
|
||||
sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop"
|
||||
|
||||
@ -175,6 +169,21 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
|
||||
wrapProgramShell $out/share/spotify/spotify \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
${lib.optionalString (deviceScaleFactor != null) ''
|
||||
--add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
|
||||
''} \
|
||||
--prefix LD_LIBRARY_PATH : "$librarypath" \
|
||||
--prefix PATH : "${gnome.zenity}/bin" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
meta = meta // {
|
||||
maintainers = with lib.maintainers; [ eelco ftrvxmtrx sheenobu timokau ma27 ];
|
||||
};
|
||||
|
||||
@ -1,18 +1,60 @@
|
||||
{ stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot
|
||||
, mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig
|
||||
, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim
|
||||
# Qt 5 subpackages
|
||||
, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qt3d, mlt
|
||||
{ stdenv
|
||||
, lib
|
||||
, requireFile
|
||||
, wrapQtAppsHook
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
, unixtools
|
||||
, fakeroot
|
||||
, mailcap
|
||||
, libGL
|
||||
, libpulseaudio
|
||||
, alsa-lib
|
||||
, nss
|
||||
, gd
|
||||
, gst_all_1
|
||||
, nspr
|
||||
, expat
|
||||
, fontconfig
|
||||
, dbus
|
||||
, glib
|
||||
, zlib
|
||||
, openssl
|
||||
, libdrm
|
||||
, cups
|
||||
, avahi-compat
|
||||
, xorg
|
||||
, wayland
|
||||
, libudev0-shim
|
||||
, bubblewrap
|
||||
, libjpeg8
|
||||
, gdk-pixbuf
|
||||
, gtk3
|
||||
, pango
|
||||
# Qt 6 subpackages
|
||||
, qtbase
|
||||
, qtserialport
|
||||
, qtserialbus
|
||||
, qtvirtualkeyboard
|
||||
, qtmultimedia
|
||||
, qt3d
|
||||
, mlt
|
||||
, qtlocation
|
||||
, qtwebengine
|
||||
, qtquick3d
|
||||
, qtwayland
|
||||
, qtwebview
|
||||
, qtscxml
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pixinsight";
|
||||
version = "1.8.9-2";
|
||||
version = "1.8.9-3";
|
||||
|
||||
src = requireFile rec {
|
||||
name = "PI-linux-x64-${version}-20230920-c.tar.xz";
|
||||
name = "PI-linux-x64-${finalAttrs.version}-20240619-c.tar.xz";
|
||||
url = "https://pixinsight.com/";
|
||||
hash = "sha256-g7paYTYv52XBg0w3d3YhVNrmt+iS20uobaUsvY6F3jM=";
|
||||
hash = "sha256-WZrD+X7zE1i29+YsGJ+wbIXmlVon9bczHvvRAkQXz6M=";
|
||||
message = ''
|
||||
PixInsight is available from ${url} and requires a commercial (or trial) license.
|
||||
After a license has been obtained, PixInsight can be downloaded from the software distribution
|
||||
@ -30,6 +72,7 @@ stdenv.mkDerivation rec {
|
||||
autoPatchelfHook
|
||||
mailcap
|
||||
libudev0-shim
|
||||
bubblewrap
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -53,15 +96,25 @@ stdenv.mkDerivation rec {
|
||||
wayland
|
||||
cups
|
||||
avahi-compat
|
||||
libjpeg8
|
||||
gdk-pixbuf
|
||||
gtk3
|
||||
pango
|
||||
# Qt stuff
|
||||
qt3d
|
||||
mlt
|
||||
qtbase
|
||||
qtgamepad
|
||||
#qtgamepad
|
||||
qtserialport
|
||||
qtserialbus
|
||||
qtvirtualkeyboard
|
||||
qtmultimedia
|
||||
qtlocation
|
||||
qtwebengine
|
||||
qtquick3d
|
||||
qtwayland
|
||||
qtwebview
|
||||
qtscxml
|
||||
] ++ (with xorg; [
|
||||
libX11
|
||||
libXdamage
|
||||
@ -86,9 +139,8 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/opt/PixInsight $out/share/{applications,mime/packages,icons/hicolor}
|
||||
|
||||
fakeroot script -ec "./installer \
|
||||
bwrap --bind /build /build --bind $out/opt /opt --bind /nix /nix --dev /dev fakeroot script -ec "./installer \
|
||||
--yes \
|
||||
--install-dir=$out/opt/PixInsight \
|
||||
--install-desktop-dir=$out/share/applications \
|
||||
--install-mime-dir=$out/share/mime \
|
||||
--install-icons-dir=$out/share/icons/hicolor \
|
||||
@ -97,6 +149,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
rm -rf $out/opt/PixInsight-old-0
|
||||
ln -s $out/opt/PixInsight/bin/PixInsight $out/bin/.
|
||||
ln -s $out/opt/PixInsight/bin/lib $out/lib
|
||||
|
||||
# Remove signatures of plugins, as they are only working if actually installed
|
||||
# under /opt. In the Nix setup, they are causing trouble.
|
||||
find $out/opt/PixInsight/ -name "*.xsgn" -exec rm {} \;
|
||||
'';
|
||||
|
||||
# Some very exotic Qt libraries are not available in nixpkgs
|
||||
@ -118,7 +175,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
dontWrapQtApps = true;
|
||||
postFixup = ''
|
||||
wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString qtWrapperArgs}
|
||||
wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString finalAttrs.qtWrapperArgs}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -128,7 +185,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = [ maintainers.sheepforce ];
|
||||
hydraPlatforms = [];
|
||||
hydraPlatforms = [ ];
|
||||
mainProgram = "PixInsight";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "CopyQ";
|
||||
version = "8.0.0";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ewunl4k9f0aDjilhKAsVxwR3S6uSZ1xwtu6ccNsNOgk=";
|
||||
hash = "sha256-Dxiytspqs4+bcnUM+B3lO8iQp9rrCvMfI+WMFMCtM7g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,11 +18,11 @@ with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "safeeyes";
|
||||
version = "2.1.8";
|
||||
version = "2.1.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-65U/j6P6X4JzhL0aEOnzKa/Al6SYprOOxix2dtcusJQ=";
|
||||
hash = "sha256-Z1c1DVwCwPiOPvCYNsoXJBMfVzIQA+/6wStV8BShahc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cmctl";
|
||||
version = "1.14.5";
|
||||
version = "1.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cert-manager";
|
||||
repo = "cert-manager";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WitYq3/veaARZQHoseJnT5h0AGmXVlLzRe8KCOJuY0w=";
|
||||
hash = "sha256-ZvrR8k1jiyAMUKM9VA6vKH2uhMKnd22OQe08CIlxXjs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cmd/ctl";
|
||||
|
||||
vendorHash = "sha256-27XvT33S/vgGo5MQDpHzTN+K1nNPR6OOFggzLhatygI=";
|
||||
vendorHash = "sha256-qaSzAPNVe25Fbbfqy0OFFnMJ21IlWuoJKwnT7y2wmOs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "newsboat";
|
||||
version = "2.35";
|
||||
version = "2.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newsboat";
|
||||
repo = "newsboat";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-WbicKP46N8MVjUeerYUdcHJO5Qf7rQFyYCpxexd2wDY=";
|
||||
hash = "sha256-RnDnyRAZ71aE5st5wUcUKjFFGY288oFpiyDXAno15MQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-B6U+DxIRm9Sn4x+dZCfNKENNDsTUVZFT6i0Yz47gjTs=";
|
||||
cargoHash = "sha256-0z3G8j0Qk0HEDUKA7fmjFfNW956rRtzKO+0ltNQR4es=";
|
||||
|
||||
# TODO: Check if that's still needed
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
, makeWrapper
|
||||
, electron
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "revolt-desktop";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage";
|
||||
sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/{applications,revolt-desktop}
|
||||
|
||||
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
|
||||
cp -a ${appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop
|
||||
cp -a ${appimageContents}/usr/share/icons $out/share/icons
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source user-first chat platform";
|
||||
homepage = "https://revolt.chat/";
|
||||
changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ heyimnova ];
|
||||
platforms = platforms.linux;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "revolt-desktop";
|
||||
};
|
||||
}
|
||||
@ -64,14 +64,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "5.1.7";
|
||||
version = "5.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-OH9+cH5CQyrp4DSKXEMs6csGiH+GAtxJT4P9YidmAcM=";
|
||||
hash = "sha256-YTCvniC8THoz0BUM/gkr97rhbbSVQ+SCE1H3qS68lIM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -48,23 +48,23 @@ let
|
||||
# and often with different versions. We write them on three lines
|
||||
# like this (rather than using {}) so that the updater script can
|
||||
# find where to edit them.
|
||||
versions.aarch64-darwin = "6.0.11.35001";
|
||||
versions.x86_64-darwin = "6.0.11.35001";
|
||||
versions.x86_64-linux = "6.0.12.5501";
|
||||
versions.aarch64-darwin = "6.1.0.35886";
|
||||
versions.x86_64-darwin = "6.1.0.35886";
|
||||
versions.x86_64-linux = "6.1.0.198";
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
|
||||
name = "zoomusInstallerFull.pkg";
|
||||
hash = "sha256-U8CdizMicbBLrKWYSRYl8u5tD/1276HwdHlr4kVHbiQ=";
|
||||
hash = "sha256-jAH/3r2AM8WAzfHE8CvKBrr53sM/9DH624C+EiJIdXs=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
|
||||
hash = "sha256-iAETUWviaaQeEg6/FM1GWSJ3Qyvc0zBfuqOfA6X7HpY=";
|
||||
hash = "sha256-nKJPZQbyVG+P974hP4+4eAtupEQOf5Kl64Zp+jV/Ka0=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-h9gjVd7xqChaoC2BZWEhR5WdyfQrPiBjM2WHXMgp8uQ=";
|
||||
hash = "sha256-R4f0dnwqkODFeo8mPBecAI/AGQLwYkcNtJq6UVXCPfI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.8.2";
|
||||
version = "4.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
rev = version;
|
||||
hash = "sha256-IwFA/4QGfkMYbuUxbg3/jkrud0MUlEjtkYtCLy+3emc=";
|
||||
hash = "sha256-iQo7ETz5j/Uy5a96XFRkZ0U67dTHWEYLsr/qUi79Y4E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -31,20 +31,20 @@
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.35.1";
|
||||
version = "0.35.2";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Hp8phZIVvg1oH6ajSmpcQ0uDXRzMQjVBIRYqpgro/24=";
|
||||
hash = "sha256-5ZkQfGlW7MWYCJZSwK/u8x9jKrZEqupsNvW30DLipDM=";
|
||||
};
|
||||
|
||||
goModules = (buildGo122Module {
|
||||
pname = "kitty-go-modules";
|
||||
inherit src version;
|
||||
vendorHash = "sha256-mpyotGzv8UU9pg/3UNZBx0Rkm5kzMzIlDSHuhtNALfw=";
|
||||
vendorHash = "sha256-NzDA9b3RAfMx+Jj7cSF8pEsKUkoBECBUXl2QFSmkmwM=";
|
||||
}).goModules;
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
buildLua {
|
||||
pname = "dynamic-crop";
|
||||
|
||||
version = "0-unstable-2023-12-22";
|
||||
version = "0-unstable-2024-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ashyni";
|
||||
repo = "mpv-scripts";
|
||||
rev = "c79a46ba03631eb2a9b4f598aab0b723f03fc531";
|
||||
hash = "sha256-W4Dj2tyJHeHLqAndrzllKs4iwMe3Tu8rfzEGBHuke6s=";
|
||||
rev = "1fadd5ea3e31818db33c9372c40161db6fc1bdd3";
|
||||
hash = "sha256-nC0Iw+9PSGxc3OdYhEmFVa49Sw+rIbuFhgZvAphP4cM=";
|
||||
};
|
||||
passthru.scriptName = "dynamic-crop.lua";
|
||||
|
||||
|
||||
@ -1,5 +1,19 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libbsd, libevent, libjpeg, libdrm, pkg-config }:
|
||||
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libbsd
|
||||
, libevent
|
||||
, libjpeg
|
||||
, libdrm
|
||||
, pkg-config
|
||||
, janus-gateway
|
||||
, glib
|
||||
, alsa-lib
|
||||
, speex
|
||||
, jansson
|
||||
, libopus
|
||||
, withJanus ? true
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ustreamer";
|
||||
version = "6.12";
|
||||
@ -11,13 +25,30 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-iaCgPHgklk7tbhJhQmyjKggb1bMWBD+Zurgfk9sCQ3E=";
|
||||
};
|
||||
|
||||
buildInputs = [ libbsd libevent libjpeg libdrm ];
|
||||
buildInputs = [
|
||||
libbsd
|
||||
libevent
|
||||
libjpeg
|
||||
libdrm
|
||||
] ++ lib.optionals withJanus [
|
||||
janus-gateway
|
||||
glib
|
||||
alsa-lib
|
||||
jansson
|
||||
speex
|
||||
libopus
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"WITH_V4P=1"
|
||||
] ++ lib.optionals withJanus [
|
||||
"WITH_JANUS=1"
|
||||
# Workaround issues with Janus C Headers
|
||||
# https://github.com/pikvm/ustreamer/blob/793f24c4/docs/h264.md#fixing-janus-c-headers
|
||||
"CFLAGS=-I${lib.getDev janus-gateway}/include/janus"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -33,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
screencast hardware data with the highest resolution and FPS possible.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ tfc ];
|
||||
maintainers = with maintainers; [ tfc matthewcroughan ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "flawz";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "flawz";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zzZh9MjLbhvnuJEaKPtF5Rzfcu9VbeQCMiJ8MLvJBXg=";
|
||||
hash = "sha256-/gNHi7ZENy0cgnEgDBW82ACUUsuMLYD9eUrSxwO9k1U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Dur8AcOT9sPiGg+rfcxfS2m4CeEk59tISxU+dc87urI=";
|
||||
cargoHash = "sha256-kMiKlZj+G1vfjaEiB3rtPoJl0K3W9xRVwgVz8q2pn1s=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nerdfetch";
|
||||
version = "8.1.1";
|
||||
version = "8.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThatOneCalculator";
|
||||
repo = "NerdFetch";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mSRS7MUgaa14mgPYkbC4O1/gXxbyDKOiVCRgoh8He/c=";
|
||||
hash = "sha256-hKs/Of6GIQ9Xtav7VfL+2DzMNpgUoDk5C/2lqldd/So=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nezha-agent";
|
||||
version = "0.16.11";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mcTS+PjFa5niWhe8pmWmuYpx+Y9ZWX0hpcLEodN/SIs=";
|
||||
hash = "sha256-xCoCmWdliw7zSxLv8IJl2F03TPMS3dRC40JH1XBirTI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-L6QdodI8Ur1H6Zc24KSTYAHfzvW2aq9SYwCVgjvSDII=";
|
||||
vendorHash = "sha256-V5ykn/0vXSrCtCX4EEoThXMKE6EVTjc9zXt89G+34N8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oink";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rlado";
|
||||
repo = "oink";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nSLoochU0mRxD83EXH3xsrfBBg4SnvIyf5qUiwSeh0c=";
|
||||
hash = "sha256-ojvuA5IlayPMNajl2+a4lx8NU06Da0vp9TJHCQVMtlo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proto";
|
||||
version = "0.36.2";
|
||||
version = "0.37.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k1aVz3eiZHE92cPKtxEZhCN8I3hcNEr2HN3Z70zPT+I=";
|
||||
hash = "sha256-IqXxjR+M1OCRKUA2HCT6WQvdBMOa0efT8m+drhyQCoE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HFYISBB+5lyNtWcYNBj3rTX0C52YNC6bBsVT+OpWa+c=";
|
||||
cargoHash = "sha256-NnTiT1jLMo9EfYau+U0FiAC+V67GnoI90vSsotwniio=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
||||
85
pkgs/by-name/re/revolt-desktop/package.nix
Normal file
85
pkgs/by-name/re/revolt-desktop/package.nix
Normal file
@ -0,0 +1,85 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, appimageTools
|
||||
, makeWrapper
|
||||
, electron
|
||||
}:
|
||||
(stdenvNoCC.mkDerivation {
|
||||
pname = "revolt-desktop";
|
||||
version = "1.0.6";
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
meta = with lib; {
|
||||
description = "Open source user-first chat platform";
|
||||
homepage = "https://revolt.chat/";
|
||||
changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [
|
||||
heyimnova
|
||||
caralice
|
||||
];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "revolt-desktop";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
}).overrideAttrs
|
||||
(
|
||||
final: prev:
|
||||
let
|
||||
inherit (prev) pname version;
|
||||
in
|
||||
if stdenvNoCC.isLinux then
|
||||
{
|
||||
src = fetchurl {
|
||||
url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage";
|
||||
sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit (final) src pname version; };
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/{applications,revolt-desktop}
|
||||
|
||||
cp -a ${final.appimageContents}/{locales,resources} $out/share/${pname}
|
||||
cp -a ${final.appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop
|
||||
cp -a ${final.appimageContents}/usr/share/icons $out/share/icons
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
|
||||
'';
|
||||
}
|
||||
else
|
||||
assert stdenvNoCC.isDarwin;
|
||||
{
|
||||
src = fetchzip {
|
||||
url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-${version}-mac.zip";
|
||||
hash = "sha256-XxmKcIfJtHfi6SahrRHMeTAuyVqiN9Yhayjis10vD2w=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/Applications/" "$out/bin/"
|
||||
mv Revolt.app "$out/Applications/"
|
||||
makeWrapper "$out/Applications/Revolt.app/Contents/MacOS/Revolt" "$out/bin/${pname}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
)
|
||||
@ -8,14 +8,14 @@
|
||||
, mpfr
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SP800-90B_EntropyAssessment";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sp800-90b-entropyassessment";
|
||||
version = "1.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usnistgov";
|
||||
repo = "SP800-90B_EntropyAssessment";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KZQ7kC0PbBkjLEQZIqYakQ91OvCxruhdfUwiRHtno3w=";
|
||||
};
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
--replace "-march=native" ""
|
||||
'';
|
||||
|
||||
sourceRoot = "${src.name}/cpp";
|
||||
sourceRoot = "${finalAttrs.src.name}/cpp";
|
||||
|
||||
makeFlags = [
|
||||
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
||||
@ -47,4 +47,4 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.nistSoftware;
|
||||
maintainers = with lib.maintainers; [ orichter thillux ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@ -4,16 +4,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tiny-dfr";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WhatAmISupposedToPutHere";
|
||||
repo = "tiny-dfr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oawKYrfXAQ5RFMdUCG7F12wHcnFif++44s2KsX9ns6U=";
|
||||
hash = "sha256-LH6r0HeUJ69Q98WlWjsl5ASHjcxGfD9bYjSy6fw/UJM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QOkztErJLFXPxCb8MvaXi7jGXeI5A0q8LwZtYddzUZE=";
|
||||
cargoHash = "sha256-3bFtfDSm27gDAmIkvxYyJoPtcuKYkPH3vK9V5rJ4O0c=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "1.0-unstable-2024-06-14";
|
||||
version = "1.0-unstable-2024-06-15";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "07112d8f264ecb423a9cadf403c224a8a0eac3cb";
|
||||
hash = "sha256-AMqMeiJsRsoZKOEZVLojgeaaUiyulacwiNFIKUCwhFk=";
|
||||
rev = "1c74aa173147b19135f1bf21af5fb30f9b76e02d";
|
||||
hash = "sha256-xhMXDAc/laQKZtYBFvFSyVtJv5AkvugV8olHmB6Mt4g=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "projects" ];
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vacuum-go";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daveshanley";
|
||||
repo = "vacuum";
|
||||
# using refs/tags because simple version gives: 'the given path has multiple possibilities' error
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YQJKmLhxBnU6gKbhnzVAF53N1qS0/DQjjuOj8g6y+vo=";
|
||||
hash = "sha256-hIvQZQk9FwddqAQl7GjZ0zMa41j59LGHZ3eL9MRw7wg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OhdN4/fNbXa5ZMakdf370rqyDlCVYjJ1IfeV6hEwcv4=";
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zfind";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laktak";
|
||||
repo = "zfind";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Nc7C0aauv/SChChAtyA089y6qTuaC9ClVz/u5QgJLPk=";
|
||||
hash = "sha256-CHudSfvl+YnKjvvuSH0RgIqF2bDEO1KW3oAiNN2mLro=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WF5jeTeTK99MRNrIW80jYuyH60Rc/EVBW6owUCIyosE=";
|
||||
vendorHash = "sha256-blq0/pRppdf2jcuhIqYeNhcazFNZOGeEjPTSLgHqhrU=";
|
||||
|
||||
ldflags = [
|
||||
"-X"
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sudo-font";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
|
||||
hash = "sha256-8ucMeKbnrYtk2/ZeYxzp8MA4Ss952/opD8GpB01Ze/I=";
|
||||
hash = "sha256-PlsS+i/NcIMayDP6GVTDI+BLVgPSUdanlXQ8cCSXIzM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (self: {
|
||||
pname = "alacritty-theme";
|
||||
version = "0-unstable-2024-05-03";
|
||||
version = "0-unstable-2024-06-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = "alacritty-theme";
|
||||
rev = "94e1dc0b9511969a426208fbba24bd7448493785";
|
||||
hash = "sha256-bPup3AKFGVuUC8CzVhWJPKphHdx0GAc62GxWsUWQ7Xk=";
|
||||
rev = "a4041aeea19d425b63f7ace868917da26aa189bd";
|
||||
hash = "sha256-A5Xlu6kqB04pbBWMi2eL+pp6dYi4MzgZdNVKztkJhcg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nelua";
|
||||
version = "0-unstable-2024-06-11";
|
||||
version = "0-unstable-2024-06-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edubart";
|
||||
repo = "nelua-lang";
|
||||
rev = "c344dbdcdc4a6fed964e60fbde39d1cebe23c05a";
|
||||
hash = "sha256-goNiw/JlLJfgwVI+0dfdnBymAAKCU7u0Mjo1CyCFsSc=";
|
||||
rev = "4b2c75f8fe5c1d11a966b2fe8974a256868749a6";
|
||||
hash = "sha256-98QKg9eKBDEobmARpH3FAS2C32iViSsBs71n1E8uI2s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "c-blosc2";
|
||||
version = "2.14.3";
|
||||
version = "2.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blosc";
|
||||
repo = "c-blosc2";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-0rizBygyNW9Sr7qnQZoN/Wv2ZIAYuJTQ5tkW6iwIw7Y=";
|
||||
sha256 = "sha256-XVxui3+IoygjU0I688Mtbof/kHLzpb0HMcVPbt3i7PQ=";
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/144170
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coin";
|
||||
version = "unstable-2022-07-27";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin3d";
|
||||
repo = "coin";
|
||||
rev = "4c67945a58d2a6e5adb4d2332ab08007769130ef";
|
||||
hash = "sha256-lXS7GxtoPsZe2SJfr0uY99Q0ZtYG0KFlauY1PBuFleo=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tBegPZQme5McC0HGvjjdIBQQl59Ud4aJk2hONWMzEdc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -25,8 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
boost
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
];
|
||||
] ++ lib.optional stdenv.isLinux libX11;
|
||||
|
||||
cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ];
|
||||
|
||||
@ -36,6 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "coin-config";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ gebner viric ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libcs50";
|
||||
version = "11.0.2";
|
||||
version = "11.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cs50";
|
||||
repo = "libcs50";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-A4CEU5wfwykVTDIsKZnQ8co+6RwBGYGZEZxRFzQTKBI=";
|
||||
hash = "sha256-G6QayPGR4lkeFuUYsFszekLAzzpA3hhIRmqt/OB0cdY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir $out
|
||||
cp -R build/lib $out/lib
|
||||
cp -R build/include $out/include
|
||||
ln -sf $out/lib/libcs50.so.11.0.2 $out/lib/libcs50.so.11
|
||||
ln -sf $out/lib/libcs50.so.11.0.3 $out/lib/libcs50.so.11
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -1,51 +1,68 @@
|
||||
{
|
||||
lib, stdenv,
|
||||
cmake,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
boost,
|
||||
fetchpatch,
|
||||
xercesc,
|
||||
icu,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libe57format";
|
||||
version = "2.2.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asmaloney";
|
||||
repo = "libE57Format";
|
||||
rev = "v${version}";
|
||||
sha256 = "15l23spjvak5h3n7aj3ggy0c3cwcg8mvnc9jlbd9yc2ra43bx7bp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-bOuWh9Nkxva2v0M6+vnAya8EW/G3WQePxHakQt8T9NE=";
|
||||
fetchSubmodules = true; # for submodule-vendored libraries such as `gtest`
|
||||
};
|
||||
|
||||
# Repository of E57 files used for testing.
|
||||
libE57Format-test-data_src = fetchFromGitHub {
|
||||
owner = "asmaloney";
|
||||
repo = "libE57Format-test-data";
|
||||
rev = "4960564a732c6444c50dfae5b2273e68837399cd";
|
||||
hash = "sha256-k26yVbYSQJ3EMgcpjm35N1OAxarFmfMvzfTN2Hdyu8c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# gcc11 header fix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/asmaloney/libE57Format/commit/13f6a16394ce3eb50ea4cd21f31f77f53294e8d0.patch";
|
||||
sha256 = "sha256-4vVhKrCxnWO106DSAk+xxo4uk6zC89m9VQAPaDJ8Ed4=";
|
||||
})
|
||||
];
|
||||
CXXFLAGS = [
|
||||
# GCC 13: error: 'int16_t' has not been declared in 'std'
|
||||
"-include cstdint"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# TODO: Remove with the next release: https://github.com/asmaloney/libE57Format/pull/299
|
||||
(fetchpatch {
|
||||
name = "libE57Format-Dont-force-warnings-as-errors-when-building-self.patch"; # https://github.com/apache/thrift/pull/2726
|
||||
url = "https://github.com/asmaloney/libE57Format/commit/66bb5af15937b4c10a7f412ca4d1673f42bbad28.patch";
|
||||
hash = "sha256-2cNURjMLP0TijYY5gbuWLE7H/PlMW936wAeOqJ/w9C0=";
|
||||
})
|
||||
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
icu
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# Necessary for projects that try to find libE57Format via CMake
|
||||
# due to the way that libe57format's CMake config is written.
|
||||
xercesc
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# See https://github.com/asmaloney/libE57Format/blob/9372bdea8db2cc0c032a08f6d655a53833d484b8/test/README.md
|
||||
(if finalAttrs.doCheck
|
||||
then "-DE57_TEST_DATA_PATH=${finalAttrs.libE57Format-test-data_src}"
|
||||
else "-DE57_BUILD_TEST=OFF"
|
||||
)
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postCheck = ''
|
||||
./testE57
|
||||
'';
|
||||
|
||||
# The build system by default builds ONLY static libraries, and with
|
||||
# `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see:
|
||||
# https://github.com/asmaloney/libE57Format/issues/48
|
||||
@ -70,4 +87,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ chpatrick nh2 ];
|
||||
platforms = platforms.linux; # because of the .so buiding in `postInstall` above
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -215,18 +215,26 @@ let
|
||||
# save-lisp-and-die binaries in the past
|
||||
dontStrip = true;
|
||||
|
||||
} // (args // {
|
||||
} // (args // (let
|
||||
isJVM = args.pkg.pname == "abcl";
|
||||
javaLibs = lib.optionals isJVM args.javaLibs or [];
|
||||
in {
|
||||
pname = "${args.pkg.pname}-${args.pname}";
|
||||
src = if builtins.length (args.patches or []) > 0
|
||||
then pkgs.applyPatches { inherit (args) src patches; }
|
||||
src = if args?patches || args?postPatch
|
||||
then pkgs.applyPatches {
|
||||
inherit (args) src;
|
||||
patches = args.patches or [];
|
||||
postPatch = args.postPatch or "";
|
||||
}
|
||||
else args.src;
|
||||
patches = [];
|
||||
inherit javaLibs;
|
||||
propagatedBuildInputs = args.propagatedBuildInputs or []
|
||||
++ lispLibs ++ javaLibs ++ nativeLibs;
|
||||
meta = (args.meta or {}) // {
|
||||
maintainers = args.meta.maintainers or lib.teams.lisp.members;
|
||||
};
|
||||
})) // {
|
||||
}))) // {
|
||||
# Useful for overriding
|
||||
# Overriding code would prefer to use pname from the attribute set
|
||||
# However, pname is extended with the implementation name
|
||||
|
||||
@ -43,46 +43,12 @@ let
|
||||
src = build;
|
||||
});
|
||||
|
||||
# A little hacky
|
||||
isJVM = spec.pkg.pname == "abcl";
|
||||
|
||||
# Makes it so packages imported from Quicklisp can be re-used as
|
||||
# lispLibs ofpackages in this file.
|
||||
ql = quicklispPackagesFor spec;
|
||||
|
||||
packages = ql.overrideScope (self: super: {
|
||||
|
||||
cffi = let
|
||||
jna = pkgs.fetchMavenArtifact {
|
||||
groupId = "net.java.dev.jna";
|
||||
artifactId = "jna";
|
||||
version = "5.9.0";
|
||||
sha256 = "0qbis8acv04fi902qzak1mbagqaxcsv2zyp7b8y4shs5nj0cgz7a";
|
||||
};
|
||||
in build-asdf-system {
|
||||
src = pkgs.fetchzip {
|
||||
url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz";
|
||||
sha256 = "17ryim4xilb1rzxydfr7595dnhqkk02lmrbkqrkvi9091shi4cj3";
|
||||
};
|
||||
version = "0.24.1";
|
||||
pname = "cffi";
|
||||
lispLibs = with super; [
|
||||
alexandria
|
||||
babel
|
||||
trivial-features
|
||||
];
|
||||
javaLibs = optionals isJVM [ jna ];
|
||||
};
|
||||
|
||||
cffi-libffi = build-asdf-system {
|
||||
inherit (super.cffi-libffi) pname version asds lispLibs nativeLibs nativeBuildInputs;
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/cffi/cffi/archive/3f842b92ef808900bf20dae92c2d74232c2f6d3a.tar.gz";
|
||||
sha256 = "1jilvmbbfrmb23j07lwmkbffc6r35wnvas5s4zjc84i856ccclm2";
|
||||
};
|
||||
patches = optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ];
|
||||
};
|
||||
|
||||
cl-environments = super.cl-environments.overrideLispAttrs (old: {
|
||||
patches = old.patches or [] ++ [
|
||||
# Needed because SB-INT:TRULY-DYNAMIC-EXTENT has been removed since sbcl 2.3.10.
|
||||
@ -95,19 +61,27 @@ let
|
||||
});
|
||||
|
||||
cl-unicode = build-with-compile-into-pwd {
|
||||
pname = "cl-unicode";
|
||||
version = "0.1.6";
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/edicl/cl-unicode/archive/refs/tags/v0.1.6.tar.gz";
|
||||
sha256 = "0ykx2s9lqfl74p1px0ik3l2izd1fc9jd1b4ra68s5x34rvjy0hza";
|
||||
};
|
||||
systems = [ "cl-unicode" ];
|
||||
lispLibs = with super; [
|
||||
cl-ppcre
|
||||
flexi-streams
|
||||
];
|
||||
inherit (super.cl-unicode) pname version src systems;
|
||||
lispLibs = super.cl-unicode.lispLibs ++ [ self.flexi-streams ];
|
||||
};
|
||||
|
||||
dissect = super.dissect.overrideAttrs {
|
||||
version = "1.0.0-trunk";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Shinmera";
|
||||
repo = "dissect";
|
||||
rev = "a70cabcd748cf7c041196efd711e2dcca2bbbb2c";
|
||||
hash = "sha256-WXv/jbokgKJTc47rBjvOF5npnqDlsyr8oSXIzN/7ofo=";
|
||||
};
|
||||
};
|
||||
|
||||
cl-gobject-introspection = super.cl-gobject-introspection.overrideLispAttrs (o: {
|
||||
postPatch = ''
|
||||
substituteInPlace src/init.lisp \
|
||||
--replace sb-ext::set-floating-point-modes sb-int:set-floating-point-modes
|
||||
'';
|
||||
});
|
||||
|
||||
jzon = super.com_dot_inuoe_dot_jzon;
|
||||
|
||||
cl-notify = build-asdf-system {
|
||||
@ -129,19 +103,10 @@ let
|
||||
inherit (super.cl-liballegro-nuklear) pname version src;
|
||||
nativeBuildInputs = [ pkgs.allegro5 ];
|
||||
nativeLibs = [ pkgs.allegro5 ];
|
||||
lispLibs = super.cl-liballegro-nuklear.lispLibs ++ [ super.cl-liballegro ];
|
||||
lispLibs = super.cl-liballegro-nuklear.lispLibs ++ [ self.cl-liballegro ];
|
||||
patches = [ ./patches/cl-liballegro-nuklear-missing-dll.patch ];
|
||||
};
|
||||
|
||||
tuple = build-asdf-system {
|
||||
pname = "tuple";
|
||||
version = "b74bd067d";
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://fossil.galkowski.xyz/tuple/tarball/b74bd067d4533ac0/tuple.tar.gz";
|
||||
sha256 = "0dk356vkv6kwwcmc3j08x7143549m94rd66rpkzq8zkb31cg2va8";
|
||||
};
|
||||
};
|
||||
|
||||
lessp = build-asdf-system {
|
||||
pname = "lessp";
|
||||
version = "0.2-f8a9e4664";
|
||||
@ -167,7 +132,7 @@ let
|
||||
url = "https://beta.quicklisp.org/archive/cl-facts/2022-11-06/cl-facts-20221106-git.tgz";
|
||||
sha256 = "sha256-PBpyyJYkq1NjKK9VikSAL4TmrGRwUJlEWRSeKj/f4Sc=";
|
||||
};
|
||||
lispLibs = [ self.lessp self.rollback ] ++ [ super.local-time ];
|
||||
lispLibs = [ self.lessp self.rollback self.local-time ];
|
||||
};
|
||||
|
||||
cl-fuse = build-with-compile-into-pwd {
|
||||
@ -178,18 +143,43 @@ let
|
||||
|
||||
cl-containers = build-asdf-system {
|
||||
inherit (super.cl-containers) pname version src;
|
||||
lispLibs = super.cl-containers.lispLibs ++ [ super.moptilities ];
|
||||
lispLibs = super.cl-containers.lispLibs ++ [ self.moptilities ];
|
||||
systems = [ "cl-containers" "cl-containers/with-moptilities" ];
|
||||
};
|
||||
|
||||
swank = build-with-compile-into-pwd {
|
||||
inherit (super.swank) pname version src lispLibs;
|
||||
swank = build-with-compile-into-pwd rec {
|
||||
inherit (super.swank) pname lispLibs;
|
||||
version = "2.29.1";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "slime";
|
||||
repo = "slime";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5hNB5XxbTER4HX3dn4umUGnw6UeiTQkczmggFz4uWoE=";
|
||||
};
|
||||
systems = [ "swank" "swank/exts" ];
|
||||
patches = [ ./patches/swank-pure-paths.patch ];
|
||||
postConfigure = ''
|
||||
substituteAllInPlace swank-loader.lisp
|
||||
'';
|
||||
};
|
||||
|
||||
slynk = build-asdf-system {
|
||||
pname = "slynk";
|
||||
version = "trunk";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "joaotavora";
|
||||
repo = "sly";
|
||||
rev = "ba40c8f054ec3b7040a6c36a1ef3e9596b936421";
|
||||
hash = "sha256-hoaCZtyezuXptDPnAvBTT0SZ14M9Ifrmki3beBOwFmI=";
|
||||
};
|
||||
systems = [
|
||||
"slynk" "slynk/arglists" "slynk/fancy-inspector"
|
||||
"slynk/package-fu" "slynk/mrepl" "slynk/trace-dialog"
|
||||
"slynk/profiler" "slynk/stickers" "slynk/indentation"
|
||||
"slynk/retro"
|
||||
];
|
||||
};
|
||||
|
||||
cephes = build-with-compile-into-pwd {
|
||||
inherit (super.cephes) pname version src lispLibs;
|
||||
patches = [ ./patches/cephes-make.patch ];
|
||||
@ -205,7 +195,7 @@ let
|
||||
url = "http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz";
|
||||
sha256 = "079hyp92cjkdfn6bhkxsrwnibiqbz4y4af6nl31lzw6nm91j5j37";
|
||||
};
|
||||
lispLibs = with super; [
|
||||
lispLibs = with self; [
|
||||
alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf
|
||||
cl-store cl-vectors clx trivial-features zpb-ttf
|
||||
];
|
||||
@ -241,14 +231,14 @@ let
|
||||
lispLibs = [
|
||||
self.cl-containers
|
||||
self.nclasses
|
||||
super.alexandria
|
||||
super.calispel
|
||||
super.closer-mop
|
||||
super.lparallel
|
||||
super.moptilities
|
||||
super.serapeum
|
||||
super.str
|
||||
super.trivial-package-local-nicknames
|
||||
self.alexandria
|
||||
self.calispel
|
||||
self.closer-mop
|
||||
self.lparallel
|
||||
self.moptilities
|
||||
self.serapeum
|
||||
self.str
|
||||
self.trivial-package-local-nicknames
|
||||
];
|
||||
|
||||
};
|
||||
@ -262,7 +252,7 @@ let
|
||||
rev = version;
|
||||
sha256 = "sha256-kw5DD0GJp/TeCiYATBY8GL8UKqYS6Q4j0a0eQsdcZRc=";
|
||||
};
|
||||
lispLibs = [ super.cl-json super.com_dot_inuoe_dot_jzon];
|
||||
lispLibs = [ self.cl-json self.com_dot_inuoe_dot_jzon];
|
||||
systems = [ "njson" "njson/cl-json" "njson/jzon"];
|
||||
};
|
||||
|
||||
@ -275,7 +265,7 @@ let
|
||||
rev = version;
|
||||
sha256 = "sha256-psk29WEA7Hxgp29oUniBNvI+lyZfMkdpa5A7okc6kKs=";
|
||||
};
|
||||
lispLibs = [ super.closer-mop ];
|
||||
lispLibs = [ self.closer-mop ];
|
||||
systems = [ "nsymbols" "nsymbols/star" ];
|
||||
|
||||
};
|
||||
@ -289,7 +279,7 @@ let
|
||||
rev = version;
|
||||
sha256 = "sha256-foXmaLxMYMFieB2Yd2iPsU4EX5kLXq7kyElqGZ47OgI=";
|
||||
};
|
||||
lispLibs = [ super.moptilities ];
|
||||
lispLibs = [ self.moptilities ];
|
||||
};
|
||||
|
||||
nfiles = build-asdf-system rec {
|
||||
@ -303,13 +293,13 @@ let
|
||||
};
|
||||
lispLibs = [
|
||||
self.nclasses
|
||||
super.quri
|
||||
super.alexandria
|
||||
super.iolib
|
||||
super.serapeum
|
||||
super.trivial-garbage
|
||||
super.trivial-package-local-nicknames
|
||||
super.trivial-types
|
||||
self.quri
|
||||
self.alexandria
|
||||
self.iolib
|
||||
self.serapeum
|
||||
self.trivial-garbage
|
||||
self.trivial-package-local-nicknames
|
||||
self.trivial-types
|
||||
];
|
||||
};
|
||||
|
||||
@ -361,7 +351,7 @@ let
|
||||
pname = "nyxt";
|
||||
version = "3.11.6";
|
||||
|
||||
lispLibs = (with super; [
|
||||
lispLibs = (with self; [
|
||||
alexandria
|
||||
bordeaux-threads
|
||||
calispel
|
||||
@ -407,44 +397,12 @@ let
|
||||
cl-cffi-gtk
|
||||
quri
|
||||
sqlite
|
||||
# TODO: Remove these overrides after quicklisp updates past the June 2023 release
|
||||
(trivial-clipboard.overrideAttrs (final: prev: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "snmsts";
|
||||
repo = "trivial-clipboard";
|
||||
rev = "f7b2c96fea00ca06a83f20b00b7b1971e76e03e7";
|
||||
sha256 = "sha256-U6Y9BiM2P1t9P8fdX8WIRQPRWl2v2ZQuKdP1IUqvOAk=";
|
||||
};}))
|
||||
(cl-gobject-introspection.overrideAttrs (final: prev: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "andy128k";
|
||||
repo = "cl-gobject-introspection";
|
||||
rev = "4908a84c16349929b309c50409815ff81fb9b3c4";
|
||||
sha256 = "sha256-krVU5TQsVAbglxXMq29WJriWBIgQDLy1iCvB5iNziEc=";
|
||||
};}))
|
||||
(cl-webkit2.overrideAttrs (final: prev: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "joachifm";
|
||||
repo = "cl-webkit";
|
||||
rev = "66fd0700111586425c9942da1694b856fb15cf41";
|
||||
sha256 = "sha256-t/B9CvQTekEEsM/ZEp47Mn6NeZaTYFsTdRqclfX9BNg=";
|
||||
};
|
||||
}))
|
||||
(slynk.overrideAttrs (final: prev: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "joaotavora";
|
||||
repo = "sly";
|
||||
rev = "9c43bf65b967e12cef1996f1af5f0671d8aecbf4";
|
||||
hash = "sha256-YlHZ/7VwvHe2PBPRshN+Gr3WuGK9MpkOJprP6QXI3pY=";
|
||||
};
|
||||
systems = [ "slynk" "slynk/arglists" "slynk/fancy-inspector"
|
||||
"slynk/package-fu" "slynk/mrepl" "slynk/trace-dialog"
|
||||
"slynk/profiler" "slynk/stickers" "slynk/indentation"
|
||||
"slynk/retro" ];
|
||||
}))
|
||||
trivial-clipboard
|
||||
cl-gobject-introspection
|
||||
cl-webkit2
|
||||
slynk
|
||||
iterate
|
||||
symbol-munger
|
||||
]) ++ (with self; [
|
||||
history-tree
|
||||
nhooks
|
||||
nkeymaps
|
||||
@ -455,16 +413,7 @@ let
|
||||
nclasses
|
||||
nfiles
|
||||
cl-containers
|
||||
# remove this override after quicklisp one is updated.
|
||||
(swank.overrideAttrs (final: prev: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "slime";
|
||||
repo = "slime";
|
||||
rev = "v2.29.1";
|
||||
hash = "sha256-5hNB5XxbTER4HX3dn4umUGnw6UeiTQkczmggFz4uWoE=";
|
||||
};
|
||||
systems = [ "swank" "swank/exts" ];
|
||||
}))
|
||||
swank
|
||||
]);
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
@ -579,15 +528,6 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
ltk = super.ltk.overrideLispAttrs (o: {
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz";
|
||||
sha256 = "0mzikv4abq9yqlj6dsji1wh34mjizr5prv6mvzzj29z1485fh1bj";
|
||||
};
|
||||
version = "f19162e76";
|
||||
});
|
||||
|
||||
|
||||
magicl = build-with-compile-into-pwd {
|
||||
inherit (super.magicl) pname version src lispLibs;
|
||||
nativeBuildInputs = [ pkgs.gfortran ];
|
||||
@ -604,7 +544,7 @@ let
|
||||
rev = "84b128192d6b11cf03f1150e474a23368f07edff";
|
||||
hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
|
||||
};
|
||||
lispLibs = with super; [
|
||||
lispLibs = with self; [
|
||||
cl-gobject-introspection-wrapper
|
||||
bordeaux-threads
|
||||
];
|
||||
@ -619,7 +559,7 @@ let
|
||||
rev = "84b128192d6b11cf03f1150e474a23368f07edff";
|
||||
hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
|
||||
};
|
||||
lispLibs = with super; [
|
||||
lispLibs = with self; [
|
||||
cl-gobject-introspection-wrapper
|
||||
];
|
||||
};
|
||||
@ -633,9 +573,11 @@ let
|
||||
rev = "e18f621b996fd986d9829d590203c690440dee64";
|
||||
hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
|
||||
};
|
||||
lispLibs = with super; [
|
||||
lispLibs = with self; [
|
||||
cl-gobject-introspection-wrapper
|
||||
] ++ [ self.cl-glib self.cl-glib_dot_gio ];
|
||||
cl-glib
|
||||
cl-glib_dot_gio
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkgs.gobject-introspection
|
||||
pkgs.gtk4
|
||||
@ -654,9 +596,10 @@ let
|
||||
rev = "e18f621b996fd986d9829d590203c690440dee64";
|
||||
hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
|
||||
};
|
||||
lispLibs = with super; [
|
||||
lispLibs = with self; [
|
||||
cl-gobject-introspection-wrapper
|
||||
] ++ [ self.cl-gtk4 ];
|
||||
cl-gtk4
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkgs.libadwaita
|
||||
];
|
||||
@ -674,9 +617,10 @@ let
|
||||
rev = "e18f621b996fd986d9829d590203c690440dee64";
|
||||
hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
|
||||
};
|
||||
lispLibs = with super; [
|
||||
lispLibs = with self; [
|
||||
cl-gobject-introspection-wrapper
|
||||
] ++ [ self.cl-gtk4 ];
|
||||
cl-gtk4
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkgs.webkitgtk_6_0
|
||||
];
|
||||
@ -696,7 +640,7 @@ let
|
||||
rev = "7d624253e98afb987a01729bd72c99bae02f0d7d";
|
||||
hash = "sha256-AlTn+Q1gKnAFEfcnz9+VeHz681pPIirg2za3VXYiNWk=";
|
||||
};
|
||||
lispLibs = with super; [
|
||||
lispLibs = with self; [
|
||||
alexandria
|
||||
babel
|
||||
chipz
|
||||
@ -786,7 +730,7 @@ let
|
||||
sha256 = "sha256-J08bU9HSVbzEivYtQsyIYPZJTrugj+jJSa4LglS0Olg=";
|
||||
};
|
||||
systems = [ "eu.turtleware.polyclot" "eu.turtleware.polyclot/demo" ];
|
||||
lispLibs = with super; [ clim mcclim mcclim-layouts ];
|
||||
lispLibs = with self; [ clim mcclim mcclim-layouts ];
|
||||
};
|
||||
|
||||
kons-9 = build-asdf-system rec {
|
||||
@ -799,7 +743,7 @@ let
|
||||
sha256 = "19rl7372j9f1cv2kl55r8vyf4dhcz4way4hkjgysbxzrb1psp17n";
|
||||
};
|
||||
systems = [ "kons-9" "kons-9/testsuite" ];
|
||||
lispLibs = with super; [
|
||||
lispLibs = with self; [
|
||||
closer-mop trivial-main-thread trivial-backtrace cffi cl-opengl cl-glu
|
||||
cl-glfw3 cl-paths-ttf zpb-ttf cl-vectors origin clobber
|
||||
org_dot_melusina_dot_confidence
|
||||
@ -815,7 +759,7 @@ let
|
||||
rev = "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094";
|
||||
sha256 = "sha256-iBM+VXu6JRqGmeIFzfXbGot+elvangmfSpDB7DjFpPg";
|
||||
};
|
||||
lispLibs = [ super.alexandria ];
|
||||
lispLibs = [ self.alexandria ];
|
||||
};
|
||||
|
||||
nsb-cga = super.nsb-cga.overrideLispAttrs (oa: {
|
||||
@ -833,7 +777,7 @@ let
|
||||
hash = "sha256-j9iT25Yz9Z6llCKwwiHlVNKLqwuKvY194LrAzXuljsE=";
|
||||
};
|
||||
|
||||
lispLibs = with super; [
|
||||
lispLibs = with self; [
|
||||
archive
|
||||
deflate
|
||||
dexador
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, lib, build-asdf-system, ... }:
|
||||
{ pkgs, lib, stdenv, build-asdf-system, ... }:
|
||||
|
||||
let
|
||||
|
||||
@ -73,9 +73,20 @@ let
|
||||
lla = super.lla.overrideLispAttrs (o: {
|
||||
nativeLibs = [ pkgs.openblas ];
|
||||
});
|
||||
cffi = super.cffi.overrideLispAttrs (o: {
|
||||
javaLibs = [
|
||||
(pkgs.fetchMavenArtifact {
|
||||
groupId = "net.java.dev.jna";
|
||||
artifactId = "jna";
|
||||
version = "5.9.0";
|
||||
sha256 = "0qbis8acv04fi902qzak1mbagqaxcsv2zyp7b8y4shs5nj0cgz7a";
|
||||
})
|
||||
];
|
||||
});
|
||||
cffi-libffi = super.cffi-libffi.overrideLispAttrs (o: {
|
||||
nativeBuildInputs = [ pkgs.libffi ];
|
||||
nativeLibs = [ pkgs.libffi ];
|
||||
patches = lib.optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ];
|
||||
});
|
||||
cl-rabbit = super.cl-rabbit.overrideLispAttrs (o: {
|
||||
nativeBuildInputs = [ pkgs.rabbitmq-c ];
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansi2html";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XGg3oT7MGQOqt6VFNTMSBJ3+3+UQU2KtOo2dIHhx7HE=";
|
||||
hash = "sha256-NFO/h1NdN7gnsFJF+qp1bbq07D1pkl41K2MZw8lVwKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lion-pytorch";
|
||||
version = "0.1.4";
|
||||
version = "0.2.2";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "lucidrains";
|
||||
repo = "lion-pytorch";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8LbALBKQ5ACwmLWYUz3GYkkkhhy8emi6n3kgwYdnDSI=";
|
||||
hash = "sha256-hOPTuXdTrTi/Thv3/5IYqkgH+5cFdzyK1Fshus8u5n0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ torch ];
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.128.1";
|
||||
version = "2.128.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Df8DwzB/pOyixBS5dx9MeBa8IsZw/8q1Dk8itmsHGSM=";
|
||||
hash = "sha256-AT4jE4apkZ0uK1Z03nVnMN9CS5uiMwPNsarq7pY+Pnw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyscf";
|
||||
version = "2.6.0";
|
||||
version = "2.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyscf";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-y1RQKxFfhOC6+vUMJiXexaZeYZhav5t30XP7jooJ//0=";
|
||||
hash = "sha256-gudkKhC5Cpd6ZM9mJ1SfemqmwDqhDmpAfYE8XGFpzmA=";
|
||||
};
|
||||
|
||||
# setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake.
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "recline";
|
||||
version = "2023.5";
|
||||
version = "2024.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NetApp";
|
||||
repo = "recline";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jsWOPkzhN4D+Q/lK5yWg1kTgFkmOEIQY8O7oAXq5Nak=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-wVUM5vkavdLDtwRlbtVlVaBOXX+7tcB+SxYe1jZdq9I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "redshift-connector";
|
||||
version = "2.1.0";
|
||||
version = "2.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "aws";
|
||||
repo = "amazon-redshift-python-driver";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EYJFJbeYUW/vCD46sm5CLeyINL/hcF7IA2myuVmqFaY=";
|
||||
hash = "sha256-sQRnnibkuA+Ejk6TDxDSdtIkkW7CMafYh9zQ/xtuCV4=";
|
||||
};
|
||||
|
||||
# remove addops as they add test directory and coverage parameters to pytest
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "timezonefinder";
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "jannikmi";
|
||||
repo = "timezonefinder";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-KVjAK4r+cRrX7U6MT0P7hH/TX6kMDv2DaSa456YG4sA=";
|
||||
hash = "sha256-2vQk7aSsyyh3mN1l4A5Y5yASJ2V7e4fegsOExGwyhGA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -160,9 +160,9 @@ rec {
|
||||
# https://docs.gradle.org/current/userguide/compatibility.html
|
||||
|
||||
gradle_8 = gen {
|
||||
version = "8.7";
|
||||
nativeVersion = "0.22-milestone-25";
|
||||
hash = "sha256-VEw11r2Emuil7QvOo5umd9xA9J330YNVYVgtogCblh0=";
|
||||
version = "8.8";
|
||||
nativeVersion = "0.22-milestone-26";
|
||||
hash = "sha256-pLQVhgH4Y2ze6rCb12r7ZAAwu1sUSq/iYaXorwJ9xhI=";
|
||||
defaultJava = jdk21;
|
||||
};
|
||||
|
||||
|
||||
@ -47,6 +47,7 @@ do
|
||||
|
||||
url="https://services.gradle.org/distributions/gradle-${v}-bin.zip"
|
||||
read -d "\n" gradle_hash gradle_path < <(nix-prefetch-url --print-path $url)
|
||||
gradle_hash=$(nix-hash --to-sri --type sha256 "$gradle_hash")
|
||||
|
||||
# Prefix and suffix for "native-platform" dependency.
|
||||
gradle_native_prefix="gradle-$v/lib/native-platform-"
|
||||
|
||||
@ -7,8 +7,12 @@
|
||||
, openssl
|
||||
, withTTS ? false
|
||||
, speechd
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
CoreAudio AudioUnit AVFoundation AppKit;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "blightmud";
|
||||
version = "5.3.0";
|
||||
@ -17,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e9Uo0IJYL9/6/nNL27zfUYnsTwDaOJOcR2CY6t++jDE=";
|
||||
hash = "sha256-e9Uo0IJYL9/6/nNL27zfUYnsTwDaOJOcR2CY6t++jDE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QSgTpmSojZrwZ0RsUL6c2xO310RZX3gkyGl6oNf6pYI=";
|
||||
@ -26,7 +30,11 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
|
||||
buildInputs = [ alsa-lib openssl ] ++ lib.optionals withTTS [ speechd ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals (withTTS && stdenv.isLinux) [ speechd ]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib ]
|
||||
++ lib.optionals (withTTS && stdenv.isDarwin) [ AVFoundation AppKit ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreAudio AudioUnit ];
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
@ -44,6 +52,9 @@ rustPlatform.buildRustPackage rec {
|
||||
"timer_test"
|
||||
"validate_assertion_fail"
|
||||
"regex_smoke_test"
|
||||
"test_tls_init_verify_err"
|
||||
"test_tls_init_no_verify"
|
||||
"test_tls_init_verify"
|
||||
];
|
||||
skipFlag = test: "--skip " + test;
|
||||
in
|
||||
@ -64,6 +75,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/Blightmud/Blightmud";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ cpu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,11 +64,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeipa";
|
||||
version = "4.12.0";
|
||||
version = "4.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz";
|
||||
sha256 = "sha256-FEDGPhgxr5kV8BeeM10C92yLbZPE7KGPmUUwyvZCkQA=";
|
||||
sha256 = "sha256-SPZ+QgssDKG1Hz1oqtVdg864qtcvncuOlzTWjN4+loM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "0.12.0-unstable-2024-06-05";
|
||||
version = "0.12.0-unstable-2024-06-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "49c0ad6369670da574f550aa878ce9f6e1899e74";
|
||||
sha256 = "sha256-9kzOIv5FS0+FqgrMD2rtWoX1ZbidOfrh6pOalru8HWo=";
|
||||
rev = "6d70050261ec3290f3c2e4015438e4910fd430d0";
|
||||
sha256 = "sha256-vN1lrFM/ifcMCZfrvfK/MDLYx0qnAMgfBW9UWdyv+MY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/klippy";
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
, git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2024-06-13";
|
||||
version = "2024-06-20";
|
||||
pname = "oh-my-zsh";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
rev = "0c9b42a863778d67aee22bbd43f296110fe1f047";
|
||||
sha256 = "sha256-8ZVYN97K4KJOG+JnVpCVbMx2HGypvk7KZmwNzUfcovo=";
|
||||
rev = "a87e9c715b2d3249681f9cc8f8d9718030674d50";
|
||||
sha256 = "sha256-5eE3tBYBw8nkmmSR32SM8z0I01MSQAtIP2pEkE3bgRs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "turbovnc";
|
||||
version = "3.1";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TurboVNC";
|
||||
repo = "turbovnc";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-nMqH/jhw4GhffGYR+WGcUnF6EOFSS6HDuSKvjoCtGkk=";
|
||||
hash = "sha256-7dft5Wp9LvRy3FM/cZ5F6qUIesu7mzd/Ww8P3xsSvyI=";
|
||||
};
|
||||
|
||||
# TODO:
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.89";
|
||||
version = "2.90";
|
||||
pname = "asymptote";
|
||||
|
||||
outputs = [ "out" "man" "info" "doc" "tex" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
|
||||
hash = "sha256-9k5itO5PhfGnhkDE8eim+Y6R9U7ayrGXJ8fKvpSlf1s=";
|
||||
hash = "sha256-jGlW+4CL9EqPJJcpW0+muumMQYkrQPPuj8dYqSRwc0A=";
|
||||
};
|
||||
|
||||
# override with TeX Live containers to avoid building sty, docs from source
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grizzly";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UOUBck1GrG3ijUpE3jPaFcC/KtlObaR38u3St8NToTk=";
|
||||
hash = "sha256-f60zAE94jdJaGjn+SoO1qs3SgWRpK9pdbirRrsKKBJQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lioFmaFzqaxN1wnYJaoHA54to1xGZjaLGaqAFIfTaTs=";
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, tk
|
||||
, tcllib
|
||||
@ -6,38 +7,43 @@
|
||||
, tkremind ? true
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optionals optionalString;
|
||||
tclLibraries = optionals tkremind [ tcllib tk ];
|
||||
tkremindPatch = optionalString tkremind ''
|
||||
substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
|
||||
'';
|
||||
in
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "05.00.01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
||||
sha256 = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c=";
|
||||
hash = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = tclLibraries;
|
||||
propagatedBuildInputs = lib.optionals tkremind [ tcllib tk ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./configure \
|
||||
--replace "sleep 1" "true"
|
||||
substituteInPlace ./src/init.c \
|
||||
--replace "rkrphgvba(0);" "" \
|
||||
--replace "rkrphgvba(1);" ""
|
||||
${tkremindPatch}
|
||||
postPatch = lib.optionalString tkremind ''
|
||||
# NOTA BENE: The path to rem2pdf is replaced in tkremind for future use
|
||||
# as rem2pdf is currently not build since it requires the JSON::MaybeXS,
|
||||
# Pango and Cairo Perl modules.
|
||||
substituteInPlace scripts/tkremind \
|
||||
--replace-fail "exec wish" "exec ${lib.getBin tk}/bin/wish" \
|
||||
--replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \
|
||||
--replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \
|
||||
--replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\""
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [
|
||||
# Disable clang link time optimization until the following issue is resolved:
|
||||
# https://github.com/NixOS/nixpkgs/issues/19098
|
||||
"-fno-lto"
|
||||
# On Darwin setenv and unsetenv are defined in stdlib.h from libSystem
|
||||
"-DHAVE_SETENV"
|
||||
"-DHAVE_UNSETENV"
|
||||
]);
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dianne.skoll.ca/projects/remind/";
|
||||
description = "Sophisticated calendar and alarm program for the console";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ raskin kovirobi ];
|
||||
mainProgram = "remind";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ let
|
||||
python pytest nose3 cryptography pyyaml requests mock requests-mock
|
||||
python-dateutil setuptools;
|
||||
|
||||
version = "4.83";
|
||||
version = "4.89";
|
||||
|
||||
in
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
hash = "sha256-CaidnRd21qtPKlFMHfQMmYVz/CfN88uBC1XK3JikHf0=";
|
||||
hash = "sha256-EuLXDbJembiFFEuIihrc8KkdqxLBgT4Ib3xwkKibVS8=";
|
||||
};
|
||||
|
||||
pythonPaths = [ cryptography pyyaml requests ];
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xcp";
|
||||
version = "0.20.4";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarka";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0ucm8XBxYwXvpVJN8If8BIToQGiBisKLZJYKuvaORto=";
|
||||
hash = "sha256-RxEEbyM7wXteYteA4GmvXEraHhm+Kkr2UbYR8G0gO8c=";
|
||||
};
|
||||
|
||||
# no such file or directory errors
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-UdQUrIRos3TmebotdESvKH+90WVMJ0oTc43p+AT4xMI=";
|
||||
cargoHash = "sha256-ruL1KP3a76DRg0RqpNYz0ZL0V2Ce4v3zt9B/tXyXQs0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extended cp(1)";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ligolo-ng";
|
||||
version = "0.5.2";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tnpitsecurity";
|
||||
repo = "ligolo-ng";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pFk/9AFtnMBNi5hdVWDzfxCTFe9wSkFydHciTpMRxQw=";
|
||||
hash = "sha256-v4E1frvjOML3G6vxxYOigpC6m3sYhVxwDvbw8BwBzDk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QEGF12yJ+CQjIHx6kOwsykVhelp5npnglk7mIbOeIpI=";
|
||||
vendorHash = "sha256-LqoWkhEnsKTz384dhqNKmZrG38NHxaFx4k7zjHj51Ys=";
|
||||
|
||||
postConfigure = ''
|
||||
export CGO_ENABLED=0
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jwx";
|
||||
version = "2.0.21";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lestrrat-go";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Rg3E+7kyyzY8NqfXMH3ENWAuCxx7+3DyyarfGNI9xxE=";
|
||||
hash = "sha256-In9/RmcqiOFT1QceWls8gzgzgkBoKeUE05j0cHCecTU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HHq4B0MYP2gUtV9ywrXVmWN7OpV6NVb49rVMFblOgPc=";
|
||||
vendorHash = "sha256-ZS7xliFymXTE8hlc3GEMNonP5sJTZGirw5YQNzPCl3Y=";
|
||||
|
||||
sourceRoot = "${src.name}/cmd/jwx";
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2024.5.0";
|
||||
version = "2024.5.1";
|
||||
|
||||
bw_web_builds = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "bw_web_builds";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-di0oOM3ju3rkDVGmKpvS6sCaIXL/QGawr0TUrQjZ8dM=";
|
||||
hash = "sha256-iNSkvQn3g64pI0uY7M4S7jEiRRDAc0wlPuJevzMJ+dc=";
|
||||
};
|
||||
|
||||
in buildNpmPackage rec {
|
||||
@ -25,10 +25,10 @@ in buildNpmPackage rec {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "web-v${lib.removeSuffix "b" version}";
|
||||
hash = "sha256-kQ2tWfkkG5aifA8UGb5X1wQkGZr6dcVlrb+b78RFX/k=";
|
||||
hash = "sha256-U/lAt2HfoHGMu6mOki/4+ljhU9FwkodvFBr5zcDO8Wk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-gprJGOE/uSSM3NHpcbelB7sueObEl4o522WRHIRFmwo=";
|
||||
npmDepsHash = "sha256-ui00afmnu77CTT9gh6asc4uT7AhVIuiD60sq/1f9viA=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${bw_web_builds}/{patches,resources} ..
|
||||
|
||||
@ -1263,6 +1263,7 @@ mapAliases ({
|
||||
solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
|
||||
soundOfSorting = sound-of-sorting; # Added 2023-07-07
|
||||
soundux = throw "'soundux' has been removed, as it is unmaintained."; # Added on 2024-02-14
|
||||
SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
|
||||
SPAdes = spades; # Added 2024-06-12
|
||||
spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
|
||||
spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
|
||||
|
||||
@ -12061,8 +12061,6 @@ with pkgs;
|
||||
|
||||
raysession = python3Packages.callPackage ../applications/audio/raysession {};
|
||||
|
||||
revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { };
|
||||
|
||||
rbw = callPackage ../tools/security/rbw { };
|
||||
|
||||
remarshal = with python3Packages; toPythonApplication remarshal;
|
||||
@ -31489,7 +31487,7 @@ with pkgs;
|
||||
|
||||
pixeluvo = callPackage ../applications/graphics/pixeluvo { };
|
||||
|
||||
pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { };
|
||||
pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { };
|
||||
|
||||
planner = callPackage ../applications/office/planner { };
|
||||
|
||||
@ -39630,8 +39628,6 @@ with pkgs;
|
||||
|
||||
sndio = callPackage ../misc/sndio { };
|
||||
|
||||
SP800-90B_EntropyAssessment = callPackage ../tools/misc/SP800-90B_EntropyAssessment { };
|
||||
|
||||
sticky = callPackage ../applications/misc/sticky { };
|
||||
|
||||
stork = darwin.apple_sdk_11_0.callPackage ../applications/misc/stork {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user