Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
392ce5fcd0
@ -15789,6 +15789,12 @@
|
||||
githubId = 4580157;
|
||||
name = "Patrick Hobusch";
|
||||
};
|
||||
patka = {
|
||||
email = "patka@patka.dev";
|
||||
github = "patka-123";
|
||||
githubId = 69802930;
|
||||
name = "patka";
|
||||
};
|
||||
patrickdag = {
|
||||
email = "patrick-nixos@failmail.dev";
|
||||
github = "PatrickDaG";
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.84";
|
||||
version = "1.85";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RPrNpm+0N//CpVtG6cJD+m+0G6ca75hZwdEdHsGadEg=";
|
||||
hash = "sha256-1iIwfZVRumlZn67xEhlef6Gm2Hb52CHFAq9RPU4M13M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -6,11 +6,13 @@
|
||||
, dbus
|
||||
, Foundation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, glib
|
||||
, gst_all_1
|
||||
, IOKit
|
||||
, lib
|
||||
, MediaPlayer
|
||||
, mpv-unwrapped
|
||||
, openssl
|
||||
, pkg-config
|
||||
, protobuf
|
||||
@ -22,26 +24,42 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "termusic";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tramhao";
|
||||
repo = "termusic";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FOFZg32hrWpKVsjkMDkiqah7jmUZw0HRWGqOvsN0t8Q=";
|
||||
hash = "sha256-aEkg1j6R86QGn21HBimtZwmjmW1K9Wo+67G4DlpY960=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# both following patches can be removed with the follow up release to 0.9.1 as they are cherry-picked from `termusic/master` branch
|
||||
# fix build issue with 0.9.1 release and vendoring producing wrong hash for soundtouch-ffi
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tramhao/termusic/commit/211fc3fe008932d052d31d3b836e8a80eade3cfe.patch";
|
||||
hash = "sha256-11kSI28YonoTe5W31+R76lGhNiN1ZLAg94FrfYiZUAY=";
|
||||
})
|
||||
# fix a bug through previous patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tramhao/termusic/commit/2a40b2f366dfa5c1f008c79a3ff5c1bbf53fe10f.patch";
|
||||
hash = "sha256-b7CJ5SqxrU1Jr4GDaJe9sFutDHMqIQxGhXbBFGB6y84=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
pushd $cargoDepsCopy/stream-download
|
||||
oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
|
||||
substituteInPlace $cargoDepsCopy/stream-download/src/lib.rs \
|
||||
--replace-warn '#![doc = include_str!("../README.md")]' ""
|
||||
substituteInPlace .cargo-checksum.json \
|
||||
--replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1)
|
||||
--replace-warn $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1)
|
||||
popd
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-r5FOl3Bp3GYhOhvWj/y6FXsuG2wvuFcMcYKBzVBVqiM=";
|
||||
cargoHash = "sha256-4PprZdTIcYa8y7FwQVrG0ZBg7N/Xe6HDt/z6ZmaHd5Y=";
|
||||
|
||||
useNextest = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -53,6 +71,7 @@ rustPlatform.buildRustPackage rec {
|
||||
dbus
|
||||
glib
|
||||
gst_all_1.gstreamer
|
||||
mpv-unwrapped
|
||||
openssl
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
|
||||
@ -1,118 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, undmg
|
||||
, dpkg
|
||||
, autoPatchelfHook
|
||||
, wrapGAppsHook3
|
||||
, makeWrapper
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, gdk-pixbuf
|
||||
, glibc
|
||||
, nss
|
||||
, udev
|
||||
, xorg
|
||||
, gnome-keyring
|
||||
, mesa
|
||||
, gtk3
|
||||
, libusb1
|
||||
, libsecret
|
||||
, libappindicator
|
||||
, xdotool
|
||||
}:
|
||||
let
|
||||
pname = "keeweb";
|
||||
version = "1.18.7";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb";
|
||||
hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg";
|
||||
hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg";
|
||||
hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
libraries = [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
gdk-pixbuf
|
||||
nss
|
||||
udev
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXext
|
||||
xorg.libXrandr
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXtst
|
||||
xorg.libxshmfence
|
||||
gnome-keyring
|
||||
mesa
|
||||
gtk3
|
||||
libusb1
|
||||
libsecret
|
||||
libappindicator
|
||||
xdotool
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free cross-platform password manager compatible with KeePass";
|
||||
mainProgram = "keeweb";
|
||||
homepage = "https://keeweb.info/";
|
||||
changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = builtins.attrNames srcs;
|
||||
};
|
||||
in
|
||||
if stdenv.isDarwin
|
||||
then stdenv.mkDerivation {
|
||||
inherit pname version src meta;
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r *.app $out/Applications
|
||||
'';
|
||||
}
|
||||
else stdenv.mkDerivation {
|
||||
inherit pname version src meta;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook3
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = libraries;
|
||||
|
||||
unpackPhase = ''
|
||||
${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -r usr/share $out/share
|
||||
|
||||
makeWrapper $out/share/keeweb-desktop/keeweb $out/bin/keeweb \
|
||||
--argv0 "keeweb" \
|
||||
--add-flags "$out/share/keeweb-desktop/resources/app.asar" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-graft";
|
||||
version = "0.2.18";
|
||||
version = "0.2.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mzz2017";
|
||||
repo = "gg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8=";
|
||||
sha256 = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
let
|
||||
versions =
|
||||
if stdenv.isLinux then {
|
||||
stable = "0.0.65";
|
||||
stable = "0.0.66";
|
||||
ptb = "0.0.101";
|
||||
canary = "0.0.475";
|
||||
development = "0.0.24";
|
||||
@ -17,7 +17,7 @@ let
|
||||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-kzYLZcjuG7k8RSjc5ooDlMKaAlMHvm0yCl5Krnhqq8A=";
|
||||
hash = "sha256-tbpo1+fbziJk2JdaMyAW5Ynb0wuWkLdcDnzQbiZJ47A=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
|
||||
@ -1,334 +0,0 @@
|
||||
# Upstream distributes HandBrake with bundle of according versions of libraries
|
||||
# and patches to them. This derivation patches HandBrake to use Nix closure
|
||||
# dependencies.
|
||||
#
|
||||
# NOTE: 2019-07-19: This derivation does not currently support the native macOS
|
||||
# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would
|
||||
# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
|
||||
# requires invoking the Xcode build system, which is non-trivial for now.
|
||||
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
# For tests
|
||||
, testers
|
||||
, runCommand
|
||||
, fetchurl
|
||||
# Main build tools
|
||||
, pkg-config
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
, m4
|
||||
, xz
|
||||
, python3
|
||||
, numactl
|
||||
, writeText
|
||||
# Processing, video codecs, containers
|
||||
, ffmpeg_7-full
|
||||
, nv-codec-headers
|
||||
, libogg
|
||||
, x264
|
||||
, x265
|
||||
, libvpx
|
||||
, libtheora
|
||||
, dav1d
|
||||
, zimg
|
||||
, svt-av1
|
||||
# Codecs, audio
|
||||
, libopus
|
||||
, lame
|
||||
, libvorbis
|
||||
, a52dec
|
||||
, speex
|
||||
, libsamplerate
|
||||
# Text processing
|
||||
, libiconv
|
||||
, fribidi
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libass
|
||||
, jansson
|
||||
, libxml2
|
||||
, harfbuzz
|
||||
, libjpeg_turbo
|
||||
# Optical media
|
||||
, libdvdread
|
||||
, libdvdnav
|
||||
, libdvdcss
|
||||
, libbluray
|
||||
# Darwin-specific
|
||||
, AudioToolbox
|
||||
, Foundation
|
||||
, libobjc
|
||||
, VideoToolbox
|
||||
# GTK
|
||||
# NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus,
|
||||
# which in turn depends on systemd. systemd is not supported on Darwin, so
|
||||
# for now we disable GTK GUI support on Darwin. (It may be possible to remove
|
||||
# this restriction later.)
|
||||
, useGtk ? !stdenv.isDarwin
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, wrapGAppsHook4
|
||||
, intltool
|
||||
, glib
|
||||
, gtk4
|
||||
, libappindicator-gtk3
|
||||
, libnotify
|
||||
, gst_all_1
|
||||
, dbus-glib
|
||||
, udev
|
||||
, libgudev
|
||||
, hicolor-icon-theme
|
||||
# FDK
|
||||
, useFdk ? false
|
||||
, fdk_aac
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HandBrake";
|
||||
repo = "HandBrake";
|
||||
# uses version commit for logic in version.txt
|
||||
rev = "e9ff2bdf1ac670eb9c6d6170e27c999c05535127";
|
||||
hash = "sha256-grbT+oRIyLnyJowhdqw7qGRg11HzWGIU9yTwUQhCWtg=";
|
||||
};
|
||||
|
||||
# Handbrake maintains a set of ffmpeg patches. In particular, these
|
||||
# patches are required for subtitle timing to work correctly. See:
|
||||
# https://github.com/HandBrake/HandBrake/issues/4029
|
||||
# base ffmpeg version is specified in:
|
||||
# https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs
|
||||
ffmpeg-version = "7.0.1";
|
||||
ffmpeg-hb = (ffmpeg_7-full.override {
|
||||
version = ffmpeg-version;
|
||||
hash = "sha256-HiCT6bvLx4zmJ6ffutoimdz5ENQ55CRF64WBT3HeXMA=";
|
||||
}).overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
"${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch"
|
||||
"${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch"
|
||||
"${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch"
|
||||
"${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch"
|
||||
"${src}/contrib/ffmpeg/A05-dvdsubdec-fix-processing-of-partial-packets.patch"
|
||||
"${src}/contrib/ffmpeg/A06-dvdsubdec-return-number-of-bytes-used.patch"
|
||||
"${src}/contrib/ffmpeg/A07-dvdsubdec-use-pts-of-initial-packet.patch"
|
||||
"${src}/contrib/ffmpeg/A08-dvdsubdec-do-not-discard-zero-sized-rects.patch"
|
||||
"${src}/contrib/ffmpeg/A09-ccaption_dec-fix-pts-in-real_time-mode.patch"
|
||||
"${src}/contrib/ffmpeg/A10-matroskaenc-aac-extradata-updated.patch"
|
||||
"${src}/contrib/ffmpeg/A11-videotoolbox-disable-H.264-10-bit-on-Intel-macOS.patch"
|
||||
|
||||
# patch to fix <https://github.com/HandBrake/HandBrake/issues/5011>
|
||||
# commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail.
|
||||
# "${src}/contrib/ffmpeg/A12-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch"
|
||||
|
||||
"${src}/contrib/ffmpeg/A13-qsv-fix-decode-10bit-hdr.patch"
|
||||
"${src}/contrib/ffmpeg/A14-amfenc-Add-support-for-pict_type-field.patch"
|
||||
"${src}/contrib/ffmpeg/A15-amfenc-Fixes-the-color-information-in-the-ou.patch"
|
||||
"${src}/contrib/ffmpeg/A16-amfenc-HDR-metadata.patch"
|
||||
"${src}/contrib/ffmpeg/A17-av1dec-dovi-rpu.patch"
|
||||
"${src}/contrib/ffmpeg/A18-avformat-mov-add-support-audio-fallback-track-ref.patch"
|
||||
"${src}/contrib/ffmpeg/A19-fix-qsv-on-gcc-14.patch"
|
||||
];
|
||||
});
|
||||
|
||||
x265-hb = x265.overrideAttrs (old: {
|
||||
# nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches
|
||||
# are written with respect to the parent directory instead of that source directory.
|
||||
# patches which don't cleanly apply are commented out.
|
||||
postPatch = (old.postPatch or "") + ''
|
||||
pushd ..
|
||||
patch -p1 < ${src}/contrib/x265/A01-threads-priority.patch
|
||||
patch -p1 < ${src}/contrib/x265/A02-threads-pool-adjustments.patch
|
||||
patch -p1 < ${src}/contrib/x265/A03-sei-length-crash-fix.patch
|
||||
patch -p1 < ${src}/contrib/x265/A04-ambient-viewing-enviroment-sei.patch
|
||||
# patch -p1 < ${src}/contrib/x265/A05-memory-leaks.patch
|
||||
# patch -p1 < ${src}/contrib/x265/A06-crosscompile-fix.patch
|
||||
popd
|
||||
'';
|
||||
});
|
||||
|
||||
versionFile = writeText "version.txt" ''
|
||||
URL=${src.meta.homepage}.git
|
||||
HASH=${src.rev}
|
||||
SHORTHASH=${lib.substring 0 9 src.rev}
|
||||
TAG=${version}
|
||||
TAG_HASH=${src.rev}
|
||||
REV=0
|
||||
BRANCH=
|
||||
REMOTE=${src.meta.homepage}.git
|
||||
DATE=1970-01-01 00:00:01 +0000
|
||||
'';
|
||||
|
||||
inherit (lib) optional optionals optionalString versions;
|
||||
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "handbrake";
|
||||
inherit version src;
|
||||
|
||||
postPatch = ''
|
||||
install -Dm444 ${versionFile} ${versionFile.name}
|
||||
|
||||
patchShebangs scripts
|
||||
patchShebangs gtk/data/
|
||||
|
||||
substituteInPlace libhb/hb.c \
|
||||
--replace-fail 'return hb_version;' 'return "${version}";'
|
||||
|
||||
# Force using nixpkgs dependencies
|
||||
sed -i '/MODULES += contrib/d' make/include/main.defs
|
||||
sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \
|
||||
-e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \
|
||||
-i make/configure.py
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
# Prevent the configure script from failing if xcodebuild isn't available,
|
||||
# which it isn't in the Nix context. (The actual build goes fine without
|
||||
# xcodebuild.)
|
||||
sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py
|
||||
'' + optionalString useGtk ''
|
||||
substituteInPlace gtk/module.rules \
|
||||
--replace-fail '$(MESON.exe)' 'meson' \
|
||||
--replace-fail '$(NINJA.exe)' 'ninja' \
|
||||
# Force using nixpkgs dependencies
|
||||
substituteInPlace gtk/meson.build \
|
||||
--replace-fail \
|
||||
"hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')" \
|
||||
"hb_incdirs = include_directories(hb_dir / 'libhb')"
|
||||
substituteInPlace gtk/ghb.spec \
|
||||
--replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
substituteInPlace gtk/data/post_install.py \
|
||||
--replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
m4
|
||||
pkg-config
|
||||
python3
|
||||
]
|
||||
++ optionals useGtk [ appstream desktop-file-utils intltool meson ninja wrapGAppsHook4 ];
|
||||
|
||||
buildInputs = [
|
||||
a52dec
|
||||
dav1d
|
||||
ffmpeg-hb
|
||||
fontconfig
|
||||
freetype
|
||||
fribidi
|
||||
harfbuzz
|
||||
jansson
|
||||
lame
|
||||
libass
|
||||
libbluray
|
||||
libdvdcss
|
||||
libdvdnav
|
||||
libdvdread
|
||||
libiconv
|
||||
libjpeg_turbo
|
||||
libogg
|
||||
libopus
|
||||
libsamplerate
|
||||
libtheora
|
||||
libvorbis
|
||||
libvpx
|
||||
libxml2
|
||||
speex
|
||||
svt-av1
|
||||
x264
|
||||
x265-hb
|
||||
xz
|
||||
zimg
|
||||
]
|
||||
++ optional (!stdenv.isDarwin) numactl
|
||||
++ optionals useGtk [
|
||||
dbus-glib
|
||||
glib
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gstreamer
|
||||
gtk4
|
||||
hicolor-icon-theme
|
||||
libappindicator-gtk3
|
||||
libgudev
|
||||
libnotify
|
||||
udev
|
||||
]
|
||||
++ optional useFdk fdk_aac
|
||||
++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ]
|
||||
# NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only,
|
||||
# look at ./make/configure.py search "enable_nvenc"
|
||||
++ optional stdenv.isLinux nv-codec-headers;
|
||||
|
||||
configureFlags = [
|
||||
"--disable-df-fetch"
|
||||
"--disable-df-verify"
|
||||
]
|
||||
++ optional (!useGtk) "--disable-gtk"
|
||||
++ optional useFdk "--enable-fdk-aac"
|
||||
++ optional stdenv.isDarwin "--disable-xcode"
|
||||
++ optional stdenv.hostPlatform.isx86 "--harden";
|
||||
|
||||
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing
|
||||
NIX_LDFLAGS = [ "-lx265" ];
|
||||
|
||||
# meson/ninja are used only for the subprojects, not the toplevel
|
||||
dontUseMesonConfigure = true;
|
||||
dontUseMesonInstall = true;
|
||||
dontUseNinjaBuild = true;
|
||||
dontUseNinjaInstall = true;
|
||||
|
||||
makeFlags = [ "--directory=build" ];
|
||||
|
||||
passthru = {
|
||||
# for convenience
|
||||
inherit ffmpeg-hb x265-hb;
|
||||
|
||||
tests.basic-conversion =
|
||||
let
|
||||
# Big Buck Bunny example, licensed under CC Attribution 3.0.
|
||||
testMkv = fetchurl {
|
||||
url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true";
|
||||
sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9";
|
||||
};
|
||||
in
|
||||
runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } ''
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160
|
||||
test -e test.mp4
|
||||
HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160
|
||||
test -e test.mkv
|
||||
'';
|
||||
|
||||
tests.version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://handbrake.fr/";
|
||||
description = "Tool for converting video files and ripping DVDs";
|
||||
longDescription = ''
|
||||
Tool for converting and remuxing video files
|
||||
into selection of modern and widely supported codecs
|
||||
and containers. Very versatile and customizable.
|
||||
Package provides:
|
||||
CLI - `HandbrakeCLI`
|
||||
GTK GUI - `ghb`
|
||||
'';
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ Anton-Latukha wmertens ];
|
||||
platforms = with platforms; unix;
|
||||
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434
|
||||
};
|
||||
};
|
||||
in
|
||||
self
|
||||
@ -47,20 +47,20 @@ let
|
||||
callPackage
|
||||
(import ./generic.nix rec {
|
||||
pname = "singularity-ce";
|
||||
version = "4.1.4";
|
||||
version = "4.1.5";
|
||||
projectName = "singularity";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sylabs";
|
||||
repo = "singularity";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+qwPzgwfF6A1c/rmSM/5T2N9/wVeWhMoAthj3eSQmh8=";
|
||||
hash = "sha256-klOnQAJfVsohJKeQbNaW6PzQ7ejhO281+vcDMoJ4WMk=";
|
||||
};
|
||||
|
||||
# Update by running
|
||||
# nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules"
|
||||
# at the root directory of the Nixpkgs repository
|
||||
vendorHash = "sha256-dTqOSk8APLOsqwEiZ/IL8Zu1SR48MyEYPgRe6PC2nd8=";
|
||||
vendorHash = "sha256-NyNNTe2X5OuDun6xNiRLGzvUxcRM4S7fD68I+I6IMKs=";
|
||||
|
||||
# Do not build conmon and squashfuse from the Git submodule sources,
|
||||
# Use Nixpkgs provided version
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "bitrise";
|
||||
version = "2.20.0";
|
||||
version = "2.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitrise-io";
|
||||
repo = "bitrise";
|
||||
rev = version;
|
||||
hash = "sha256-kwM3TqXxkVq45oN9T+G7wmsBMdIJ/FN6ZoUysoM5PNY=";
|
||||
hash = "sha256-M1OAMppeY13fXclycUXwp2H1GSLVJRNV11QxAvNLQuQ=";
|
||||
};
|
||||
|
||||
# many tests rely on writable $HOME/.bitrise and require network access
|
||||
|
||||
@ -21,7 +21,7 @@ let
|
||||
in
|
||||
buildDunePackage' rec {
|
||||
pname = "docfd";
|
||||
version = "7.0.0";
|
||||
version = "8.0.1";
|
||||
|
||||
minimalOCamlVersion = "5.1";
|
||||
|
||||
@ -29,7 +29,7 @@ buildDunePackage' rec {
|
||||
owner = "darrenldl";
|
||||
repo = "docfd";
|
||||
rev = version;
|
||||
hash = "sha256-R/UOA1rf9NnEQQWn/ToCZuUSC48DPqglrb+5ZjCdpb0=";
|
||||
hash = "sha256-0VeUT9i3/eEA64XsrpUi3oXyrinEFSJWzsEXrsUly30=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -41,6 +41,7 @@ buildDunePackage' rec {
|
||||
buildInputs = with ocamlPackages; [
|
||||
cmdliner
|
||||
containers-data
|
||||
decompress
|
||||
digestif
|
||||
eio_main
|
||||
lwd
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "gitlab-ci-local";
|
||||
version = "4.52.2";
|
||||
version = "4.53.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecow";
|
||||
repo = "gitlab-ci-local";
|
||||
rev = version;
|
||||
hash = "sha256-x63am8FIfczA4CkoBkDeZTkp2sqc7nN5CV1hiq+vvjU=";
|
||||
hash = "sha256-VLBVfA4x4gaj7e37W7EqehJpYhmEgTatIL2IrO4i+Z8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-t26QoIBw5XGqHn8FHSL2MSfFV2wGuQWf3GH2GvSYByg=";
|
||||
npmDepsHash = "sha256-HAat2D45XeIjDW207Fn5M7O1sqjHOV2gxm2Urzxw+PU=";
|
||||
|
||||
postPatch = ''
|
||||
# remove cleanup which runs git commands
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-camo";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cactus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xNdikp3Kd/VAzn7QjqIrNvifFI0mMTJ5U+zk+QbJAk0=";
|
||||
sha256 = "sha256-2iclQVkj813xW9Ff3yh5dxCun0LxsPn4YpSLeMwsNbY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xN0FJntfQ2V2IsxD8dEi0vR+psnjGR7G6+ssxNTuzc4=";
|
||||
vendorHash = "sha256-GbBFGbNxsijcUIogjSv8RcIQn6VQ+j21Qlm9eQWzTtc=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ];
|
||||
|
||||
|
||||
370
pkgs/by-name/ha/handbrake/package.nix
Normal file
370
pkgs/by-name/ha/handbrake/package.nix
Normal file
@ -0,0 +1,370 @@
|
||||
# Upstream distributes HandBrake with bundle of according versions of libraries
|
||||
# and patches to them. This derivation patches HandBrake to use Nix closure
|
||||
# dependencies.
|
||||
#
|
||||
# NOTE: 2019-07-19: This derivation does not currently support the native macOS
|
||||
# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would
|
||||
# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
|
||||
# requires invoking the Xcode build system, which is non-trivial for now.
|
||||
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
# For tests
|
||||
testers,
|
||||
runCommand,
|
||||
fetchurl,
|
||||
# Main build tools
|
||||
pkg-config,
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
m4,
|
||||
xz,
|
||||
python3,
|
||||
numactl,
|
||||
writeText,
|
||||
# Processing, video codecs, containers
|
||||
ffmpeg_7-full,
|
||||
nv-codec-headers,
|
||||
libogg,
|
||||
x264,
|
||||
x265,
|
||||
libvpx,
|
||||
libtheora,
|
||||
dav1d,
|
||||
zimg,
|
||||
svt-av1,
|
||||
# Codecs, audio
|
||||
libopus,
|
||||
lame,
|
||||
libvorbis,
|
||||
a52dec,
|
||||
speex,
|
||||
libsamplerate,
|
||||
# Text processing
|
||||
libiconv,
|
||||
fribidi,
|
||||
fontconfig,
|
||||
freetype,
|
||||
libass,
|
||||
jansson,
|
||||
libxml2,
|
||||
harfbuzz,
|
||||
libjpeg_turbo,
|
||||
# Optical media
|
||||
libdvdread,
|
||||
libdvdnav,
|
||||
libdvdcss,
|
||||
libbluray,
|
||||
# Darwin-specific
|
||||
darwin,
|
||||
# GTK
|
||||
# NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus,
|
||||
# which in turn depends on systemd. systemd is not supported on Darwin, so
|
||||
# for now we disable GTK GUI support on Darwin. (It may be possible to remove
|
||||
# this restriction later.)
|
||||
useGtk ? !stdenv.isDarwin,
|
||||
appstream,
|
||||
desktop-file-utils,
|
||||
meson,
|
||||
ninja,
|
||||
wrapGAppsHook4,
|
||||
intltool,
|
||||
glib,
|
||||
gtk4,
|
||||
libappindicator-gtk3,
|
||||
libnotify,
|
||||
gst_all_1,
|
||||
dbus-glib,
|
||||
udev,
|
||||
libgudev,
|
||||
hicolor-icon-theme,
|
||||
# FDK
|
||||
useFdk ? false,
|
||||
fdk_aac,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
AudioToolbox
|
||||
Foundation
|
||||
VideoToolbox
|
||||
;
|
||||
inherit (darwin) libobjc;
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HandBrake";
|
||||
repo = "HandBrake";
|
||||
# uses version commit for logic in version.txt
|
||||
rev = "77f199ab02ff2e3bca4ca653e922e9fef67dec43";
|
||||
hash = "sha256-vxvmyo03NcO2Nbjg76JLZqmYw7RiK4FehiB+iE3CgOw=";
|
||||
};
|
||||
|
||||
# Handbrake maintains a set of ffmpeg patches. In particular, these
|
||||
# patches are required for subtitle timing to work correctly. See:
|
||||
# https://github.com/HandBrake/HandBrake/issues/4029
|
||||
# base ffmpeg version is specified in:
|
||||
# https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs
|
||||
ffmpeg-version = "7.0.2";
|
||||
ffmpeg-hb =
|
||||
(ffmpeg_7-full.override {
|
||||
version = ffmpeg-version;
|
||||
hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs=";
|
||||
}).overrideAttrs
|
||||
(old: {
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
"${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch"
|
||||
"${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch"
|
||||
"${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch"
|
||||
"${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch"
|
||||
"${src}/contrib/ffmpeg/A05-dvdsubdec-fix-processing-of-partial-packets.patch"
|
||||
"${src}/contrib/ffmpeg/A06-dvdsubdec-return-number-of-bytes-used.patch"
|
||||
"${src}/contrib/ffmpeg/A07-dvdsubdec-use-pts-of-initial-packet.patch"
|
||||
"${src}/contrib/ffmpeg/A08-dvdsubdec-do-not-discard-zero-sized-rects.patch"
|
||||
"${src}/contrib/ffmpeg/A09-ccaption_dec-fix-pts-in-real_time-mode.patch"
|
||||
"${src}/contrib/ffmpeg/A10-matroskaenc-aac-extradata-updated.patch"
|
||||
"${src}/contrib/ffmpeg/A11-videotoolbox-disable-H.264-10-bit-on-Intel-macOS.patch"
|
||||
|
||||
# patch to fix <https://github.com/HandBrake/HandBrake/issues/5011>
|
||||
# commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail.
|
||||
# "${src}/contrib/ffmpeg/A12-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch"
|
||||
|
||||
"${src}/contrib/ffmpeg/A13-qsv-fix-decode-10bit-hdr.patch"
|
||||
"${src}/contrib/ffmpeg/A14-amfenc-Add-support-for-pict_type-field.patch"
|
||||
"${src}/contrib/ffmpeg/A15-amfenc-Fixes-the-color-information-in-the-ou.patch"
|
||||
"${src}/contrib/ffmpeg/A16-amfenc-HDR-metadata.patch"
|
||||
"${src}/contrib/ffmpeg/A17-av1dec-dovi-rpu.patch"
|
||||
"${src}/contrib/ffmpeg/A18-avformat-mov-add-support-audio-fallback-track-ref.patch"
|
||||
];
|
||||
});
|
||||
|
||||
x265-hb = x265.overrideAttrs (old: {
|
||||
# nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches
|
||||
# are written with respect to the parent directory instead of that source directory.
|
||||
# patches which don't cleanly apply are commented out.
|
||||
postPatch =
|
||||
(old.postPatch or "")
|
||||
+ ''
|
||||
pushd ..
|
||||
patch -p1 < ${src}/contrib/x265/A01-threads-priority.patch
|
||||
patch -p1 < ${src}/contrib/x265/A02-threads-pool-adjustments.patch
|
||||
patch -p1 < ${src}/contrib/x265/A03-sei-length-crash-fix.patch
|
||||
patch -p1 < ${src}/contrib/x265/A04-ambient-viewing-enviroment-sei.patch
|
||||
# patch -p1 < ${src}/contrib/x265/A05-memory-leaks.patch
|
||||
# patch -p1 < ${src}/contrib/x265/A06-crosscompile-fix.patch
|
||||
popd
|
||||
'';
|
||||
});
|
||||
|
||||
versionFile = writeText "version.txt" ''
|
||||
URL=${src.meta.homepage}.git
|
||||
HASH=${src.rev}
|
||||
SHORTHASH=${lib.substring 0 9 src.rev}
|
||||
TAG=${version}
|
||||
TAG_HASH=${src.rev}
|
||||
REV=0
|
||||
BRANCH=
|
||||
REMOTE=${src.meta.homepage}.git
|
||||
DATE=1970-01-01 00:00:01 +0000
|
||||
'';
|
||||
|
||||
inherit (lib)
|
||||
optional
|
||||
optionals
|
||||
optionalString
|
||||
versions
|
||||
;
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "handbrake";
|
||||
inherit version src;
|
||||
|
||||
postPatch =
|
||||
''
|
||||
install -Dm444 ${versionFile} ${versionFile.name}
|
||||
|
||||
patchShebangs scripts
|
||||
patchShebangs gtk/data/
|
||||
|
||||
substituteInPlace libhb/hb.c \
|
||||
--replace-fail 'return hb_version;' 'return "${version}";'
|
||||
|
||||
# Force using nixpkgs dependencies
|
||||
sed -i '/MODULES += contrib/d' make/include/main.defs
|
||||
sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \
|
||||
-e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \
|
||||
-i make/configure.py
|
||||
''
|
||||
+ optionalString stdenv.isDarwin ''
|
||||
# Prevent the configure script from failing if xcodebuild isn't available,
|
||||
# which it isn't in the Nix context. (The actual build goes fine without
|
||||
# xcodebuild.)
|
||||
sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py
|
||||
''
|
||||
+ optionalString useGtk ''
|
||||
substituteInPlace gtk/module.rules \
|
||||
--replace-fail '$(MESON.exe)' 'meson' \
|
||||
--replace-fail '$(NINJA.exe)' 'ninja' \
|
||||
# Force using nixpkgs dependencies
|
||||
substituteInPlace gtk/meson.build \
|
||||
--replace-fail \
|
||||
"hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')" \
|
||||
"hb_incdirs = include_directories(hb_dir / 'libhb')"
|
||||
substituteInPlace gtk/ghb.spec \
|
||||
--replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
substituteInPlace gtk/data/post_install.py \
|
||||
--replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
m4
|
||||
pkg-config
|
||||
python3
|
||||
]
|
||||
++ optionals useGtk [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
intltool
|
||||
meson
|
||||
ninja
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
a52dec
|
||||
dav1d
|
||||
ffmpeg-hb
|
||||
fontconfig
|
||||
freetype
|
||||
fribidi
|
||||
harfbuzz
|
||||
jansson
|
||||
lame
|
||||
libass
|
||||
libbluray
|
||||
libdvdcss
|
||||
libdvdnav
|
||||
libdvdread
|
||||
libiconv
|
||||
libjpeg_turbo
|
||||
libogg
|
||||
libopus
|
||||
libsamplerate
|
||||
libtheora
|
||||
libvorbis
|
||||
libvpx
|
||||
libxml2
|
||||
speex
|
||||
svt-av1
|
||||
x264
|
||||
x265-hb
|
||||
xz
|
||||
zimg
|
||||
]
|
||||
++ optional (!stdenv.isDarwin) numactl
|
||||
++ optionals useGtk [
|
||||
dbus-glib
|
||||
glib
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gstreamer
|
||||
gtk4
|
||||
hicolor-icon-theme
|
||||
libappindicator-gtk3
|
||||
libgudev
|
||||
libnotify
|
||||
udev
|
||||
]
|
||||
++ optional useFdk fdk_aac
|
||||
++ optionals stdenv.isDarwin [
|
||||
AudioToolbox
|
||||
Foundation
|
||||
libobjc
|
||||
VideoToolbox
|
||||
]
|
||||
# NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only,
|
||||
# look at ./make/configure.py search "enable_nvenc"
|
||||
++ optional stdenv.isLinux nv-codec-headers;
|
||||
|
||||
configureFlags =
|
||||
[
|
||||
"--disable-df-fetch"
|
||||
"--disable-df-verify"
|
||||
]
|
||||
++ optional (!useGtk) "--disable-gtk"
|
||||
++ optional useFdk "--enable-fdk-aac"
|
||||
++ optional stdenv.isDarwin "--disable-xcode"
|
||||
++ optional stdenv.hostPlatform.isx86 "--harden";
|
||||
|
||||
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing
|
||||
NIX_LDFLAGS = [ "-lx265" ];
|
||||
|
||||
# meson/ninja are used only for the subprojects, not the toplevel
|
||||
dontUseMesonConfigure = true;
|
||||
dontUseMesonInstall = true;
|
||||
dontUseNinjaBuild = true;
|
||||
dontUseNinjaInstall = true;
|
||||
|
||||
makeFlags = [ "--directory=build" ];
|
||||
|
||||
passthru = {
|
||||
# for convenience
|
||||
inherit ffmpeg-hb x265-hb;
|
||||
|
||||
tests.basic-conversion =
|
||||
let
|
||||
# Big Buck Bunny example, licensed under CC Attribution 3.0.
|
||||
testMkv = fetchurl {
|
||||
url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true";
|
||||
sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9";
|
||||
};
|
||||
in
|
||||
runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } ''
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160
|
||||
test -e test.mp4
|
||||
HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160
|
||||
test -e test.mkv
|
||||
'';
|
||||
|
||||
tests.version = testers.testVersion {
|
||||
package = self;
|
||||
command = "HandBrakeCLI --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://handbrake.fr/";
|
||||
description = "Tool for converting video files and ripping DVDs";
|
||||
longDescription = ''
|
||||
Tool for converting and remuxing video files
|
||||
into selection of modern and widely supported codecs
|
||||
and containers. Very versatile and customizable.
|
||||
Package provides:
|
||||
CLI - `HandbrakeCLI`
|
||||
GTK GUI - `ghb`
|
||||
'';
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [
|
||||
Anton-Latukha
|
||||
wmertens
|
||||
];
|
||||
mainProgram = "HandBrakeCLI";
|
||||
platforms = with platforms; unix;
|
||||
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434
|
||||
};
|
||||
};
|
||||
in
|
||||
self
|
||||
@ -5,10 +5,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "heptabase";
|
||||
version = "1.35.4";
|
||||
version = "1.35.5";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
|
||||
hash = "sha256-JFIC5a0W8pmiPxgkymE8d+iULM80U85xGOF0M2vu/PI=";
|
||||
hash = "sha256-hRyh6dBGe0/3paAcdpzt0E9M2V2J6LebO/M/kYIlT6U=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
5687
pkgs/by-name/in/intelephense/package-lock.json
generated
Normal file
5687
pkgs/by-name/in/intelephense/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
36
pkgs/by-name/in/intelephense/package.nix
Normal file
36
pkgs/by-name/in/intelephense/package.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchurl,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "1.12.5";
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "intelephense";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/intelephense/-/intelephense-${version}.tgz";
|
||||
hash = "sha256-S2wlzEDSKu/7NxnFMAj25meXzW37fGbH1ztCbWDRAqc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-HpJYDPPX5elvd0SMCJuTu5j4v1caO25UZqywB2huUAA=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Professional PHP tooling for any Language Server Protocol capable editor";
|
||||
homepage = "https://intelephense.com/";
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "intelephense";
|
||||
maintainers = with lib.maintainers; [ patka ];
|
||||
};
|
||||
}
|
||||
139
pkgs/by-name/ke/keeweb/package.nix
Normal file
139
pkgs/by-name/ke/keeweb/package.nix
Normal file
@ -0,0 +1,139 @@
|
||||
{
|
||||
lib,
|
||||
libGL,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
undmg,
|
||||
dpkg,
|
||||
autoPatchelfHook,
|
||||
wrapGAppsHook3,
|
||||
alsa-lib,
|
||||
at-spi2-atk,
|
||||
gdk-pixbuf,
|
||||
nss,
|
||||
udev,
|
||||
gnome-keyring,
|
||||
mesa,
|
||||
gtk3,
|
||||
libusb1,
|
||||
libsecret,
|
||||
libappindicator,
|
||||
xdotool,
|
||||
libX11,
|
||||
libXcomposite,
|
||||
libXext,
|
||||
libXrandr,
|
||||
libXScrnSaver,
|
||||
libXtst,
|
||||
libxshmfence,
|
||||
}:
|
||||
let
|
||||
pname = "keeweb";
|
||||
version = "1.18.7";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb";
|
||||
hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg";
|
||||
hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg";
|
||||
hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4=";
|
||||
};
|
||||
};
|
||||
src =
|
||||
srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
libraries = [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
gdk-pixbuf
|
||||
libGL
|
||||
nss
|
||||
udev
|
||||
libX11
|
||||
libXcomposite
|
||||
libXext
|
||||
libXrandr
|
||||
libXScrnSaver
|
||||
libXtst
|
||||
libxshmfence
|
||||
gnome-keyring
|
||||
mesa
|
||||
gtk3
|
||||
libusb1
|
||||
libsecret
|
||||
libappindicator
|
||||
xdotool
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Free cross-platform password manager compatible with KeePass";
|
||||
mainProgram = "keeweb";
|
||||
homepage = "https://keeweb.info/";
|
||||
changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
platforms = builtins.attrNames srcs;
|
||||
};
|
||||
in
|
||||
if stdenv.isDarwin then
|
||||
stdenv.mkDerivation {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r *.app $out/Applications
|
||||
'';
|
||||
}
|
||||
else
|
||||
stdenv.mkDerivation {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = libraries;
|
||||
|
||||
unpackPhase = ''
|
||||
${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -r usr/share $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper $out/share/keeweb-desktop/keeweb $out/bin/keeweb \
|
||||
--argv0 "keeweb" \
|
||||
--add-flags "$out/share/keeweb-desktop/resources/app.asar" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}" \
|
||||
''${gappsWrapperArgs[@]}
|
||||
'';
|
||||
}
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kulala-fmt";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mistweaverco";
|
||||
repo = "kulala-fmt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mnOUYRRVNXkI0yRQFLnuL7yC+YdtWVS0+syJOcHmO6w=";
|
||||
hash = "sha256-5MilRr5ictLVZtkB2boSoPktkDA0oOXRPkfREX5b448=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GazDEm/qv0nh8vYT+Tf0n4QDGHlcYtbMIj5rlZBvpKo=";
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "makejinja";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirkolenz";
|
||||
repo = "makejinja";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-F56y+TxDD/B67ncnBTOd0FZGmXO/zjXitwbk/5aiekM=";
|
||||
hash = "sha256-xrXyXFmh9df04I/zcSvQXsyUPrAvbOyyrhx8RNS3Ojs=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ poetry-core ];
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdt";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "henriklovhaug";
|
||||
repo = "md-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HUrL/+uXQ3753Qb5FZkftGZO+u+MsocFO3L3OzarEhg=";
|
||||
hash = "sha256-3lNipCYhzqeAAUQZ2ajcOakNDlwSwbUUvP8Dtu6gBsI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-O25cb4aNQiU4T2SzxgzjFqL+pCzbM0d+DkkZHvCkMv8=";
|
||||
cargoHash = "sha256-wY/FV0evsz+SZYTL63gReqsy/jfPE39eISs5N7vc3ZU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
|
||||
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mesonlsp";
|
||||
version = "4.3.3";
|
||||
version = "4.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JCWasmx86";
|
||||
repo = "mesonlsp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6p+IufgUCZj21ylkZiYS8kVAdFgDZpOST5Lgb0mXDhQ=";
|
||||
hash = "sha256-eSp2QyuO5sU2AqpFTTlXOSrcGy7nQLfvrY5/3N2qIqU=";
|
||||
};
|
||||
|
||||
patches = [ ./disable-tests-that-require-network-access.patch ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nhost-cli";
|
||||
version = "1.22.3";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nhost";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Rpjgsc+pinM440SqnvVHijUP4Y2ArHi4sdalRDWzaJQ=";
|
||||
hash = "sha256-Xia45kNblGmU4i/CIHg/WOK3EJP1VUHenvLA4CGOY0U=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -87,8 +87,8 @@ stdenv.mkDerivation {
|
||||
makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid ]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs} \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
|
||||
|
||||
5
pkgs/by-name/ry/ryujinx/deps.nix
generated
5
pkgs/by-name/ry/ryujinx/deps.nix
generated
@ -67,7 +67,6 @@
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; hash = "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; hash = "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="; })
|
||||
@ -132,9 +131,6 @@
|
||||
(fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; hash = "sha256-nouPkjBmdt0ZyWBYBVZ1LHd3gBTlU8C4wbeod3av5Wk="; })
|
||||
(fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; hash = "sha256-brvWqisI0WwE7qRhLeRdWXDedztX4lOFon4h6oxDIRU="; })
|
||||
(fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.16.0"; hash = "sha256-QU7xVauLOBAF6TDo8mcuRsA2sZWyVLqFq1M+Oc/WnMg="; })
|
||||
(fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0"; hash = "sha256-kyAQcZZOdD50Lo7l7z8qnFMerJjlAV66HNBq7BI6TNM="; })
|
||||
(fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.9"; hash = "sha256-5Gn8de23zgrlAzqH39kjVIHoGUrhNNxiVw1qNVJECvY="; })
|
||||
(fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0"; hash = "sha256-IH+UVkem5kk6zWAWfWsrtyINZNMh+Em1cF1CCfjvBj4="; })
|
||||
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; })
|
||||
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; })
|
||||
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; })
|
||||
@ -199,7 +195,6 @@
|
||||
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; hash = "sha256-YJ5jJqkVPp+6fEzSXOmw1sNSdygB5Rx7TJ0TrNS/wq4="; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; hash = "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="; })
|
||||
(fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; hash = "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="; })
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.1379"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.1382"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "b45a81458a0b48acd519ce280c7b8f3970e0ffed";
|
||||
sha256 = "1w3nfhx496im06m3gc67xw8w1n6qprs9ggka2sq0g8w2ssz4iy7f";
|
||||
rev = "2c5c0392f9ff80a3907bbf376a13f797ebbc12cc";
|
||||
sha256 = "1v8j9l2r9sz9s3jhakr3rc50hf6fbdr5cqdrjidjwvziykfckizk";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tio";
|
||||
version = "3.6";
|
||||
version = "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tio";
|
||||
repo = "tio";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-1NXp94AQOgMNKf+P2eJ6ifUhWSqIYllVeCraBO2pHxQ=";
|
||||
hash = "sha256-/eXy1roYmeZaQlY4PjBchwRR7JwyTvVIqDmmf6upJqA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
|
||||
];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trealla";
|
||||
version = "2.55.25";
|
||||
version = "2.55.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trealla-prolog";
|
||||
repo = "trealla";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-SQ80jT8uMOaQVr9ZmrV6IYbMMdNIcdxEJ2czsRHP2XI=";
|
||||
hash = "sha256-+hWi02CgibbtbuGKLsnLTXimDaoLd15yhQ/XehllsDk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,6 +16,9 @@ let
|
||||
"2.4.7" = {
|
||||
sha256 = "sha256-aFRNJQNjWs0BXVNMzJsq6faJltQptakGP9Iv8JJQEdI=";
|
||||
};
|
||||
"2.4.8" = {
|
||||
sha256 = "sha256-/G7NzFOOgKFKmY1TDMw4SkF5D09Pxs1//oyxJqZ3aUw=";
|
||||
};
|
||||
};
|
||||
# Collection of pre-built SBCL binaries for platforms that need them for
|
||||
# bootstrapping. Ideally these are to be avoided. If ECL (or any other
|
||||
|
||||
@ -112,6 +112,7 @@ mapAliases {
|
||||
immich = pkgs.immich-cli; # added 2023-08-19
|
||||
indium = throw "indium was removed because it was broken"; # added 2023-08-19
|
||||
inliner = throw "inliner was removed because it was abandoned upstream"; # added 2024-08-23
|
||||
inherit (pkgs) intelephense; # added 2024-08-31
|
||||
ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
|
||||
inherit (pkgs) jake; # added 2023-08-19
|
||||
inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
|
||||
|
||||
@ -116,7 +116,6 @@
|
||||
, "ijavascript"
|
||||
, "imapnotify"
|
||||
, "insect"
|
||||
, "intelephense"
|
||||
, "joplin"
|
||||
, "js-beautify"
|
||||
, "js-yaml"
|
||||
|
||||
332
pkgs/development/node-packages/node-packages.nix
generated
332
pkgs/development/node-packages/node-packages.nix
generated
@ -72305,338 +72305,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
intelephense = nodeEnv.buildNodePackage {
|
||||
name = "intelephense";
|
||||
packageName = "intelephense";
|
||||
version = "1.11.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/intelephense/-/intelephense-1.11.5.tgz";
|
||||
sha512 = "3gi/wFkKMENtRrP5Vo/A+/rN/ywyqxtPwRVUMJJFbm2NOlk4eyq4XirbuOH7U9e4P/iBhdCvZrk+AF/HmsnnXw==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@azure/abort-controller-2.1.2"
|
||||
sources."@azure/core-auth-1.7.2"
|
||||
(sources."@azure/core-rest-pipeline-1.10.1" // {
|
||||
dependencies = [
|
||||
sources."@azure/abort-controller-1.1.0"
|
||||
];
|
||||
})
|
||||
sources."@azure/core-tracing-1.1.2"
|
||||
(sources."@azure/core-util-1.2.0" // {
|
||||
dependencies = [
|
||||
sources."@azure/abort-controller-1.1.0"
|
||||
];
|
||||
})
|
||||
sources."@azure/logger-1.1.3"
|
||||
sources."@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5"
|
||||
sources."@bmewburn/js-beautify-1.15.2"
|
||||
sources."@bmewburn/vscode-html-languageserver-1.11.0"
|
||||
sources."@isaacs/cliui-8.0.2"
|
||||
(sources."@mapbox/node-pre-gyp-1.0.11" // {
|
||||
dependencies = [
|
||||
sources."abbrev-1.1.1"
|
||||
sources."nopt-5.0.0"
|
||||
];
|
||||
})
|
||||
sources."@microsoft/applicationinsights-web-snippet-1.2.1"
|
||||
sources."@mixmark-io/domino-2.2.0"
|
||||
sources."@nodelib/fs.scandir-2.1.5"
|
||||
sources."@nodelib/fs.stat-2.0.5"
|
||||
sources."@nodelib/fs.walk-1.2.8"
|
||||
sources."@one-ini/wasm-0.1.1"
|
||||
sources."@opentelemetry/api-1.9.0"
|
||||
sources."@opentelemetry/core-1.25.1"
|
||||
sources."@opentelemetry/instrumentation-0.41.2"
|
||||
sources."@opentelemetry/resources-1.25.1"
|
||||
sources."@opentelemetry/sdk-trace-base-1.25.1"
|
||||
sources."@opentelemetry/semantic-conventions-1.25.1"
|
||||
sources."@protobufjs/aspromise-1.1.2"
|
||||
sources."@protobufjs/base64-1.1.2"
|
||||
sources."@protobufjs/codegen-2.0.4"
|
||||
sources."@protobufjs/eventemitter-1.1.0"
|
||||
sources."@protobufjs/fetch-1.1.0"
|
||||
sources."@protobufjs/float-1.0.2"
|
||||
sources."@protobufjs/inquire-1.1.0"
|
||||
sources."@protobufjs/path-1.1.2"
|
||||
sources."@protobufjs/pool-1.1.0"
|
||||
sources."@protobufjs/utf8-1.1.0"
|
||||
sources."@selderee/plugin-htmlparser2-0.11.0"
|
||||
sources."@tootallnate/once-2.0.0"
|
||||
sources."@tootallnate/quickjs-emscripten-0.23.0"
|
||||
sources."@types/node-20.14.12"
|
||||
sources."@types/shimmer-1.2.0"
|
||||
sources."@vscode/l10n-0.0.18"
|
||||
sources."abbrev-2.0.0"
|
||||
sources."acorn-8.12.1"
|
||||
sources."acorn-import-assertions-1.9.0"
|
||||
sources."agent-base-6.0.2"
|
||||
sources."ansi-regex-5.0.1"
|
||||
sources."ansi-styles-6.2.1"
|
||||
sources."applicationinsights-2.7.3"
|
||||
sources."applicationinsights-native-metrics-0.0.11"
|
||||
sources."aproba-2.0.0"
|
||||
sources."are-we-there-yet-2.0.0"
|
||||
sources."ast-types-0.13.4"
|
||||
sources."async-hook-jl-1.7.6"
|
||||
(sources."async-listener-0.6.10" // {
|
||||
dependencies = [
|
||||
sources."semver-5.7.2"
|
||||
];
|
||||
})
|
||||
sources."asynckit-0.4.0"
|
||||
sources."balanced-match-1.0.2"
|
||||
sources."basic-ftp-5.0.5"
|
||||
sources."brace-expansion-2.0.1"
|
||||
sources."braces-3.0.3"
|
||||
sources."chownr-2.0.0"
|
||||
sources."cjs-module-lexer-1.3.1"
|
||||
(sources."cls-hooked-4.2.2" // {
|
||||
dependencies = [
|
||||
sources."semver-5.7.2"
|
||||
];
|
||||
})
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
sources."color-support-1.1.3"
|
||||
sources."combined-stream-1.0.8"
|
||||
sources."commander-10.0.1"
|
||||
sources."concat-map-0.0.1"
|
||||
sources."config-chain-1.1.13"
|
||||
sources."console-control-strings-1.1.0"
|
||||
sources."continuation-local-storage-3.2.1"
|
||||
sources."cross-spawn-7.0.3"
|
||||
sources."data-uri-to-buffer-6.0.2"
|
||||
sources."debug-4.3.5"
|
||||
sources."deepmerge-4.3.1"
|
||||
sources."degenerator-5.0.1"
|
||||
sources."delayed-stream-1.0.0"
|
||||
sources."delegates-1.0.0"
|
||||
sources."detect-libc-2.0.3"
|
||||
sources."diagnostic-channel-1.1.1"
|
||||
sources."diagnostic-channel-publishers-1.0.7"
|
||||
sources."dom-serializer-2.0.0"
|
||||
sources."domelementtype-2.3.0"
|
||||
sources."domhandler-5.0.3"
|
||||
sources."domutils-3.1.0"
|
||||
sources."eastasianwidth-0.2.0"
|
||||
sources."editorconfig-1.0.4"
|
||||
sources."emitter-listener-1.1.2"
|
||||
sources."emoji-regex-9.2.2"
|
||||
sources."encoding-0.1.13"
|
||||
sources."entities-4.5.0"
|
||||
sources."escodegen-2.1.0"
|
||||
sources."esprima-4.0.1"
|
||||
sources."estraverse-5.3.0"
|
||||
sources."esutils-2.0.3"
|
||||
sources."fast-glob-3.3.2"
|
||||
sources."fastq-1.17.1"
|
||||
sources."fill-range-7.1.1"
|
||||
sources."foreground-child-3.2.1"
|
||||
sources."form-data-4.0.0"
|
||||
sources."fs-extra-11.2.0"
|
||||
(sources."fs-minipass-2.1.0" // {
|
||||
dependencies = [
|
||||
sources."minipass-3.3.6"
|
||||
];
|
||||
})
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."function-bind-1.1.2"
|
||||
(sources."gauge-3.0.2" // {
|
||||
dependencies = [
|
||||
sources."emoji-regex-8.0.0"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."string-width-4.2.3"
|
||||
sources."strip-ansi-6.0.1"
|
||||
];
|
||||
})
|
||||
sources."get-uri-6.0.3"
|
||||
(sources."glob-10.4.5" // {
|
||||
dependencies = [
|
||||
sources."minimatch-9.0.5"
|
||||
];
|
||||
})
|
||||
sources."glob-parent-5.1.2"
|
||||
sources."graceful-fs-4.2.11"
|
||||
sources."has-unicode-2.0.1"
|
||||
sources."hasown-2.0.2"
|
||||
sources."html-to-text-9.0.5"
|
||||
sources."htmlparser2-8.0.2"
|
||||
sources."http-proxy-agent-5.0.0"
|
||||
sources."https-proxy-agent-5.0.1"
|
||||
sources."iconv-lite-0.6.3"
|
||||
sources."import-in-the-middle-1.4.2"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
sources."ini-1.3.8"
|
||||
sources."ip-address-9.0.5"
|
||||
sources."is-core-module-2.15.0"
|
||||
sources."is-extglob-2.1.1"
|
||||
sources."is-fullwidth-code-point-3.0.0"
|
||||
sources."is-glob-4.0.3"
|
||||
sources."is-number-7.0.0"
|
||||
sources."isexe-2.0.0"
|
||||
sources."jackspeak-3.4.3"
|
||||
sources."js-cookie-3.0.5"
|
||||
sources."jsbn-1.1.0"
|
||||
sources."jsonfile-6.1.0"
|
||||
sources."leac-0.6.0"
|
||||
sources."long-5.2.3"
|
||||
sources."lru-cache-10.2.2"
|
||||
(sources."make-dir-3.1.0" // {
|
||||
dependencies = [
|
||||
sources."semver-6.3.1"
|
||||
];
|
||||
})
|
||||
sources."merge2-1.4.1"
|
||||
sources."micromatch-4.0.7"
|
||||
sources."mime-db-1.52.0"
|
||||
sources."mime-types-2.1.35"
|
||||
sources."minimatch-9.0.1"
|
||||
sources."minipass-7.1.2"
|
||||
(sources."minizlib-2.1.2" // {
|
||||
dependencies = [
|
||||
sources."minipass-3.3.6"
|
||||
];
|
||||
})
|
||||
sources."mkdirp-1.0.4"
|
||||
sources."module-details-from-path-1.0.3"
|
||||
sources."ms-2.1.2"
|
||||
sources."nan-2.20.0"
|
||||
sources."netmask-2.0.2"
|
||||
sources."node-fetch-2.7.0"
|
||||
sources."nopt-7.2.1"
|
||||
sources."npmlog-5.0.1"
|
||||
sources."object-assign-4.1.1"
|
||||
sources."once-1.4.0"
|
||||
(sources."pac-proxy-agent-7.0.2" // {
|
||||
dependencies = [
|
||||
sources."agent-base-7.1.1"
|
||||
sources."http-proxy-agent-7.0.2"
|
||||
sources."https-proxy-agent-7.0.5"
|
||||
];
|
||||
})
|
||||
sources."pac-resolver-7.0.1"
|
||||
sources."package-json-from-dist-1.0.0"
|
||||
sources."parseley-0.12.1"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."path-key-3.1.1"
|
||||
sources."path-parse-1.0.7"
|
||||
sources."path-scurry-1.11.1"
|
||||
sources."peberminta-0.9.0"
|
||||
sources."picomatch-2.3.1"
|
||||
sources."proto-list-1.2.4"
|
||||
sources."protobufjs-7.3.2"
|
||||
(sources."proxy-agent-6.4.0" // {
|
||||
dependencies = [
|
||||
sources."agent-base-7.1.1"
|
||||
sources."http-proxy-agent-7.0.2"
|
||||
sources."https-proxy-agent-7.0.5"
|
||||
sources."lru-cache-7.18.3"
|
||||
];
|
||||
})
|
||||
sources."proxy-from-env-1.1.0"
|
||||
sources."queue-microtask-1.2.3"
|
||||
sources."readable-stream-3.6.2"
|
||||
sources."require-in-the-middle-7.3.0"
|
||||
sources."resolve-1.22.8"
|
||||
sources."reusify-1.0.4"
|
||||
(sources."rimraf-3.0.2" // {
|
||||
dependencies = [
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."glob-7.2.3"
|
||||
sources."minimatch-3.1.2"
|
||||
];
|
||||
})
|
||||
sources."run-parallel-1.2.0"
|
||||
sources."safe-buffer-5.2.1"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."selderee-0.11.0"
|
||||
sources."semver-7.6.3"
|
||||
sources."set-blocking-2.0.0"
|
||||
sources."shebang-command-2.0.0"
|
||||
sources."shebang-regex-3.0.0"
|
||||
sources."shimmer-1.2.1"
|
||||
sources."signal-exit-4.1.0"
|
||||
sources."smart-buffer-4.2.0"
|
||||
sources."socks-2.8.3"
|
||||
(sources."socks-proxy-agent-8.0.4" // {
|
||||
dependencies = [
|
||||
sources."agent-base-7.1.1"
|
||||
];
|
||||
})
|
||||
sources."source-map-0.6.1"
|
||||
sources."sprintf-js-1.1.3"
|
||||
sources."stack-chain-1.3.7"
|
||||
sources."string-width-5.1.2"
|
||||
(sources."string-width-cjs-4.2.3" // {
|
||||
dependencies = [
|
||||
sources."emoji-regex-8.0.0"
|
||||
sources."strip-ansi-6.0.1"
|
||||
];
|
||||
})
|
||||
sources."string_decoder-1.3.0"
|
||||
(sources."strip-ansi-7.1.0" // {
|
||||
dependencies = [
|
||||
sources."ansi-regex-6.0.1"
|
||||
];
|
||||
})
|
||||
sources."strip-ansi-cjs-6.0.1"
|
||||
sources."supports-preserve-symlinks-flag-1.0.0"
|
||||
(sources."tar-6.2.1" // {
|
||||
dependencies = [
|
||||
sources."minipass-5.0.0"
|
||||
];
|
||||
})
|
||||
sources."to-regex-range-5.0.1"
|
||||
sources."tr46-0.0.3"
|
||||
sources."tslib-2.6.3"
|
||||
sources."turndown-7.2.0"
|
||||
sources."turndown-plugin-gfm-1.0.2"
|
||||
sources."typescript-5.5.4"
|
||||
sources."undici-types-5.26.5"
|
||||
sources."universalify-2.0.1"
|
||||
sources."util-deprecate-1.0.2"
|
||||
sources."uuid-8.3.2"
|
||||
sources."vscode-css-languageservice-6.3.0"
|
||||
sources."vscode-html-languageservice-5.3.0"
|
||||
sources."vscode-jsonrpc-8.2.0"
|
||||
sources."vscode-languageserver-9.0.1"
|
||||
sources."vscode-languageserver-protocol-3.17.5"
|
||||
sources."vscode-languageserver-textdocument-1.0.11"
|
||||
sources."vscode-languageserver-types-3.17.5"
|
||||
sources."vscode-uri-3.0.8"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
sources."whatwg-url-5.0.0"
|
||||
sources."which-2.0.2"
|
||||
(sources."wide-align-1.1.5" // {
|
||||
dependencies = [
|
||||
sources."emoji-regex-8.0.0"
|
||||
sources."string-width-4.2.3"
|
||||
sources."strip-ansi-6.0.1"
|
||||
];
|
||||
})
|
||||
sources."wrap-ansi-8.1.0"
|
||||
(sources."wrap-ansi-cjs-7.0.0" // {
|
||||
dependencies = [
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."emoji-regex-8.0.0"
|
||||
sources."string-width-4.2.3"
|
||||
sources."strip-ansi-6.0.1"
|
||||
];
|
||||
})
|
||||
sources."wrappy-1.0.2"
|
||||
sources."yallist-4.0.0"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "A PHP language server";
|
||||
homepage = "https://intelephense.com/";
|
||||
license = "SEE LICENSE IN LICENSE.txt";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
joplin = nodeEnv.buildNodePackage {
|
||||
name = "joplin";
|
||||
packageName = "joplin";
|
||||
|
||||
@ -88,10 +88,6 @@ final: prev: {
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ pkgs.psc-package final.pulp ];
|
||||
});
|
||||
|
||||
intelephense = prev.intelephense.override (oldAttrs: {
|
||||
meta = oldAttrs.meta // { license = lib.licenses.unfree; };
|
||||
});
|
||||
|
||||
joplin = prev.joplin.override (oldAttrs:{
|
||||
nativeBuildInputs = [
|
||||
pkgs.pkg-config
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone-cloud";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = "aioairzone-cloud";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ByXSLfcUyj8i6t5guHnJedZrevGm71ad19vA/CxwTJ4=";
|
||||
hash = "sha256-0F7x/A7kjtFAA6FBZXAD+Ugfkvh5ZfPFoU/emGmogD8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geodatasets";
|
||||
version = "2024.7.0";
|
||||
version = "2024.8.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "geopandas";
|
||||
repo = "geodatasets";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DNM3DUtj+hfwiqjnCf3OSiSuuf1AbFnyCN9KPDBisyU=";
|
||||
hash = "sha256-GJ7RyFlohlRz0RbQ80EewZUmIX9CJkSfUMY/uMNTtEM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ollama";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "ollama";
|
||||
repo = "ollama-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uz2mUcFFVeJ+85DElJ3kcxpke3DZjXl91FJ+6tYGj9c=";
|
||||
hash = "sha256-PFujhac1Y1q4sy/bhaPYw6cHuoiholaNoDNhtQW8IW4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pony";
|
||||
version = "0.7.18";
|
||||
version = "0.7.19";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8" || pythonAtLeast "3.13";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "ponyorm";
|
||||
repo = "pony";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2qGkHPBbfFrjJatKVa44bDbn/i3/YH/8LWd8CXyFRqo=";
|
||||
hash = "sha256-fYzwdHRB9QrIJPEk8dqtPggSnJeugDyC9zQSM6u3rN0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymetno";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "PyMetno";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wRSUIaonjjucLM+A4GsF9Lrq2vZYCquEvblbmjKYpQE=";
|
||||
hash = "sha256-0QODCJmGxgSKsTbsq4jsoP3cTy/0y6hq63j36bj7Dvo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
41
pkgs/development/python-modules/reflex-chakra/default.nix
Normal file
41
pkgs/development/python-modules/reflex-chakra/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reflex-chakra";
|
||||
version = "0.5.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reflex-dev";
|
||||
repo = "reflex-chakra";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EEU2BdkAJ3jPGMUCfXprUIGTXRbOK+uFtoWmjrBsclY=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# Circular dependency
|
||||
"reflex"
|
||||
];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
# pythonImportsCheck = [ "reflex_chakra" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Chakra Implementation in Reflex";
|
||||
homepage = "https://github.com/reflex-dev/reflex-chakra";
|
||||
changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -27,7 +27,9 @@
|
||||
python-engineio,
|
||||
python-multipart,
|
||||
python-socketio,
|
||||
pythonOlder,
|
||||
redis,
|
||||
reflex-chakra,
|
||||
reflex-hosting-cli,
|
||||
rich,
|
||||
sqlmodel,
|
||||
@ -44,17 +46,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reflex";
|
||||
version = "0.5.9";
|
||||
version = "0.5.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reflex-dev";
|
||||
repo = "reflex";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QeEggHPilCLjUQ76AYDkqdf1iWLwCyAYTnf17RdhDq0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8nwVB5FthDbhQRO663vRTqT8KPtStbdSgEoZ75EnhmE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "fastapi" ];
|
||||
pythonRelaxDeps = [
|
||||
"fastapi"
|
||||
"gunicorn"
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"setuptools"
|
||||
"build"
|
||||
@ -80,6 +88,7 @@ buildPythonPackage rec {
|
||||
python-multipart
|
||||
python-socketio
|
||||
redis
|
||||
reflex-chakra
|
||||
reflex-hosting-cli
|
||||
rich
|
||||
sqlmodel
|
||||
@ -106,7 +115,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# touches network
|
||||
# Tests touche network
|
||||
"test_find_and_check_urls"
|
||||
"test_event_actions"
|
||||
"test_upload_file"
|
||||
@ -118,6 +127,7 @@ buildPythonPackage rec {
|
||||
"test_preprocess" # KeyError: 'reflex___state____state'
|
||||
"test_send" # AssertionError: Expected 'post' to have been called once. Called 0 times.
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"benchmarks/"
|
||||
"integration/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlmodel";
|
||||
version = "0.0.21";
|
||||
version = "0.0.22";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "tiangolo";
|
||||
repo = "sqlmodel";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8Lw3UHHDs/jn65JHGh3bQOQJeNiSnjdc10yRQrwIC/8=";
|
||||
hash = "sha256-y6lY6DlfdCF5dliRkiU6r+ny/a9ssDtqRmF+/rcKFkg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urwidgets";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "AnonymouX47";
|
||||
repo = "urwidgets";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ultlfNeCGFTqKaMeXu0+NihkN5/6NtMewk33YfIzhu8=";
|
||||
hash = "sha256-RgY7m0smcdUspGkCdzepxruEMDq/mAsVFNjHMLoWAyc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -35,10 +35,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# -file://///filer01/MY_HOME/dev/XMLSCHEMA/test.xsd
|
||||
# +file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd
|
||||
"test_normalize_url_slashes"
|
||||
"test_normalize_url_with_base_unc_path"
|
||||
# Incorrect error message in pickling test for Python 3.12 in Debian
|
||||
# https://github.com/sissaschool/xmlschema/issues/412
|
||||
"test_pickling_subclassed_schema__issue_263"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "xmlschema" ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "altair";
|
||||
version = "7.3.4";
|
||||
version = "7.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
|
||||
sha256 = "sha256-wl5qlUhnwqqYM830m6KWNQBY2jVMh715HahLngyiL+I=";
|
||||
sha256 = "sha256-Cqtb48OabU2rGbbZIEfLS2J3o3UMkt1U75U8JU097rs=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "firebase-tools";
|
||||
version = "13.15.4";
|
||||
version = "13.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firebase";
|
||||
repo = "firebase-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sVLzEswyewffGoHhc/eJvOoHzMbMmoq1M23noJmvWxE=";
|
||||
hash = "sha256-aDEZ82fqiFcalOjnzHRYb4kV4vYh83WmM0DSO+QoHww=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-hBXcA/rmbictMuBihu1kDgkriunwC+gP/lWEhaPklLM=";
|
||||
npmDepsHash = "sha256-fLn4j2u5Bjv2r9aQPsqFuGdSSu8hcUeHqoNq3CddDCU=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
|
||||
@ -2,20 +2,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-minimock";
|
||||
version = "3.3.14";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gojuno";
|
||||
repo = "minimock";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-J4clMn65l7L+qSHbJBMDDRoEfgGHKllRu8nvTGlbgaw=";
|
||||
hash = "sha256-IfowEauUoMybElxThsAZxtdZu3LCqwgpJM5wLQI/yAc=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X main.version=${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-60mOX0N8q9Q4Cb1G3hxQgykkDgvrVLYaZElptsW1PPI=";
|
||||
vendorHash = "sha256-ObyIiHidGioSelX2qplFMkC0KX44h0rT6ePa3QKpNfU=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -18,6 +18,9 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-02Zkp7Vc1M5iZsG4iJL30S73T2HHg3lqrPJ9mW3FOuk=";
|
||||
};
|
||||
|
||||
# upstream uses `#![deny(warnings)]` which breaks our build
|
||||
RUSTFLAGS = "--cap-lints allow";
|
||||
|
||||
cargoHash = "sha256-zp7qklME28HNGomAcQgrEi7W6zQ1QCJc4FjxtnKySUE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.2.120";
|
||||
version = "0.2.124";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-n+EWwjz4+zmwqDGzBRi2rtnxe+mxd906JcqtrbGiz4w=";
|
||||
hash = "sha256-l+rq3L4JQcc8mXbBukAOTtoX0Z7fudYxAIPnPFvupjQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RtHTAigoPlmop9XURD1nw1nCkGJCdYwFUnp5AWp3x3M=";
|
||||
vendorHash = "sha256-rFFaRtEXc+rCCxUckrnFq79zIXg2XETa+hPZo1usBrc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brogue-ce";
|
||||
version = "1.14";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmewett";
|
||||
repo = "BrogueCE";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cEPFujWBzm7CQWDVmrdiCMcj4rnweAldufWtkAjUA3c=";
|
||||
hash = "sha256-habmfq1jZa70eggLOgsPT6j1OGmmQ6qmWcCwRN2G4Fo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "utm";
|
||||
version = "4.5.3";
|
||||
version = "4.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
|
||||
hash = "sha256-7hpWTe6TvnNodFt1rSRGougeZuEjvSeuVzBWFfYo53Y=";
|
||||
hash = "sha256-GzwokK/q8S38lbOVhGgNaqbDAAryHJ9eBAAWGpuOQOE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg makeWrapper ];
|
||||
|
||||
@ -91,6 +91,7 @@ lib.overrideDerivation (buildLinux (args // {
|
||||
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
|
||||
'' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) ''
|
||||
copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb
|
||||
copyDTB bcm2710-rpi-zero-2-w.dtb bcm2837-rpi-zero-2-w.dtb
|
||||
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
|
||||
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
|
||||
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
|
||||
|
||||
@ -829,7 +829,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
publicDomain
|
||||
];
|
||||
maintainers = with lib.maintainers; [ flokli kloenk ];
|
||||
platforms = lib.platforms.linux;
|
||||
# See src/basic/missing_syscall_def.h
|
||||
platforms = with lib.platforms; lib.intersectLists linux
|
||||
(aarch ++ x86 ++ loongarch64 ++ m68k ++ mips ++ power ++ riscv ++ s390);
|
||||
priority = 10;
|
||||
badPlatforms = [
|
||||
# https://github.com/systemd/systemd/issues/20600#issuecomment-912338965
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "komga";
|
||||
version = "1.11.2";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
|
||||
sha256 = "sha256-gbn0vhk+lYBPnAPwWwbAd+2AQKOkYW+akal/9tUVKVI=";
|
||||
sha256 = "sha256-vyVzUdbI3+t64BXBRtGPlBARc0aSqUe4Zg8NZ5rEACA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "26.0",
|
||||
"version": "27.0",
|
||||
"platforms": {
|
||||
"aarch64-linux": {
|
||||
"arch": "linux-arm64",
|
||||
"hash": "sha256-ZexCxgBkscKTij0lfvAv4WI8bjpR29QGZhBav8C8TmQ="
|
||||
"hash": "sha256-6o4pF1ACE0+qlbR/MrhnT+nfBwYuffb4yme64/hjPwU="
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"arch": "linux-amd64",
|
||||
"hash": "sha256-YFkr5iynq7q6w0oXlDGr/CnreBxvi7WVOtu6fKLtW2I="
|
||||
"hash": "sha256-0ZS/G88+dRXpPHeRBO3rh1r45GOMMWmmiOEYm05VASE="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"arch": "darwin-amd64",
|
||||
"hash": "sha256-FkWie6DgIhgojrn48rt9/GT0Lmu7jt74q2rzw1MI2Ws="
|
||||
"hash": "sha256-3KhYxxWZJOz7XWm0chvHj2q6fNGVasVIQv+UiZRx3E4="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"arch": "darwin-arm64",
|
||||
"hash": "sha256-ejw8B+DmCQs6cUSiLueY9tSdWnrFSFvLMS36U4+v8N4="
|
||||
"hash": "sha256-6u9U9Vww2m+R3pwG6whvKgrcsckqBoK5DfutGkQpiqI="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -52,8 +52,8 @@ in rec {
|
||||
};
|
||||
|
||||
unifi8 = generic {
|
||||
version = "8.3.32";
|
||||
suffix = "-896f48ed11";
|
||||
sha256 = "sha256-pqylClAEQtkEExIPOY1pRiymmYFvWxOOcqy+iCkWx5w=";
|
||||
version = "8.4.59";
|
||||
suffix = "-y2b2oj1o96";
|
||||
sha256 = "sha256-VwRvU+IHJs6uThdWF0uOqxz4cegBykYzB/fD0/AGPaM=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1038,11 +1038,11 @@ self: with self; {
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libFS";
|
||||
version = "1.0.9";
|
||||
version = "1.0.10";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/lib/libFS-1.0.9.tar.xz";
|
||||
sha256 = "12i0zh1v5zlba617nam8sjhfqi68qqnl7z5hsz3wqhijid1pjwsr";
|
||||
url = "mirror://xorg/individual/lib/libFS-1.0.10.tar.xz";
|
||||
sha256 = "0xrv9x5v6km7ib3d5k9xr704xkhfvigh8i507mb9i706hqybvawv";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
|
||||
@ -168,7 +168,7 @@ mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
|
||||
mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2
|
||||
mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz
|
||||
mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz
|
||||
mirror://xorg/individual/lib/libFS-1.0.9.tar.xz
|
||||
mirror://xorg/individual/lib/libFS-1.0.10.tar.xz
|
||||
mirror://xorg/individual/lib/libICE-1.1.1.tar.xz
|
||||
mirror://xorg/individual/lib/libpciaccess-0.18.1.tar.xz
|
||||
mirror://xorg/individual/lib/libSM-1.2.4.tar.xz
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "forgit";
|
||||
version = "24.06.0";
|
||||
version = "24.09.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = version;
|
||||
hash = "sha256-odxdySx3Bzxs5RMXJ4nivwltQYIaM/UrPb+A0/pnDSk=";
|
||||
hash = "sha256-8QgnEu41BHeX6heP2slQT+X+Dti+7Ij+J2zqmU4dm3I=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "license-generator";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-OIut6eE8cm7eBeHwuCUqSMDH48ZiJpF4vFaQ6wVLnfg=";
|
||||
hash = "sha256-RofgO5pJJlHP1rHFK5pgvi1TF77ZYrLYP5EML43zQMI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tv3Qx4JP2Lbl+k686mX7acabh7nyP1E9w7cQUnjh+pE=";
|
||||
cargoHash = "sha256-6iJJ6ZK5ZUfKG+1qYehz1LeYs6kzS1QlTjIogCLWjZA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line tool for generating license files";
|
||||
|
||||
@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec {
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
buildFeatures = [ "web" ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlite3-to-mysql";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "techouse";
|
||||
repo = "sqlite3-to-mysql";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XmjPGY8+WiuWkfWvzHsLbgopV0qBtqC2jjMeBU/XtFw=";
|
||||
hash = "sha256-13NLtP9gDd9hrwY09+7CuM4Rl+Hce82TETdfwBC/5HI=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uhubctl";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvp";
|
||||
repo = "uhubctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Rt9hTT0Tn8v+J1XqZm8iXTTY4nKow2qjRPNmNCiWNoY=";
|
||||
sha256 = "sha256-mpeDePHLsa4sGe2+8X9KQ8AYn7wtybDnaZzxnf4oETQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "11.18.0";
|
||||
version = "11.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-B9Pa17Fyw+t6EjDay2A0SuXkzCGX+LldF+X0qF7xHo4=";
|
||||
hash = "sha256-PeEnQSpwasgAnm6sHzNcqYOcRRH2DYAvcd0lwda5zdk=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-5wq5Hkw7BcfT2EgSJvTVYN0EVfCzqBAJHOVOtFKNj30=";
|
||||
vendorHash = "sha256-mS+79EvNCQJeE90WZDLvj2akMWtarVAolAralZHsZuU=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@ -1,27 +1,29 @@
|
||||
{ fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }:
|
||||
{ fetchFromGitHub, lib, stdenv, makeWrapper, openssl, perl, perlPackages, pkg-config }:
|
||||
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amtterm";
|
||||
version = "1.7-1";
|
||||
version = "1.7-1-unstable-2023-10-27";
|
||||
|
||||
buildInputs = with perlPackages; [ perl SOAPLite ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = (with perlPackages; [ perl SOAPLite ]) ++ [ openssl ];
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kraxel.org/cgit/amtterm/snapshot/amtterm-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-WrYWAXLW74hb/DfSiPyiFIGAUfDQFdNEPx+XevZYcyk=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kraxel";
|
||||
repo = "amtterm";
|
||||
rev = "ed5da502cbb150982ad982211ad9475414b8689a";
|
||||
hash = "sha256-JwS2agmJJ6VcGLkNbkFRb5bzKV8el1DMDjalmLnOdE8=";
|
||||
};
|
||||
|
||||
makeFlags = [ "prefix=$(out)" "STRIP=" ];
|
||||
makeFlags = [ "prefix=$(out)" "STRIP=" "USE_OPENSSL=1" ];
|
||||
|
||||
postInstall =
|
||||
"wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB";
|
||||
|
||||
meta = with lib;
|
||||
{ description = "Intel AMT® SoL client + tools";
|
||||
homepage = "https://www.kraxel.org/cgit/amtterm/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
meta = {
|
||||
description = "Intel AMT® SoL client + tools";
|
||||
homepage = "https://www.kraxel.org/cgit/amtterm/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jumppad";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jumppad-labs";
|
||||
repo = "jumppad";
|
||||
rev = version;
|
||||
hash = "sha256-JGc24CzSoEvm1+2NLWvWfAvWlRwxNnddemlQfz3YpQM=";
|
||||
hash = "sha256-k8ZSiV+9pEmczTCb51rj5HP1rm6Us78HWi81uJhL9EM=";
|
||||
};
|
||||
vendorHash = "sha256-dqCnk1g8ksznC79En4C29oB1gmZcZMkxd70Lz62Adgc=";
|
||||
vendorHash = "sha256-R1B6JQBD2qOEWFngMDkQH0rxvLNdVGS6B3aF+UWH3C4=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -24570,7 +24570,12 @@ with pkgs;
|
||||
faslExt = "fasl";
|
||||
flags = [ "--dynamic-space-size" "3000" ];
|
||||
};
|
||||
sbcl = sbcl_2_4_7;
|
||||
sbcl_2_4_8 = wrapLisp {
|
||||
pkg = callPackage ../development/compilers/sbcl { version = "2.4.8"; };
|
||||
faslExt = "fasl";
|
||||
flags = [ "--dynamic-space-size" "3000" ];
|
||||
};
|
||||
sbcl = sbcl_2_4_8;
|
||||
|
||||
sbclPackages = recurseIntoAttrs sbcl.pkgs;
|
||||
|
||||
@ -29729,8 +29734,6 @@ with pkgs;
|
||||
|
||||
keepass-diff = callPackage ../applications/misc/keepass-diff { };
|
||||
|
||||
keeweb = callPackage ../applications/misc/keeweb { };
|
||||
|
||||
evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; };
|
||||
evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };
|
||||
evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };
|
||||
@ -31566,11 +31569,6 @@ with pkgs;
|
||||
|
||||
lxdvdrip = callPackage ../applications/video/lxdvdrip { };
|
||||
|
||||
handbrake = callPackage ../applications/video/handbrake {
|
||||
inherit (darwin.apple_sdk.frameworks) AudioToolbox Foundation VideoToolbox;
|
||||
inherit (darwin) libobjc;
|
||||
};
|
||||
|
||||
handlr = callPackage ../tools/misc/handlr { };
|
||||
|
||||
jftui = callPackage ../applications/video/jftui { };
|
||||
|
||||
@ -13662,6 +13662,8 @@ self: super: with self; {
|
||||
|
||||
reflex = callPackage ../development/python-modules/reflex { };
|
||||
|
||||
reflex-chakra = callPackage ../development/python-modules/reflex-chakra { };
|
||||
|
||||
reflex-hosting-cli = callPackage ../development/python-modules/reflex-hosting-cli { };
|
||||
|
||||
reflink = callPackage ../development/python-modules/reflink { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user