Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -620,11 +620,6 @@ lib.mapAttrs mkLicense (
|
||||
fullName = "Unspecified free software license";
|
||||
};
|
||||
|
||||
freeimage = {
|
||||
spdxId = "FreeImage";
|
||||
fullName = "FreeImage Public License v1.0";
|
||||
};
|
||||
|
||||
fsl11Mit = {
|
||||
fullName = "Functional Source License, Version 1.1, MIT Future License";
|
||||
spdxId = "FSL-1.1-MIT";
|
||||
|
||||
@@ -10956,6 +10956,12 @@
|
||||
githubId = 993484;
|
||||
name = "Greg Hale";
|
||||
};
|
||||
imatpot = {
|
||||
email = "nixpkgs@brnk.vc";
|
||||
github = "imatpot";
|
||||
githubId = 39416660;
|
||||
name = "Mladen Branković";
|
||||
};
|
||||
imgabe = {
|
||||
email = "gabrielpmonte@hotmail.com";
|
||||
github = "ImGabe";
|
||||
@@ -14734,6 +14740,13 @@
|
||||
githubId = 54189319;
|
||||
name = "Lilly Cham";
|
||||
};
|
||||
lilyball = {
|
||||
email = "lily@ballards.net";
|
||||
github = "lilyball";
|
||||
githubId = 714;
|
||||
matrix = "@esperlily:matrix.org";
|
||||
name = "Lily Ballard";
|
||||
};
|
||||
limeytexan = {
|
||||
email = "limeytexan@gmail.com";
|
||||
github = "limeytexan";
|
||||
|
||||
@@ -7,20 +7,25 @@
|
||||
gettext,
|
||||
pkg-config,
|
||||
cscope,
|
||||
ruby,
|
||||
ruby_3_4,
|
||||
tcl,
|
||||
perl,
|
||||
luajit,
|
||||
darwin,
|
||||
libiconv,
|
||||
python3,
|
||||
enablePython ? false,
|
||||
rcodesign,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals optionalString;
|
||||
in
|
||||
|
||||
# Try to match MacVim's documented script interface compatibility
|
||||
let
|
||||
#perl = perl540;
|
||||
# Ruby 3.3
|
||||
#ruby = ruby_3_3;
|
||||
# Ruby 3.4
|
||||
ruby = ruby_3_4;
|
||||
|
||||
# Building requires a few system tools to be in PATH.
|
||||
# Some of these we could patch into the relevant source files (such as xcodebuild and
|
||||
@@ -35,13 +40,13 @@ in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "macvim";
|
||||
|
||||
version = "179";
|
||||
version = "181";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "macvim-dev";
|
||||
repo = "macvim";
|
||||
rev = "release-${finalAttrs.version}";
|
||||
hash = "sha256-L9LVXyeA09aMtNf+b/Oo+eLpeVEKTD1/oNWCiFn5FbU=";
|
||||
hash = "sha256-Wdq+eXSaGs+y+75ZbxoNAcyopRkWRHHRm05T0SHBrow=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -49,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
buildSymlinks
|
||||
];
|
||||
]
|
||||
++ optional stdenv.isAarch64 rcodesign;
|
||||
buildInputs = [
|
||||
gettext
|
||||
ncurses
|
||||
@@ -58,8 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ruby
|
||||
tcl
|
||||
perl
|
||||
python3
|
||||
];
|
||||
]
|
||||
++ optional enablePython python3;
|
||||
|
||||
patches = [ ./macvim.patch ];
|
||||
|
||||
@@ -71,14 +77,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--enable-multibyte"
|
||||
"--enable-nls"
|
||||
"--enable-luainterp=dynamic"
|
||||
]
|
||||
++ optionals enablePython [
|
||||
"--enable-python3interp=dynamic"
|
||||
]
|
||||
++ [
|
||||
"--enable-perlinterp=dynamic"
|
||||
"--enable-rubyinterp=dynamic"
|
||||
"--enable-tclinterp=yes"
|
||||
"--without-local-dir"
|
||||
"--with-luajit"
|
||||
"--with-lua-prefix=${luajit}"
|
||||
]
|
||||
++ optionals enablePython [
|
||||
"--with-python3-command=${python3}/bin/python3"
|
||||
]
|
||||
++ [
|
||||
"--with-ruby-command=${ruby}/bin/ruby"
|
||||
"--with-tclsh=${tcl}/bin/tclsh"
|
||||
"--with-tlib=ncurses"
|
||||
@@ -92,6 +106,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
echo "Patching file src/MacVim/MacVim.xcodeproj/project.pbxproj"
|
||||
sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj
|
||||
''
|
||||
# Xcode 26.0 sets *_DEPLOYMENT_TARGET env vars for all platforms in shell script build phases.
|
||||
# This breaks invocations of clang in those phases, as they target the wrong platform.
|
||||
# Note: The shell script build phase in question uses /bin/zsh.
|
||||
+ ''
|
||||
substituteInPlace src/MacVim/MacVim.xcodeproj/project.pbxproj \
|
||||
--replace-fail 'make \' $'for x in ''${(k)parameters}; do if [[ $x = *_DEPLOYMENT_TARGET ]]; then [[ $x = MACOSX_DEPLOYMENT_TARGET ]] || unset $x; fi; done\nmake \\'
|
||||
'';
|
||||
|
||||
# This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a
|
||||
@@ -101,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
let
|
||||
# ideally we'd recurse, but we don't need that right now
|
||||
inputs = [ ncurses ] ++ perl.propagatedBuildInputs;
|
||||
ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs;
|
||||
ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs ++ [ "-headerpad_max_install_names" ];
|
||||
cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs;
|
||||
in
|
||||
''
|
||||
@@ -131,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# as the scheme seems to have the wrong default.
|
||||
+ ''
|
||||
configureFlagsArray+=(
|
||||
XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData"
|
||||
XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData LDFLAGS='\$(inherited) -headerpad_max_install_names' ENABLE_CODE_COVERAGE=NO"
|
||||
--with-xcodecfg="Release"
|
||||
)
|
||||
'';
|
||||
@@ -149,9 +170,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Xcode project or pass it as a flag to xcodebuild as well.
|
||||
postConfigure = ''
|
||||
substituteInPlace src/auto/config.mk \
|
||||
--replace " -L${stdenv.cc.libc}/lib" "" \
|
||||
--replace " -L${darwin.libunwind}/lib" "" \
|
||||
--replace " -L${libiconv}/lib" ""
|
||||
--replace-warn " -L${stdenv.cc.libc}/lib" "" \
|
||||
--replace-warn " -L${darwin.libunwind}/lib" "" \
|
||||
--replace-warn " -L${libiconv}/lib" ""
|
||||
|
||||
# All the libraries we stripped have -osx- in their name as of this time.
|
||||
# Assert now that this pattern no longer appears in config.mk.
|
||||
@@ -191,12 +212,21 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libperl=$(dirname $(find ${perl} -name "libperl.dylib"))
|
||||
install_name_tool -add_rpath ${luajit}/lib $exe
|
||||
install_name_tool -add_rpath ${tcl}/lib $exe
|
||||
''
|
||||
+ optionalString enablePython ''
|
||||
install_name_tool -add_rpath ${python3}/lib $exe
|
||||
''
|
||||
+ ''
|
||||
install_name_tool -add_rpath $libperl $exe
|
||||
install_name_tool -add_rpath ${ruby}/lib $exe
|
||||
|
||||
# Remove manpages from tools we aren't providing
|
||||
find $out/Applications/MacVim.app/Contents/man -name evim.1 -delete
|
||||
find $out/Applications/MacVim.app/Contents/man \( -name evim.1 -or -name eview.1 \) -delete
|
||||
rm $out/Applications/MacVim.app/Contents/man/man1/mvim.1
|
||||
''
|
||||
+ optionalString stdenv.isAarch64 ''
|
||||
# Resign the binary and set the linker-signed flag.
|
||||
rcodesign sign --code-signature-flags linker-signed $exe
|
||||
'';
|
||||
|
||||
# We rely on the user's Xcode install to build. It may be located in an arbitrary place, and
|
||||
@@ -212,33 +242,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Vim - the text editor - for macOS";
|
||||
homepage = "https://macvim.org/";
|
||||
license = licenses.vim;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ lilyball ];
|
||||
platforms = platforms.darwin;
|
||||
hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile
|
||||
# Needs updating to a newer MacVim for Python and Ruby version support
|
||||
broken = true;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2023-46246"
|
||||
"CVE-2023-48231"
|
||||
"CVE-2023-48232"
|
||||
"CVE-2023-48233"
|
||||
"CVE-2023-48234"
|
||||
"CVE-2023-48235"
|
||||
"CVE-2023-48236"
|
||||
"CVE-2023-48237"
|
||||
"CVE-2023-48706"
|
||||
"CVE-2023-5344"
|
||||
"CVE-2023-5441"
|
||||
"CVE-2023-5535"
|
||||
"CVE-2024-22667"
|
||||
"CVE-2024-41957"
|
||||
"CVE-2024-41965"
|
||||
"CVE-2024-43374"
|
||||
"CVE-2024-47814"
|
||||
"CVE-2025-1215"
|
||||
"CVE-2025-22134"
|
||||
"CVE-2025-24014"
|
||||
"CVE-2025-26603"
|
||||
"CVE-2025-29768"
|
||||
"CVE-2025-53905"
|
||||
"CVE-2025-53906"
|
||||
|
||||
@@ -199,16 +199,3 @@ index 6e33142..6185f45 100644
|
||||
#ifdef AMIGA
|
||||
# include "os_amiga.h"
|
||||
#endif
|
||||
diff --git a/src/vimtutor b/src/vimtutor
|
||||
index 3b154f2..e89f260 100755
|
||||
--- a/src/vimtutor
|
||||
+++ b/src/vimtutor
|
||||
@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
|
||||
if test "$1" = "-g"; then
|
||||
# Try to use the GUI version of Vim if possible, it will fall back
|
||||
# on Vim if Gvim is not installed.
|
||||
- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
|
||||
+ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
|
||||
shift
|
||||
fi
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
ninja,
|
||||
qtbase,
|
||||
@@ -19,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "CopyQ";
|
||||
version = "11.0.0";
|
||||
version = "13.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/t+8YsqeX0tlxwQDDNTalttCDIgGhpLbzYe3UqY04xM=";
|
||||
hash = "sha256-wxjUL5mGXAMNVGP+dAh1NrE9tw71cJW9zmLsaCVphTo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,12 +49,21 @@ stdenv.mkDerivation rec {
|
||||
kdePackages.kconfig
|
||||
kdePackages.kstatusnotifieritem
|
||||
kdePackages.knotifications
|
||||
kdePackages.kguiaddons
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "WITH_QT6" true)
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://github.com/hluk/CopyQ/pull/3268
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/hluk/CopyQ/commit/103903593c37c9db5406d276e0097fbf18d2a8c4.patch?full_index=1";
|
||||
hash = "sha256-zywE6ntMw+WvTyilXwvd4lfQRAAB9R/AGpwtwwPFZZE=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://hluk.github.io/CopyQ";
|
||||
description = "Clipboard Manager with Advanced Features";
|
||||
|
||||
@@ -353,6 +353,15 @@
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-u/ycUCnEYlCBrDcI0VCkob4CGXrXYdGWwiw5EeJyuiw="
|
||||
},
|
||||
"e-breuninger_netbox": {
|
||||
"hash": "sha256-iCaCt8ZbkxCk43QEyj3PeHYuKPCPVU2oQ78aumH/l6k=",
|
||||
"homepage": "https://registry.terraform.io/providers/e-breuninger/netbox",
|
||||
"owner": "e-breuninger",
|
||||
"repo": "terraform-provider-netbox",
|
||||
"rev": "v5.0.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0="
|
||||
},
|
||||
"equinix_equinix": {
|
||||
"hash": "sha256-QE8ukiQHZqhSsZyFnInIpnGvsSlFuFMun7paK/Z3HTM=",
|
||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d12bd0db..f904000b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@
|
||||
## along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
##
|
||||
|
||||
-cmake_minimum_required(VERSION 2.8.6)
|
||||
+cmake_minimum_required(VERSION 3.10)
|
||||
|
||||
project(DSView)
|
||||
|
||||
@@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = [
|
||||
# Fix absolute install paths
|
||||
./install.patch
|
||||
./cmake4.patch
|
||||
];
|
||||
|
||||
# /build/source/libsigrok4DSL/strutil.c:343:19: error: implicit declaration of function 'strcasecmp'; did you mean 'g_strcasecmp'? []
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
let
|
||||
pname = "altair";
|
||||
version = "8.2.5";
|
||||
version = "8.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
|
||||
sha256 = "sha256-P0CVJFafrsvWzDWyJZEds812m3yUDpo4eocysEIQqrw=";
|
||||
sha256 = "sha256-uLqtrF5WWJ5+6bN/h4u/vdvTlbQtZID1osujfuJad4U=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
||||
@@ -79,6 +79,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
echo "find_package(Threads)" >> cmake/options.cmake
|
||||
|
||||
substituteInPlace src/libs/ec/abstracts/CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.8)" "CMAKE_MINIMUM_REQUIRED (VERSION 3.10)"
|
||||
'';
|
||||
|
||||
# aMule will try to `dlopen' libupnp and libixml, so help it
|
||||
|
||||
@@ -888,5 +888,183 @@
|
||||
"hash": "sha256-o4tCuCAIgAYg/Li3wTs12mVWr5C/4vbwu1zi+kJ9d6w=",
|
||||
"version": "11417.121.6"
|
||||
}
|
||||
},
|
||||
"26.0": {
|
||||
"CarbonHeaders": {
|
||||
"hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
|
||||
"version": "18.1"
|
||||
},
|
||||
"CommonCrypto": {
|
||||
"hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=",
|
||||
"version": "600035"
|
||||
},
|
||||
"IOAudioFamily": {
|
||||
"hash": "sha256-A3iiAjjP29VdjMj40tLS5Q/ni4qeh9bBpnmNzeG2pIY=",
|
||||
"version": "700.2"
|
||||
},
|
||||
"IOBDStorageFamily": {
|
||||
"hash": "sha256-OcQUJ3nEfrpvWX/npnedJ4PECIGWFSLiM0PKoiH911w=",
|
||||
"version": "26"
|
||||
},
|
||||
"IOCDStorageFamily": {
|
||||
"hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=",
|
||||
"version": "62"
|
||||
},
|
||||
"IODVDStorageFamily": {
|
||||
"hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
|
||||
"version": "46"
|
||||
},
|
||||
"IOFWDVComponents": {
|
||||
"hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
|
||||
"version": "208"
|
||||
},
|
||||
"IOFireWireAVC": {
|
||||
"hash": "sha256-qR9lSTa7PN5Z9Nis4tfuXlcZGMIU48dete/NPD0UBbE=",
|
||||
"version": "436"
|
||||
},
|
||||
"IOFireWireFamily": {
|
||||
"hash": "sha256-hmErAXjLWIelqJaCrB8J4IiIxyB7S6EHFY+AY9YhmKQ=",
|
||||
"version": "492"
|
||||
},
|
||||
"IOFireWireSBP2": {
|
||||
"hash": "sha256-Xk+PDnUaO9q46nQwHwTKf/QXtGclfs0wTWiUbcV7e4s=",
|
||||
"version": "454"
|
||||
},
|
||||
"IOFireWireSerialBusProtocolTransport": {
|
||||
"hash": "sha256-cM/VFhVWNVwdJYk+mme0UYttQd7eJwd7Hlo7KNRyHY0=",
|
||||
"version": "262"
|
||||
},
|
||||
"IOGraphics": {
|
||||
"hash": "sha256-iysZE42mOKZbFxSZBNspaBTCRKEKK38DFGBxZWQxZxI=",
|
||||
"version": "599"
|
||||
},
|
||||
"IOHIDFamily": {
|
||||
"hash": "sha256-YLnabX90g4Q8LxjwVuJF6KODCDxychWV+VJaNG9d8fI=",
|
||||
"version": "2222.0.24"
|
||||
},
|
||||
"IOKitUser": {
|
||||
"hash": "sha256-ngwi8YMUqE0q8j7Lr5cqJwi2V+IDu3ie3bduotHIUJU=",
|
||||
"version": "100222.0.4"
|
||||
},
|
||||
"IONetworkingFamily": {
|
||||
"hash": "sha256-ZF5ML41Y1l1liQn32qTkcl4mMvx9Xdizb9VgvTzVTL4=",
|
||||
"version": "186"
|
||||
},
|
||||
"IOSerialFamily": {
|
||||
"hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
|
||||
"version": "93"
|
||||
},
|
||||
"IOStorageFamily": {
|
||||
"hash": "sha256-1FKSF622qeXPGngA3UmQ2M/IU1pdlMoYBPbXytUFDaQ=",
|
||||
"version": "331"
|
||||
},
|
||||
"IOUSBFamily": {
|
||||
"hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
|
||||
"version": "630.4.5"
|
||||
},
|
||||
"Libc": {
|
||||
"hash": "sha256-k+HQ+qgye0ORFm0hU8WzE4ysbbEoFZ7wcbVl5giDH/E=",
|
||||
"version": "1725.0.11"
|
||||
},
|
||||
"Libinfo": {
|
||||
"hash": "sha256-4InBEPi0n2EMo/8mIBib1Im4iTKRcRJ4IlAcLCigVGk=",
|
||||
"version": "600"
|
||||
},
|
||||
"Libm": {
|
||||
"hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
|
||||
"version": "2026"
|
||||
},
|
||||
"Libnotify": {
|
||||
"hash": "sha256-p8cJZlBYOFmI1NDHXGYjgcv8z9Ldc1amZuYlxxJfeVY=",
|
||||
"version": "344.0.1"
|
||||
},
|
||||
"Librpcsvc": {
|
||||
"hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=",
|
||||
"version": "31"
|
||||
},
|
||||
"Libsystem": {
|
||||
"hash": "sha256-/NlSwPaoTVx+bl9hYsfz3C5MuLdqGv4vdAh0KDbDKmY=",
|
||||
"version": "1356"
|
||||
},
|
||||
"OpenDirectory": {
|
||||
"hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
|
||||
"version": "146"
|
||||
},
|
||||
"Security": {
|
||||
"hash": "sha256-oxOvZsDoNYZNiWf+MASHrR4Q2o5oaqvK2We51hH7CO8=",
|
||||
"version": "61901.0.87.0.1"
|
||||
},
|
||||
"architecture": {
|
||||
"hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=",
|
||||
"version": "282"
|
||||
},
|
||||
"configd": {
|
||||
"hash": "sha256-58or+OQP788UgQKO7Y8k8pY/enaSqH971ks7xCPu8fA=",
|
||||
"version": "1385.0.7"
|
||||
},
|
||||
"copyfile": {
|
||||
"hash": "sha256-I9uDi5BDQKa7mO3XpHxv0d6PiROW2ueZ3vGfrsG0OJo=",
|
||||
"version": "230.0.1.0.1"
|
||||
},
|
||||
"dtrace": {
|
||||
"hash": "sha256-5HpH6Cg8vWWzOX5ADD//izKDvqGnzV05Giju8lmGeyA=",
|
||||
"version": "413"
|
||||
},
|
||||
"dyld": {
|
||||
"hash": "sha256-jzoFLwbms0rUwzyjYif/r6Rmr4kyn+as/bhc4paEPeY=",
|
||||
"version": "1323.3"
|
||||
},
|
||||
"eap8021x": {
|
||||
"hash": "sha256-17bseWT4OWMA8hF+YSDDjxhVyJpbpP2xwv8dGti1YoM=",
|
||||
"version": "368.0.3"
|
||||
},
|
||||
"hfs": {
|
||||
"hash": "sha256-OkgqZ03gwn2hTuHxZrPDmQOrY4Dwu7MrX+BfG+PTgvE=",
|
||||
"version": "704.0.3.0.2"
|
||||
},
|
||||
"launchd": {
|
||||
"hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
|
||||
"version": "842.1.4"
|
||||
},
|
||||
"libclosure": {
|
||||
"hash": "sha256-pvwfcbeEJmTEPdt6/lgVswiabLRG+sMN6VT5FwG7C4Q=",
|
||||
"version": "96"
|
||||
},
|
||||
"libdispatch": {
|
||||
"hash": "sha256-L0+Ho9dAlMXVpqFEGIcIMsJc0gULckRulUImNEZe5MU=",
|
||||
"version": "1542.0.4"
|
||||
},
|
||||
"libmalloc": {
|
||||
"hash": "sha256-482hgm1ESr3LWC/JhuQNGNu9smsa2Eap49/eH+YNAio=",
|
||||
"version": "792.1.1"
|
||||
},
|
||||
"libplatform": {
|
||||
"hash": "sha256-wGZ2Im81mRXx6epgj/tbOJpg89CEbAr0Z8oFEpkyNMU=",
|
||||
"version": "359.1.2"
|
||||
},
|
||||
"libpthread": {
|
||||
"hash": "sha256-VuMpQjxuMsdHsFq0q6QIWSWi88gVF2jNzIfti20Gkbw=",
|
||||
"version": "539"
|
||||
},
|
||||
"mDNSResponder": {
|
||||
"hash": "sha256-iRqCpPAQDRjgRbRz3s6q2oyzq6xo+w4FTBai79104Zo=",
|
||||
"version": "2881.0.25"
|
||||
},
|
||||
"objc4": {
|
||||
"hash": "sha256-Nlgr36yLvGkUJIEFQ5w8FAB0r2syEsRTw0KuUShNT8E=",
|
||||
"version": "950"
|
||||
},
|
||||
"ppp": {
|
||||
"hash": "sha256-FzHZ05o7JxwgTqz0e3D68b/DiLu2x2ErzGMh0U78fLo=",
|
||||
"version": "1020.1.1"
|
||||
},
|
||||
"removefile": {
|
||||
"hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=",
|
||||
"version": "84"
|
||||
},
|
||||
"xnu": {
|
||||
"hash": "sha256-Cuf7kPtsn4CPXqyZmxVsJlA5i+Ikryp8ezJyGrvT63c=",
|
||||
"version": "12377.1.9"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,5 +38,13 @@
|
||||
],
|
||||
"version": "15.5",
|
||||
"hash": "sha256-HBiSJuw1XBUK5R/8Sj65c3rftSEvQl/O9ZZVp/g1Amo="
|
||||
},
|
||||
"26": {
|
||||
"urls": [
|
||||
"https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg",
|
||||
"https://web.archive.org/web/20250915230423/https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg"
|
||||
],
|
||||
"version": "26.0",
|
||||
"hash": "sha256-54UtisDXHCxs7vO4fZSWOYwxLbdouLxWwGisez+tlAc="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,6 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
louvain-community
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CNF minimizer and minimal independent set calculator";
|
||||
homepage = "https://github.com/meelgroup/arjun";
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 12d6e557c..cc004555d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -321,11 +321,6 @@ if(NOT TARGET nonstd::span-lite)
|
||||
|
||||
endif()
|
||||
|
||||
-af_dep_check_and_populate(${assets_prefix}
|
||||
- URI https://github.com/arrayfire/assets.git
|
||||
- REF master
|
||||
-)
|
||||
-set(ASSETS_DIR ${${assets_prefix}_SOURCE_DIR})
|
||||
|
||||
# when crosscompiling use the bin2cpp file from the native bin directory
|
||||
if(CMAKE_CROSSCOMPILING)
|
||||
@@ -473,18 +468,6 @@ install(FILES ${ArrayFire_BINARY_DIR}/include/af/version.h
|
||||
DESTINATION "${AF_INSTALL_INC_DIR}/af/"
|
||||
COMPONENT headers)
|
||||
|
||||
-# install the examples irrespective of the AF_BUILD_EXAMPLES value
|
||||
-# only the examples source files are installed, so the installation of these
|
||||
-# source files does not depend on AF_BUILD_EXAMPLES
|
||||
-# when AF_BUILD_EXAMPLES is OFF, the examples source is installed without
|
||||
-# building the example executables
|
||||
-install(DIRECTORY examples/ #NOTE The slash at the end is important
|
||||
- DESTINATION ${AF_INSTALL_EXAMPLE_DIR}
|
||||
- COMPONENT examples)
|
||||
-
|
||||
-install(DIRECTORY ${ASSETS_DIR}/examples/ #NOTE The slash at the end is important
|
||||
- DESTINATION ${AF_INSTALL_EXAMPLE_DIR}
|
||||
- COMPONENT examples)
|
||||
|
||||
install(DIRECTORY "${ArrayFire_SOURCE_DIR}/LICENSES/"
|
||||
DESTINATION LICENSES
|
||||
@@ -1,31 +0,0 @@
|
||||
diff --git a/CMakeModules/AFconfigure_deps_vars.cmake b/CMakeModules/AFconfigure_deps_vars.cmake
|
||||
index aac332f5a..e9e711159 100644
|
||||
--- a/CMakeModules/AFconfigure_deps_vars.cmake
|
||||
+++ b/CMakeModules/AFconfigure_deps_vars.cmake
|
||||
@@ -94,7 +94,7 @@ macro(af_dep_check_and_populate dep_prefix)
|
||||
URL ${adcp_args_URI}
|
||||
URL_HASH ${adcp_args_REF}
|
||||
DOWNLOAD_COMMAND \"\"
|
||||
- UPDATE_DISCONNECTED ON
|
||||
+ UPDATE_COMMAND \"\"
|
||||
SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src"
|
||||
BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build"
|
||||
SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild"
|
||||
@@ -104,7 +104,7 @@ macro(af_dep_check_and_populate dep_prefix)
|
||||
QUIET
|
||||
URL ${adcp_args_URI}
|
||||
DOWNLOAD_COMMAND \"\"
|
||||
- UPDATE_DISCONNECTED ON
|
||||
+ UPDATE_COMMAND \"\"
|
||||
SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src"
|
||||
BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build"
|
||||
SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild"
|
||||
@@ -116,7 +116,7 @@ macro(af_dep_check_and_populate dep_prefix)
|
||||
GIT_REPOSITORY ${adcp_args_URI}
|
||||
GIT_TAG ${adcp_args_REF}
|
||||
DOWNLOAD_COMMAND \"\"
|
||||
- UPDATE_DISCONNECTED ON
|
||||
+ UPDATE_COMMAND \"\"
|
||||
SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src"
|
||||
BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build"
|
||||
SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild"
|
||||
@@ -1,248 +0,0 @@
|
||||
{
|
||||
blas,
|
||||
boost,
|
||||
clblast,
|
||||
cmake,
|
||||
config,
|
||||
cudaPackages,
|
||||
fetchFromGitHub,
|
||||
fftw,
|
||||
fftwFloat,
|
||||
fmt_9,
|
||||
forge,
|
||||
freeimage,
|
||||
gtest,
|
||||
lapack,
|
||||
lib,
|
||||
libGL,
|
||||
mesa,
|
||||
ocl-icd,
|
||||
opencl-clhpp,
|
||||
pkg-config,
|
||||
python3,
|
||||
span-lite,
|
||||
stdenv,
|
||||
# NOTE: We disable tests by default, because they cannot be run easily on
|
||||
# non-NixOS systems when either CUDA or OpenCL support is enabled (CUDA and
|
||||
# OpenCL need access to drivers that are installed outside of Nix on
|
||||
# non-NixOS systems).
|
||||
doCheck ? false,
|
||||
cpuSupport ? true,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
# OpenCL needs mesa which is broken on Darwin
|
||||
openclSupport ? !stdenv.hostPlatform.isDarwin,
|
||||
# This argument lets one run CUDA & OpenCL tests on non-NixOS systems by
|
||||
# telling Nix where to find the drivers. If you know the version of the
|
||||
# Nvidia driver that is installed on your system, you can do:
|
||||
#
|
||||
# arrayfire.override {
|
||||
# nvidiaComputeDrivers =
|
||||
# callPackage
|
||||
# (prev.linuxPackages.nvidiaPackages.mkDriver {
|
||||
# version = cudaVersion; # our driver version
|
||||
# sha256_64bit = cudaHash; # sha256 of the .run binary
|
||||
# useGLVND = false;
|
||||
# useProfiles = false;
|
||||
# useSettings = false;
|
||||
# usePersistenced = false;
|
||||
# ...
|
||||
# })
|
||||
# { libsOnly = true; };
|
||||
# }
|
||||
nvidiaComputeDrivers ? null,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
# ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw
|
||||
# exceptions, which means that it isn't really supported yet...
|
||||
assert blas.isILP64 == false;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arrayfire";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arrayfire";
|
||||
repo = "arrayfire";
|
||||
rev = "v3.9.0";
|
||||
hash = "sha256-80fxdkaeAQ5u0X/UGPaI/900cdkZ/vXNcOn5tkZ+C3Y=";
|
||||
};
|
||||
|
||||
# We cannot use the clfft from Nixpkgs because ArrayFire maintain a fork
|
||||
# of clfft where they've modified the CMake build system, and the
|
||||
# CMakeLists.txt of ArrayFire assumes that we're using that fork.
|
||||
#
|
||||
# This can be removed once ArrayFire upstream their changes.
|
||||
clfft = fetchFromGitHub {
|
||||
owner = "arrayfire";
|
||||
repo = "clfft";
|
||||
rev = "760096b37dcc4f18ccd1aac53f3501a83b83449c";
|
||||
sha256 = "sha256-vJo1YfC2AJIbbRj/zTfcOUmi0Oj9v64NfA9MfK8ecoY=";
|
||||
};
|
||||
glad = fetchFromGitHub {
|
||||
owner = "arrayfire";
|
||||
repo = "glad";
|
||||
rev = "ef8c5508e72456b714820c98e034d9a55b970650";
|
||||
sha256 = "sha256-u9Vec7XLhE3xW9vzM7uuf+b18wZsh/VMtGbB6nMVlno=";
|
||||
};
|
||||
threads = fetchFromGitHub {
|
||||
owner = "arrayfire";
|
||||
repo = "threads";
|
||||
rev = "4d4a4f0384d1ac2f25b2c4fc1d57b9e25f4d6818";
|
||||
sha256 = "sha256-qqsT9woJDtQvzuV323OYXm68pExygYs/+zZNmg2sN34=";
|
||||
};
|
||||
test-data = fetchFromGitHub {
|
||||
owner = "arrayfire";
|
||||
repo = "arrayfire-data";
|
||||
rev = "a5f533d7b864a4d8f0dd7c9aaad5ff06018c4867";
|
||||
sha256 = "sha256-AWzhsrDXyZrQN2bd0Ng/XlE8v02x7QWTiFTyaAuRXSw=";
|
||||
};
|
||||
# ArrayFire fails to compile with newer versions of spdlog, so we can't use
|
||||
# the one in Nixpkgs. Once they upgrade, we can switch to using spdlog from
|
||||
# Nixpkgs.
|
||||
spdlog = fetchFromGitHub {
|
||||
owner = "gabime";
|
||||
repo = "spdlog";
|
||||
rev = "v1.9.2";
|
||||
hash = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTING=ON"
|
||||
# We do not build examples, because building tests already takes long enough...
|
||||
"-DAF_BUILD_EXAMPLES=OFF"
|
||||
# No need to build forge, because it's a separate package
|
||||
"-DAF_BUILD_FORGE=OFF"
|
||||
"-DAF_COMPUTE_LIBRARY='FFTW/LAPACK/BLAS'"
|
||||
# Prevent ArrayFire from trying to download some matrices from the Internet
|
||||
"-DAF_TEST_WITH_MTX_FILES=OFF"
|
||||
# Have to use the header-only version, because we're not using the version
|
||||
# from Nixpkgs. Otherwise, libaf.so won't be able to find the shared
|
||||
# library, because ArrayFire's CMake files do not run the install step of
|
||||
# spdlog.
|
||||
"-DAF_WITH_SPDLOG_HEADER_ONLY=ON"
|
||||
(if cpuSupport then "-DAF_BUILD_CPU=ON" else "-DAF_BUILD_CPU=OFF")
|
||||
(if openclSupport then "-DAF_BUILD_OPENCL=ON" else "-DAF_BUILD_OPENCL=OFF")
|
||||
(if cudaSupport then "-DAF_BUILD_CUDA=ON" else "-DAF_BUILD_CUDA=OFF")
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
# ArrayFire use deprecated FindCUDA in their CMake files, so we help CMake
|
||||
# locate cudatoolkit.
|
||||
"-DCUDA_LIBRARIES_PATH=${cudaPackages.cudatoolkit}/lib"
|
||||
];
|
||||
|
||||
# ArrayFire have a repo with assets for the examples. Since we don't build
|
||||
# the examples anyway, remove the dependency on assets.
|
||||
patches = [
|
||||
./no-assets.patch
|
||||
./no-download.patch
|
||||
# Fix for newer opencl-clhpp. Remove with the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/arrayfire/arrayfire/pull/3562.patch";
|
||||
hash = "sha256-AdWlpcRTn9waNAaVpZfK6sJ/xBQLiBC4nBeEYiGNN50";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p ./extern/af_glad-src
|
||||
mkdir -p ./extern/af_threads-src
|
||||
mkdir -p ./extern/af_test_data-src
|
||||
mkdir -p ./extern/ocl_clfft-src
|
||||
mkdir -p ./extern/spdlog-src
|
||||
cp -R --no-preserve=mode,ownership ${glad}/* ./extern/af_glad-src/
|
||||
cp -R --no-preserve=mode,ownership ${threads}/* ./extern/af_threads-src/
|
||||
cp -R --no-preserve=mode,ownership ${test-data}/* ./extern/af_test_data-src/
|
||||
cp -R --no-preserve=mode,ownership ${clfft}/* ./extern/ocl_clfft-src/
|
||||
cp -R --no-preserve=mode,ownership ${spdlog}/* ./extern/spdlog-src/
|
||||
|
||||
# libaf.so (the unified backend) tries to load the right shared library at
|
||||
# runtime, and the search paths are hard-coded... We tweak them to point to
|
||||
# the installation directory in the Nix store.
|
||||
substituteInPlace src/api/unified/symbol_manager.cpp \
|
||||
--replace '"/opt/arrayfire-3/lib/",' \
|
||||
"\"$out/lib/\", \"/opt/arrayfire-3/lib/\","
|
||||
'';
|
||||
|
||||
inherit doCheck;
|
||||
checkPhase =
|
||||
let
|
||||
LD_LIBRARY_PATH = builtins.concatStringsSep ":" (
|
||||
[
|
||||
"${forge}/lib"
|
||||
"${freeimage}/lib"
|
||||
]
|
||||
++ lib.optional cudaSupport "${cudaPackages.cudatoolkit}/lib64"
|
||||
# On non-NixOS systems, help the tests find Nvidia drivers
|
||||
++ lib.optional (nvidiaComputeDrivers != null) "${nvidiaComputeDrivers}/lib"
|
||||
);
|
||||
ctestFlags = builtins.concatStringsSep " " (
|
||||
# We have to run with "-j1" otherwise various segfaults occur on non-NixOS systems.
|
||||
[
|
||||
"--output-on-errors"
|
||||
"-j1"
|
||||
]
|
||||
# See https://github.com/arrayfire/arrayfire/issues/3484
|
||||
++ lib.optional openclSupport "-E '(inverse_dense|cholesky_dense)'"
|
||||
);
|
||||
in
|
||||
''
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
|
||||
''
|
||||
+
|
||||
# On non-NixOS systems, help the tests find Nvidia drivers
|
||||
lib.optionalString (openclSupport && nvidiaComputeDrivers != null) ''
|
||||
export OCL_ICD_VENDORS=${nvidiaComputeDrivers}/etc/OpenCL/vendors
|
||||
''
|
||||
+ ''
|
||||
# Note: for debugging, enable AF_TRACE=all
|
||||
AF_PRINT_ERRORS=1 ctest ${ctestFlags}
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
blas
|
||||
boost.dev
|
||||
boost.out
|
||||
clblast
|
||||
fftw
|
||||
fftwFloat
|
||||
# We need fmt_9 because ArrayFire fails to compile with newer versions.
|
||||
fmt_9
|
||||
forge
|
||||
freeimage
|
||||
gtest
|
||||
lapack
|
||||
libGL
|
||||
ocl-icd
|
||||
opencl-clhpp
|
||||
span-lite
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudaPackages.cudatoolkit
|
||||
cudaPackages.cudnn
|
||||
cudaPackages.cuda_cccl
|
||||
]
|
||||
++ lib.optionals openclSupport [
|
||||
mesa
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "General-purpose library for parallel and massively-parallel computations";
|
||||
longDescription = ''
|
||||
A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.";
|
||||
'';
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://arrayfire.com/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
chessai
|
||||
twesterhout
|
||||
];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bash-pinyin-completion-rs";
|
||||
version = "0.3.2";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AOSC-Dev";
|
||||
repo = "bash-pinyin-completion-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-r+B11TgMOhwslqygv72S9uhF7v79MAzUu5XHlD/P3HY=";
|
||||
hash = "sha256-VXIIG+ZGb4fS3LSIkGW744ui4AKTdQCjrNlObH/YZVY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -108,23 +108,23 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64";
|
||||
hash = "sha256-CYL1paAtzTbfl7TfsqwJry/dkoTO/yZdHrX0NSA1+Ig=";
|
||||
hash = "sha256-94KFvsS7fInXFTQZPzMq6DxnHQrRktljwACyAz8adSw=";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64";
|
||||
hash = "sha256-6DzTEx218/Qq38eMWvXOX/t9VJDyPczz6Edh4eHdOfg=";
|
||||
hash = "sha256-wfuZLSHa77wr0A4ZLF5DqH7qyOljYNXM2a5imoS+nGQ";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then
|
||||
fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64";
|
||||
hash = "sha256-Ut00wXzJezqlvf49RcTjk4Im8j3Qv7R77t1iWpU/HwU=";
|
||||
hash = "sha256-qAb9s6R5+EbqVfWHUT7sk1sOrbDEPv4EhgXH7nC46Zw=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
# stdenv.hostPlatform.system == "aarch64-darwin"
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64";
|
||||
hash = "sha256-ArEXuX0JIa5NT04R0n4sCTA4HfQW43NDXV0EGcaibyQ=";
|
||||
hash = "sha256-4bRp4OvkRIvhpZ2r/eFJdwrByECHy3rncDEM1tClFYo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = defaultShellUtils;
|
||||
|
||||
@@ -44,6 +44,14 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
# CMake 4 is no longer retro compatible with versions < 3.5
|
||||
# cmake_minimum_required was already to an upper version, but not cmake_policy
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"cmake_policy(VERSION 3.1)" \
|
||||
""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-binstall";
|
||||
version = "1.15.6";
|
||||
version = "1.15.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TzO7xz58nvuT6r8SN0cUKdW0x1yR1FlpsnGhU67SNOA=";
|
||||
hash = "sha256-EQhEI4MqYNwjqb8awROTLfxjGsoPKeT7VHt642uSgCc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cYjsSPHcWYobosSlB2tLda3NSGUTxE5DyA4AxAF8C/8=";
|
||||
cargoHash = "sha256-a9X8L4AZWhlcQ5lVo0I1GL2wpCjOClNuZLy+GwHJDcA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.7.1";
|
||||
version = "2.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
hash = "sha256-My0z4MW/9O0+ErIh7SEWU3KGJ4UQDmhwJICtBgQ4+q8=";
|
||||
hash = "sha256-Lb20SrwFQybMNmxgmztAm2/9PBcukgt03W93C743oM8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/add_subdirectory(tests)/d' lib/CMakeLists.txt
|
||||
|
||||
# CMake 3.2.2 is deprecated and no longer supported by CMake > 4
|
||||
# https://github.com/NixOS/nixpkgs/issues/445447
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.2.2)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
@@ -27,6 +27,14 @@ stdenv.mkDerivation rec {
|
||||
./01-fix-sleep_for.patch
|
||||
];
|
||||
|
||||
# CMake 2.8.7 is deprecated and is no longer supported by CMake > 4
|
||||
# https://github.com/NixOS/nixpkgs/issues/445447
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt tacopie/CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.8.7)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "C++11 Lightweight Redis client: async, thread-safe, no dependency, pipelining, multi-platform";
|
||||
homepage = "https://github.com/cpp-redis/cpp_redis";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.11.2";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vBjyykNSQ6Mq7OMRS0cCSHa8LUrIcfk9cr66ViU9z54=";
|
||||
hash = "sha256-uESS76cPJ/sYGbsTpaUKlF8g0y2+LYbF4zd7dAoKWWU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KaEPF4h5XqCjh91/KmB+AoiQK+fUmGEP0Lnyfe2qEZc=";
|
||||
vendorHash = "sha256-lqoAPp8EW2tW+QjwCuBgxZDbKT3XMvP3qwx/yES1mx4=";
|
||||
|
||||
# rename TestMain to prevent it from running, as it panics in the sandbox.
|
||||
postPatch = ''
|
||||
|
||||
@@ -55,6 +55,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required (VERSION 3.10)"
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool -change libliquid.dylib ${lib.getLib liquid-dsp}/lib/libliquid.dylib ''${out}/bin/CubicSDR
|
||||
'';
|
||||
|
||||
@@ -2,20 +2,19 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
qtserialport,
|
||||
qt6,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cutecom";
|
||||
version = "0.51.0+patch";
|
||||
version = "0.60.0-RC1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cutecom";
|
||||
repo = "cutecom";
|
||||
rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca";
|
||||
sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Co0bUW7klSPf1VfBt7oT2DlQmf6CLELS0oapIyjpx8w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -23,10 +22,11 @@ stdenv.mkDerivation {
|
||||
--replace "/Applications" "$out/Applications"
|
||||
'';
|
||||
|
||||
buildInputs = [ qtserialport ];
|
||||
buildInputs = [ qt6.qtserialport ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
postInstall =
|
||||
@@ -43,12 +43,12 @@ stdenv.mkDerivation {
|
||||
cp cutecom.1 "$out/share/man/man1"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Graphical serial terminal";
|
||||
homepage = "https://gitlab.com/cutecom/cutecom/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ bennofs ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "cutecom";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cytoscape";
|
||||
version = "3.10.3";
|
||||
version = "3.10.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz";
|
||||
sha256 = "sha256-62i3F6uGNoC8z55iUIYQDAimWcQocsZ52USdpruZRLQ=";
|
||||
sha256 = "sha256-gHCU97AfBzo4r+F+Fc5lHd+kQtj/NsoCNipAhv5O7sE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
enableFeature = yes: if yes then "ON" else "OFF";
|
||||
versions = lib.importJSON ./versions.json;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -47,14 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals withOdbc [ unixODBC ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDUCKDB_EXTENSION_CONFIGS=${finalAttrs.src}/.github/config/in_tree_extensions.cmake"
|
||||
"-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
|
||||
"-DJDBC_DRIVER=${enableFeature withJdbc}"
|
||||
"-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}"
|
||||
]
|
||||
++ lib.optionals finalAttrs.doInstallCheck [
|
||||
(lib.cmakeFeature "DUCKDB_EXTENSION_CONFIGS" "${finalAttrs.src}/.github/config/in_tree_extensions.cmake")
|
||||
(lib.cmakeBool "BUILD_ODBC_DRIVER" withOdbc)
|
||||
(lib.cmakeBool "JDBC_DRIVER" withJdbc)
|
||||
(lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${finalAttrs.version}-0-g${finalAttrs.rev}")
|
||||
# development settings
|
||||
"-DBUILD_UNITTESTS=ON"
|
||||
(lib.cmakeBool "BUILD_UNITTESTS" finalAttrs.doInstallCheck)
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.3.2",
|
||||
"rev": "0b83e5d2f68bc02dfefde74b846bd039f078affa",
|
||||
"hash": "sha256-6NMQ893g+nOiH8dnb63oa+fZMNXs8N6tJv+Er4x547U="
|
||||
"version": "1.4.1",
|
||||
"rev": "b390a7c3760bd95926fe8aefde20d04b349b472e",
|
||||
"hash": "sha256-w/mELyRs4B9hJngi1MLed0fHRq/ldkkFV+SDkSxs3O8="
|
||||
}
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "eas-cli";
|
||||
version = "16.4.0";
|
||||
version = "16.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "expo";
|
||||
repo = "eas-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cHayMBhqiLY//t/ljjwJm4qMuVn531z7x2cqJE4z6hQ=";
|
||||
hash = "sha256-hMUDtl5lMAZzlvPdzO7J3JTw0B5/fjssuqQlg1MUO3w=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock"; # Point to the root lockfile
|
||||
hash = "sha256-qDUwAdShpKjIUyYvtA6/hgGdO1z1xLqdsJkL3oqkMSw=";
|
||||
hash = "sha256-ybctj6TgW9JluDIsSaNm18wUXSBPuIT45te5HoQuz5s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -31,6 +31,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
jq
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Disable Nx integration in Lerna to avoid the native pseudo terminal panic in the sandbox.
|
||||
tmpfile="$(mktemp)"
|
||||
jq '.useNx = false' lerna.json > "$tmpfile"
|
||||
mv "$tmpfile" lerna.json
|
||||
'';
|
||||
|
||||
# yarnInstallHook strips out build outputs within packages/eas-cli resulting in most commands missing from eas-cli.
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- a/resources/systems/linux/es_find_rules.xml 2024-09-13 16:19:36.000000000 +0300
|
||||
+++ b/resources/systems/linux/es_find_rules.xml 2024-11-26 23:08:49.204498848 +0200
|
||||
@@ -41,6 +41,9 @@
|
||||
<entry>/usr/lib64/libretro</entry>
|
||||
<!-- Manjaro repository -->
|
||||
<entry>/usr/lib/libretro</entry>
|
||||
+ <!-- NixOS and Nixpkgs repository -->
|
||||
+ <entry>/run/current-system/sw/lib/retroarch/cores</entry>
|
||||
+ <entry>~/.nix-profile/lib/retroarch/cores</entry>
|
||||
</rule>
|
||||
</core>
|
||||
<emulator name="3DSEN-WINDOWS">
|
||||
@@ -1,74 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
cmake,
|
||||
pkg-config,
|
||||
alsa-lib,
|
||||
bluez,
|
||||
curl,
|
||||
ffmpeg,
|
||||
freeimage,
|
||||
freetype,
|
||||
gettext,
|
||||
harfbuzz,
|
||||
icu,
|
||||
libgit2,
|
||||
poppler,
|
||||
pugixml,
|
||||
SDL2,
|
||||
libGL,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "emulationstation-de";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gitlab.com/es-de/emulationstation-de/-/archive/v${finalAttrs.version}/emulationstation-de-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-tW8+7ImcJ3mBhoIHVE8h4cba+4SQLP55kiFYE7N8jyI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./001-add-nixpkgs-retroarch-cores.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# ldd-based detection fails for cross builds
|
||||
substituteInPlace CMake/Packages/FindPoppler.cmake \
|
||||
--replace-fail 'GET_PREREQUISITES("''${POPPLER_LIBRARY}" POPPLER_PREREQS 1 0 "" "")' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gettext # msgfmt
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
bluez
|
||||
curl
|
||||
ffmpeg
|
||||
freeimage
|
||||
freetype
|
||||
harfbuzz
|
||||
icu
|
||||
libgit2
|
||||
poppler
|
||||
pugixml
|
||||
SDL2
|
||||
libGL
|
||||
];
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "APPLICATION_UPDATER" false) ];
|
||||
|
||||
meta = {
|
||||
description = "ES-DE (EmulationStation Desktop Edition) is a frontend for browsing and launching games from your multi-platform collection";
|
||||
homepage = "https://es-de.org";
|
||||
maintainers = with lib.maintainers; [ ivarmedi ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "es-de";
|
||||
};
|
||||
})
|
||||
@@ -1,87 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
SDL2,
|
||||
alsa-lib,
|
||||
boost,
|
||||
callPackage,
|
||||
cmake,
|
||||
curl,
|
||||
freeimage,
|
||||
freetype,
|
||||
libGL,
|
||||
libGLU,
|
||||
libvlc,
|
||||
pkg-config,
|
||||
rapidjson,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
sources = callPackage ./sources.nix { };
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (sources.emulationstation) pname version src;
|
||||
|
||||
postUnpack = ''
|
||||
pushd $sourceRoot/external/pugixml
|
||||
cp --verbose --archive ${sources.pugixml.src}/* .
|
||||
chmod --recursive 744 .
|
||||
popd
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
SDL2
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
alsa-lib
|
||||
boost
|
||||
curl
|
||||
freeimage
|
||||
freetype
|
||||
libGL
|
||||
libGLU
|
||||
libvlc
|
||||
rapidjson
|
||||
];
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "GL" true) ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 ../emulationstation $out/bin/emulationstation
|
||||
mkdir -p $out/share/emulationstation/
|
||||
cp -r ../resources $out/share/emulationstation/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# es-core/src/resources/ResourceManager.cpp: resources are searched at the
|
||||
# same place of binaries.
|
||||
postFixup = ''
|
||||
pushd $out
|
||||
ln -s $out/share/emulationstation/resources $out/bin/
|
||||
popd
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit sources;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/RetroPie/EmulationStation";
|
||||
description = "Flexible emulator front-end supporting keyboardless navigation and custom system themes (forked by RetroPie)";
|
||||
license = with lib.licenses; [ mit ];
|
||||
mainProgram = "emulationstation";
|
||||
maintainers = with lib.maintainers; [
|
||||
edwtjo
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
{ fetchFromGitHub }:
|
||||
|
||||
{
|
||||
emulationstation =
|
||||
let
|
||||
self = {
|
||||
pname = "emulationstation";
|
||||
version = "2.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RetroPie";
|
||||
repo = "EmulationStation";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-f2gRkp+3Pp2qnvg2RBzaHPpzhAnwx0+5x1Pe3kD90xE=";
|
||||
};
|
||||
};
|
||||
in
|
||||
self;
|
||||
|
||||
pugixml =
|
||||
let
|
||||
self = {
|
||||
pname = "pugixml";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeux";
|
||||
repo = "pugixml";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-LbjTN1hnIbqI79C+gCdwuDG0+B/5yXf7hg0Q+cDFIf4=";
|
||||
};
|
||||
};
|
||||
in
|
||||
self;
|
||||
}
|
||||
@@ -13,19 +13,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "esphome-dashboard";
|
||||
version = "20250814.0";
|
||||
version = "20251013.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "dashboard";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WQsyv3s3LKKOwYEkX5GcAPnbH061q1ts7TU4HU6I8CI=";
|
||||
hash = "sha256-PZf9YLtHqeR+5BRVv1yOMVt6NVlbJTj98ukGnO0RV0Q=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-ShuJPS7qP2XZ3lwJrFeKRkQwX7tvyiC/0L7sGn0cMn8=";
|
||||
hash = "sha256-wWDM4ODlZAjjDonzS4czdBPBaRS0Px2KUlE4AfsqNIQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -34,14 +34,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2025.9.3";
|
||||
version = "2025.10.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = version;
|
||||
hash = "sha256-9x4uf0gHCGYLq0gr0MoAp0sk9p82zdH41PaELph0fv0=";
|
||||
hash = "sha256-aHDBRZ6o671zriV/rwgsZ57y91Z8Lwx/iiPhIHPzKbs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -171,6 +171,11 @@ python.pkgs.buildPythonApplication rec {
|
||||
# tries to import platformio, which is wrapped in an fhsenv
|
||||
"test_clean_build"
|
||||
"test_clean_build_empty_cache_dir"
|
||||
"test_clean_all"
|
||||
"test_clean_all_partial_exists"
|
||||
# tries to use esptool, which is wrapped in an fhsenv
|
||||
"test_upload_using_esptool_path_conversion"
|
||||
"test_upload_using_esptool_with_file_path"
|
||||
# AssertionError: Expected 'run_external_command' to have been called once. Called 0 times.
|
||||
"test_run_platformio_cli_sets_environment_variables"
|
||||
];
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 748f412..d8821ee 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
|
||||
+cmake_minimum_required(VERSION 3.10)
|
||||
|
||||
project(ffts C ASM)
|
||||
|
||||
@@ -20,6 +20,10 @@ stdenv.mkDerivation {
|
||||
|
||||
cmakeFlags = [ "-DENABLE_SHARED=ON" ];
|
||||
|
||||
patches = [
|
||||
./cmake4.patch
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Fastest Fourier Transform in the South";
|
||||
homepage = "https://github.com/linkotec/ffts";
|
||||
|
||||
@@ -9,16 +9,15 @@
|
||||
readline,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foma";
|
||||
version = "0.10.0alpha-unstable-2024-03-13";
|
||||
version = "0.10.0alpha-unstable-2025-09-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhulden";
|
||||
repo = "foma";
|
||||
rev = "e0d8122bda4bbd56f18510bdfe840617f9736ae7";
|
||||
hash = "sha256-UbwuHTilKWo4sVD3igcSlTqH78N6JQFvRD35QwfoX10=";
|
||||
rev = "91f91866af843aec487313d028dbd1f76b5fb1a5";
|
||||
hash = "sha256-CXRZNcEgsjD/9PowNynPyfLVbk8KDe3T52UetYMwC6w=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/foma";
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
diff --git a/CMakeModules/ForgeConfigureDepsVars.cmake b/CMakeModules/ForgeConfigureDepsVars.cmake
|
||||
index ee5c2fc..2f75181 100644
|
||||
--- a/CMakeModules/ForgeConfigureDepsVars.cmake
|
||||
+++ b/CMakeModules/ForgeConfigureDepsVars.cmake
|
||||
@@ -84,7 +84,7 @@ macro(fg_dep_check_and_populate dep_prefix)
|
||||
URL ${fdcp_args_URI}
|
||||
URL_HASH ${fdcp_args_REF}
|
||||
DOWNLOAD_COMMAND \"\"
|
||||
- UPDATE_DISCONNECTED ON
|
||||
+ UPDATE_COMMAND \"\"
|
||||
SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src"
|
||||
BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build"
|
||||
SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild"
|
||||
@@ -94,7 +94,7 @@ macro(fg_dep_check_and_populate dep_prefix)
|
||||
QUIET
|
||||
URL ${fdcp_args_URI}
|
||||
DOWNLOAD_COMMAND \"\"
|
||||
- UPDATE_DISCONNECTED ON
|
||||
+ UPDATE_COMMAND \"\"
|
||||
SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src"
|
||||
BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build"
|
||||
SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild"
|
||||
@@ -106,7 +106,7 @@ macro(fg_dep_check_and_populate dep_prefix)
|
||||
GIT_REPOSITORY ${fdcp_args_URI}
|
||||
GIT_TAG ${fdcp_args_REF}
|
||||
DOWNLOAD_COMMAND \"\"
|
||||
- UPDATE_DISCONNECTED ON
|
||||
+ UPDATE_COMMAND \"\"
|
||||
SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src"
|
||||
BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build"
|
||||
SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild"
|
||||
@@ -1,86 +0,0 @@
|
||||
{
|
||||
boost,
|
||||
cmake,
|
||||
expat,
|
||||
fetchFromGitHub,
|
||||
fontconfig,
|
||||
freeimage,
|
||||
freetype,
|
||||
glfw3,
|
||||
glm,
|
||||
lib,
|
||||
libGLU,
|
||||
libGL,
|
||||
libgbm,
|
||||
opencl-clhpp,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
SDL2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "forge";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arrayfire";
|
||||
repo = "forge";
|
||||
rev = "v1.0.8";
|
||||
sha256 = "sha256-lSZAwcqAHiuZkpYcVfwvZCfNmEF3xGN9S/HuZQrGeKU=";
|
||||
};
|
||||
glad = fetchFromGitHub {
|
||||
owner = "arrayfire";
|
||||
repo = "glad";
|
||||
rev = "b94680aee5b8ce01ae1644c5f2661769366c765a";
|
||||
hash = "sha256-CrZy76gOGMpy9f1NuMK4tokZ57U//zYeNH5ZYY0SC2U=";
|
||||
};
|
||||
|
||||
# This patch ensures that Forge does not try to fetch glad from GitHub and
|
||||
# uses our sources that we've checked out via Nix.
|
||||
patches = [ ./no-download-glad.patch ];
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p ./extern
|
||||
cp -R --no-preserve=mode,ownership ${glad} ./extern/fg_glad-src
|
||||
ln -s ${opencl-clhpp} ./extern/cl2hpp
|
||||
'';
|
||||
|
||||
cmakeFlags = [ "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost.out
|
||||
boost.dev
|
||||
expat
|
||||
fontconfig
|
||||
freeimage
|
||||
freetype
|
||||
glfw3
|
||||
glm
|
||||
libGL
|
||||
libGLU
|
||||
opencl-clhpp
|
||||
SDL2
|
||||
libgbm
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend";
|
||||
longDescription = ''
|
||||
An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.
|
||||
The goal of Forge is to provide high performance OpenGL visualizations for C/C++ applications that use CUDA/OpenCL.
|
||||
Forge uses OpenGL >=3.3 forward compatible contexts, so please make sure you have capable hardware before trying it out.
|
||||
'';
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://arrayfire.com/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
chessai
|
||||
twesterhout
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
udev,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "framework-tool-tui";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grouzen";
|
||||
repo = "framework-tool-tui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-R4/VeymmthI96PJt7XsKRYz1Y8QW/lV90HvJgt+e+hI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tDNYkV5MWb4+co/gwjpAt/M7yJbEWrryieJoBuXmY8M=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
|
||||
meta = {
|
||||
description = "TUI for controlling and monitoring Framework Computers hardware";
|
||||
longDescription = ''
|
||||
A snappy TUI dashboard for controlling and monitoring your Framework Laptop hardware —
|
||||
charging, privacy, lighting, USB PD ports, and more.
|
||||
'';
|
||||
homepage = "https://github.com/grouzen/framework-tool-tui";
|
||||
changelog = "https://github.com/grouzen/framework-tool-tui/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [
|
||||
griffi-gh
|
||||
autra
|
||||
];
|
||||
mainProgram = "framework-tool-tui";
|
||||
};
|
||||
})
|
||||
@@ -1,13 +0,0 @@
|
||||
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp
|
||||
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:45.524031668 +0200
|
||||
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:47.717009813 +0200
|
||||
@@ -301,6 +301,9 @@ LoadStandardIcon(FreeImageIO *io, fi_han
|
||||
int width = bmih.biWidth;
|
||||
int height = bmih.biHeight / 2; // height == xor + and mask
|
||||
unsigned bit_count = bmih.biBitCount;
|
||||
+ if (bit_count != 1 && bit_count != 2 && bit_count != 4 && bit_count != 8 && bit_count != 16 && bit_count != 24 && bit_count != 32) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
unsigned line = CalculateLine(width, bit_count);
|
||||
unsigned pitch = CalculatePitch(line);
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp
|
||||
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.287014100 +0200
|
||||
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.832008666 +0200
|
||||
@@ -780,6 +780,10 @@ int psdThumbnail::Read(FreeImageIO *io,
|
||||
FreeImage_Unload(_dib);
|
||||
}
|
||||
|
||||
+ if (_WidthBytes != _Width * _BitPerPixel / 8) {
|
||||
+ throw "Invalid PSD image";
|
||||
+ }
|
||||
+
|
||||
if(_Format == 1) {
|
||||
// kJpegRGB thumbnail image
|
||||
_dib = FreeImage_LoadFromHandle(FIF_JPEG, io, handle);
|
||||
@@ -1,21 +0,0 @@
|
||||
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp
|
||||
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.936007630 +0200
|
||||
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.940007590 +0200
|
||||
@@ -1466,6 +1466,7 @@ FIBITMAP* psdParser::ReadImageData(FreeI
|
||||
const unsigned dstBpp = (depth == 1) ? 1 : FreeImage_GetBPP(bitmap)/8;
|
||||
const unsigned dstLineSize = FreeImage_GetPitch(bitmap);
|
||||
BYTE* const dst_first_line = FreeImage_GetScanLine(bitmap, nHeight - 1);//<*** flipped
|
||||
+ const unsigned dst_buffer_size = dstLineSize * nHeight;
|
||||
|
||||
BYTE* line_start = new BYTE[lineSize]; //< fileline cache
|
||||
|
||||
@@ -1481,6 +1482,9 @@ FIBITMAP* psdParser::ReadImageData(FreeI
|
||||
const unsigned channelOffset = GetChannelOffset(bitmap, c) * bytes;
|
||||
|
||||
BYTE* dst_line_start = dst_first_line + channelOffset;
|
||||
+ if (channelOffset + lineSize > dst_buffer_size) {
|
||||
+ throw "Invalid PSD image";
|
||||
+ }
|
||||
for(unsigned h = 0; h < nHeight; ++h, dst_line_start -= dstLineSize) {//<*** flipped
|
||||
io->read_proc(line_start, lineSize, 1, handle);
|
||||
ReadImageLine(dst_line_start, line_start, lineSize, dstBpp, bytes);
|
||||
@@ -1,19 +0,0 @@
|
||||
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp
|
||||
--- freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp 2023-09-28 19:34:45.003036859 +0200
|
||||
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp 2023-09-28 19:34:47.505011926 +0200
|
||||
@@ -770,8 +770,13 @@ jpeg_read_exif_dir(FIBITMAP *dib, const
|
||||
//
|
||||
|
||||
const WORD entriesCount0th = ReadUint16(msb_order, ifd0th);
|
||||
-
|
||||
- DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th));
|
||||
+
|
||||
+ const BYTE* de_addr = DIR_ENTRY_ADDR(ifd0th, entriesCount0th);
|
||||
+ if(de_addr+4 >= (BYTE*)(dwLength + ifd0th - tiffp)) {
|
||||
+ return TRUE; //< no thumbnail
|
||||
+ }
|
||||
+
|
||||
+ DWORD next_offset = ReadUint32(msb_order, de_addr);
|
||||
if((next_offset == 0) || (next_offset >= dwLength)) {
|
||||
return TRUE; //< no thumbnail
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
|
||||
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.713009853 +0200
|
||||
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:48.043006563 +0200
|
||||
@@ -2142,6 +2142,11 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||
uint32_t tileRowSize = (uint32_t)TIFFTileRowSize(tif);
|
||||
uint32_t imageRowSize = (uint32_t)TIFFScanlineSize(tif);
|
||||
|
||||
+ if (width / tileWidth * tileRowSize * 8 > bitspersample * samplesperpixel * width) {
|
||||
+ free(tileBuffer);
|
||||
+ throw "Corrupted tiled TIFF file";
|
||||
+ }
|
||||
+
|
||||
|
||||
// In the tiff file the lines are saved from up to down
|
||||
// In a DIB the lines must be saved from down to up
|
||||
@@ -1,14 +0,0 @@
|
||||
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
|
||||
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.501011966 +0200
|
||||
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.610010879 +0200
|
||||
@@ -372,6 +372,10 @@ static void
|
||||
ReadPalette(TIFF *tiff, uint16_t photometric, uint16_t bitspersample, FIBITMAP *dib) {
|
||||
RGBQUAD *pal = FreeImage_GetPalette(dib);
|
||||
|
||||
+ if (!pal) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
switch(photometric) {
|
||||
case PHOTOMETRIC_MINISBLACK: // bitmap and greyscale image types
|
||||
case PHOTOMETRIC_MINISWHITE:
|
||||
@@ -1,14 +0,0 @@
|
||||
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp
|
||||
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:17.818579271 +0100
|
||||
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:18.776573816 +0100
|
||||
@@ -1086,6 +1086,10 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||
|
||||
jpeg_read_header(&cinfo, TRUE);
|
||||
|
||||
+ if (cinfo.image_width > JPEG_MAX_DIMENSION || cinfo.image_height > JPEG_MAX_DIMENSION) {
|
||||
+ throw FI_MSG_ERROR_DIB_MEMORY;
|
||||
+ }
|
||||
+
|
||||
// step 4: set parameters for decompression
|
||||
|
||||
unsigned int scale_denom = 1; // fraction by which to scale image
|
||||
@@ -1,16 +0,0 @@
|
||||
diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
|
||||
--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.669574426 +0100
|
||||
+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.673574403 +0100
|
||||
@@ -1484,6 +1484,12 @@ Load(FreeImageIO *io, fi_handle handle,
|
||||
(int)bitspersample, (int)samplesperpixel, (int)photometric);
|
||||
throw (char*)NULL;
|
||||
}
|
||||
+ if (planar_config == PLANARCONFIG_SEPARATE && bitspersample < 8) {
|
||||
+ FreeImage_OutputMessageProc(s_format_id,
|
||||
+ "Unable to handle this format: bitspersample = 8, TIFFTAG_PLANARCONFIG = PLANARCONFIG_SEPARATE"
|
||||
+ );
|
||||
+ throw (char*)NULL;
|
||||
+ }
|
||||
|
||||
// ---------------------------------------------------------------------------------
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
Fix build with libtiff 4.4.0 by not using a private libtiff API.
|
||||
Patch by Kurt Schwehr: https://sourceforge.net/p/freeimage/discussion/36109/thread/2018fdc6e7/
|
||||
|
||||
diff -ru a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
|
||||
--- a/Source/Metadata/XTIFF.cpp
|
||||
+++ b/Source/Metadata/XTIFF.cpp
|
||||
@@ -749,7 +749,7 @@
|
||||
continue;
|
||||
}
|
||||
// type of storage may differ (e.g. rationnal array vs float array type)
|
||||
- if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) {
|
||||
+ if((unsigned)TIFFFieldSetGetSize(fld) != FreeImage_TagDataWidth(tag_type)) {
|
||||
// skip tag or _TIFFmemcpy will fail
|
||||
continue;
|
||||
}
|
||||
@@ -1,170 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchsvn,
|
||||
cctools,
|
||||
libtiff,
|
||||
libpng,
|
||||
zlib,
|
||||
libwebp,
|
||||
libraw,
|
||||
openexr,
|
||||
openjpeg,
|
||||
libjpeg,
|
||||
jxrlib,
|
||||
pkg-config,
|
||||
fixDarwinDylibNames,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freeimage";
|
||||
version = "3.18.0-unstable-2024-04-18";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "svn://svn.code.sf.net/p/freeimage/svn/";
|
||||
rev = "1911";
|
||||
hash = "sha256-JznVZUYAbsN4FplnuXxCd/ITBhH7bfGKWXep2A6mius=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk";
|
||||
|
||||
# Ensure that the bundled libraries are not used at all
|
||||
prePatch = ''
|
||||
rm -rf Source/Lib* Source/OpenEXR Source/ZLib
|
||||
'';
|
||||
|
||||
# Tell patch to work with trailing carriage returns
|
||||
patchFlags = [
|
||||
"-p1"
|
||||
"--binary"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./unbundle.diff
|
||||
./CVE-2020-24292.patch
|
||||
./CVE-2020-24293.patch
|
||||
./CVE-2020-24295.patch
|
||||
./CVE-2021-33367.patch
|
||||
./CVE-2021-40263.patch
|
||||
./CVE-2021-40266.patch
|
||||
./CVE-2023-47995.patch
|
||||
./CVE-2023-47997.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# To support cross compilation, use the correct `pkg-config`.
|
||||
substituteInPlace Makefile.fip \
|
||||
--replace "pkg-config" "$PKG_CONFIG"
|
||||
substituteInPlace Makefile.gnu \
|
||||
--replace "pkg-config" "$PKG_CONFIG"
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
|
||||
# Upstream Makefile hardcodes i386 and x86_64 architectures only
|
||||
substituteInPlace Makefile.osx --replace "x86_64" "arm64"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
cctools
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libtiff
|
||||
libtiff.dev_private
|
||||
libpng
|
||||
zlib
|
||||
libwebp
|
||||
libraw
|
||||
openexr
|
||||
openjpeg
|
||||
libjpeg
|
||||
libjpeg.dev_private
|
||||
jxrlib
|
||||
];
|
||||
|
||||
postBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
make -f Makefile.fip
|
||||
'';
|
||||
|
||||
INCDIR = "${placeholder "out"}/include";
|
||||
INSTALLDIR = "${placeholder "out"}/lib";
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $INCDIR $INSTALLDIR
|
||||
''
|
||||
# Workaround for Makefiles.osx not using ?=
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" )
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
make -f Makefile.fip install
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Open Source library for accessing popular graphics image file formats";
|
||||
homepage = "http://freeimage.sourceforge.net/";
|
||||
license = with lib.licenses; [
|
||||
freeimage
|
||||
gpl2Only
|
||||
gpl3Only
|
||||
];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2024-31570"
|
||||
"CVE-2024-28584"
|
||||
"CVE-2024-28583"
|
||||
"CVE-2024-28582"
|
||||
"CVE-2024-28581"
|
||||
"CVE-2024-28580"
|
||||
"CVE-2024-28579"
|
||||
"CVE-2024-28578"
|
||||
"CVE-2024-28577"
|
||||
"CVE-2024-28576"
|
||||
"CVE-2024-28575"
|
||||
"CVE-2024-28574"
|
||||
"CVE-2024-28573"
|
||||
"CVE-2024-28572"
|
||||
"CVE-2024-28571"
|
||||
"CVE-2024-28570"
|
||||
"CVE-2024-28569"
|
||||
"CVE-2024-28568"
|
||||
"CVE-2024-28567"
|
||||
"CVE-2024-28566"
|
||||
"CVE-2024-28565"
|
||||
"CVE-2024-28564"
|
||||
"CVE-2024-28563"
|
||||
"CVE-2024-28562"
|
||||
"CVE-2024-9029"
|
||||
# "CVE-2023-47997"
|
||||
"CVE-2023-47996"
|
||||
# "CVE-2023-47995"
|
||||
"CVE-2023-47994"
|
||||
"CVE-2023-47993"
|
||||
"CVE-2023-47992"
|
||||
# "CVE-2021-40266"
|
||||
"CVE-2021-40265"
|
||||
"CVE-2021-40264"
|
||||
# "CVE-2021-40263"
|
||||
"CVE-2021-40262"
|
||||
# "CVE-2021-33367"
|
||||
# "CVE-2020-24295"
|
||||
"CVE-2020-24294"
|
||||
# "CVE-2020-24293"
|
||||
# "CVE-2020-24292"
|
||||
"CVE-2020-21426"
|
||||
"CVE-2019-12214"
|
||||
"CVE-2019-12212"
|
||||
];
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; unix;
|
||||
};
|
||||
})
|
||||
File diff suppressed because one or more lines are too long
@@ -1,33 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
freeimage,
|
||||
libGL,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.6";
|
||||
pname = "gamecube-tools";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [
|
||||
freeimage
|
||||
libGL
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devkitPro";
|
||||
repo = "gamecube-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GsTmwyxBc36Qg+UGy+cRAjGW1eh1XxV0s94B14ZJAjU=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for gamecube/wii projects";
|
||||
homepage = "https://github.com/devkitPro/gamecube-tools/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ tomsmeets ];
|
||||
};
|
||||
}
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gearlever";
|
||||
version = "3.4.2";
|
||||
version = "3.4.5";
|
||||
pyproject = false; # Built with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mijorus";
|
||||
repo = "gearlever";
|
||||
tag = version;
|
||||
hash = "sha256-IC3ueAplQc5McGoJkHjjCAGvnLCH9+DUrB3cuKfwMno=";
|
||||
hash = "sha256-C/YNnpLlA+5xzgLRLWEWAhDGLZP42N/uCbCPg3owgBk=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ghmap";
|
||||
version = "1.0.4";
|
||||
version = "1.0.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uhourri";
|
||||
repo = "ghmap";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-liwkJfNp2Ozph3ummrh2GEshIlmVsG8Y8Pmm4lw2Ya8=";
|
||||
hash = "sha256-mNWBClKs5QnjwMMWS/OaxgD0g0D0bWRx8ecyG3+zy+s=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -41,6 +41,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/general/config.h --replace-fail "CUSTOM-BUILD" "${version}"
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -28,7 +28,7 @@ let
|
||||
});
|
||||
|
||||
textual-textarea = super.textual-textarea.overridePythonAttrs (old: {
|
||||
pythonRelaxDeps = old.pythonRelaxDeps ++ [ "textual" ];
|
||||
pythonRelaxDeps = (old.pythonRelaxDeps or [ ]) ++ [ "textual" ];
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hayagriva";
|
||||
version = "0.8.1";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-JZfkYrb4Gn6oP+kcFj7kC10r1aSddigGZPRx18pr5Gg=";
|
||||
hash = "sha256-9PGo/TPk5QuiVoa5wUGyHufW/VaxqhinxS+u2JMPZBY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2KlZTOp78HITJMRLNzw1bTUQSYeg5SmquRJWwwG3Xfw=";
|
||||
cargoHash = "sha256-Ectd93B2yn/fn+N86LxGbUvtENsgjXTSCg06lHM8Xi0=";
|
||||
|
||||
buildFeatures = [ "cli" ];
|
||||
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "heroku";
|
||||
version = "10.13.1";
|
||||
version = "10.13.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cli-assets.heroku.com/versions/10.13.1/cf943a6/heroku-v10.13.1-cf943a6-linux-x64.tar.xz";
|
||||
hash = "sha256-2nxM1XE+gvIUoA/AQLXt73V+ZM+WP245qAkGilnCqMk=";
|
||||
url = "https://cli-assets.heroku.com/versions/10.13.2/82c0564/heroku-v10.13.2-82c0564-linux-x64.tar.xz";
|
||||
hash = "sha256-JfaOnVaN60MG4dDJ8IdmRucfCIb9EtWdJy+90fG6zuw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "heynote";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
|
||||
sha256 = "sha256-NA7oKutjxj1Chv7EJ0V7L0uF1oMSZqh97Ly6UYbzhuQ=";
|
||||
sha256 = "sha256-nA1FRjh9lKdTZXUfuECl5BlW5phYaoh7HOOCKDQuOGQ=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
"libheif"
|
||||
"libnsgif"
|
||||
],
|
||||
freeimage,
|
||||
libtiff,
|
||||
libjpeg_turbo,
|
||||
libjxl,
|
||||
@@ -50,7 +49,6 @@ let
|
||||
|
||||
backends = {
|
||||
inherit
|
||||
freeimage
|
||||
libtiff
|
||||
libpng
|
||||
librsvg
|
||||
@@ -59,6 +57,7 @@ let
|
||||
libnsgif
|
||||
;
|
||||
libjpeg = libjpeg_turbo;
|
||||
freeimage = throw "freeimage backend not supported";
|
||||
};
|
||||
|
||||
backendFlags = map (
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitea,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "iocaine";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.madhouse-project.org";
|
||||
owner = "iocaine";
|
||||
repo = "iocaine";
|
||||
tag = "iocaine-${version}";
|
||||
hash = "sha256-213QLpGBKSsT9r8O27PyMom5+OGPz0VtRBevxswISZA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EgPGDlJX/m+v3f/tGIO+saGHoYrtiWLZuMlXEvsgnxE=";
|
||||
|
||||
meta = {
|
||||
description = "Deadliest poison known to AI";
|
||||
homepage = "https://iocaine.madhouse-project.org/";
|
||||
changelog = "https://git.madhouse-project.org/iocaine/iocaine/src/tag/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sugar700 ];
|
||||
mainProgram = "iocaine";
|
||||
# Lacking OS access to fix, and upstream doesn't support macOS.
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kas";
|
||||
version = "4.8.2";
|
||||
version = "5.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siemens";
|
||||
repo = "kas";
|
||||
tag = version;
|
||||
hash = "sha256-mDfGiWZKipbaXxlyx8JWeFvSyE44FcumYD9Pr/38UBQ=";
|
||||
hash = "sha256-KSmLQBOYyuO9o3YZYPJPDPeGudtNYIC2yghAu98sf3Q=";
|
||||
};
|
||||
|
||||
patches = [ ./pass-terminfo-env.patch ];
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kent";
|
||||
version = "486";
|
||||
version = "488";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ucscGenomeBrowser";
|
||||
repo = "kent";
|
||||
tag = "v${finalAttrs.version}_base";
|
||||
hash = "sha256-NffQ04+5rMtG/VI7YFK4Ff39DDhdh9Wlc0i1iVbg8Js=";
|
||||
hash = "sha256-7iapTrQBq0VvbSe+lEdf9lISRJ/uPGdnfjJiSA0NLN8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lasuite-meet-frontend";
|
||||
version = "0.1.40";
|
||||
version = "0.1.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE=";
|
||||
hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/frontend";
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage rec {
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit version src;
|
||||
sourceRoot = "source/src/frontend";
|
||||
hash = "sha256-RtzLa0SPd76/8ml8R55Hx1MMwFcfDIt6wtcjKAGMDuI=";
|
||||
hash = "sha256-UJMyOCtjr7e6YaRdIrlL+p3alw4k/MzgqqFreLesAaE=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -13,14 +13,14 @@ in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "lasuite-meet";
|
||||
version = "0.1.40";
|
||||
version = "0.1.41";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE=";
|
||||
hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/backend";
|
||||
|
||||
@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [ "-DLEATHERMAN_ENABLE_TESTING=OFF" ];
|
||||
|
||||
# CMake4 3.2.2 is deprecated and no longer supported by CMake > 4
|
||||
# https://github.com/NixOS/nixpkgs/issues/445447
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.2.2)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "bump-cmake-minimum-required-version.patch";
|
||||
url = "https://github.com/lenmus/lenmus/commit/cc250ca4ce9a90d8dddb0fc359c5a80609cdafcb.patch";
|
||||
hash = "sha256-aP+ooaSi6vHk+g1XftfjZ39zAgYts1vOCqZWWZhJ+G8=";
|
||||
})
|
||||
];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
};
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
graphicsmagick,
|
||||
gdal,
|
||||
openimageio,
|
||||
freeimage,
|
||||
testers,
|
||||
}:
|
||||
|
||||
@@ -113,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
graphicsmagick
|
||||
gdal
|
||||
openimageio
|
||||
freeimage
|
||||
;
|
||||
|
||||
inherit (python3Packages) pillow imread;
|
||||
|
||||
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
|
||||
owner = "puppetlabs";
|
||||
};
|
||||
|
||||
# CMake 2.2.2 is deprecated and no longer supported by CMake > 4
|
||||
# https://github.com/NixOS/nixpkgs/issues/445447
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.2.2)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -8,16 +8,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lintspec";
|
||||
version = "0.10.0";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beeb";
|
||||
repo = "lintspec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FCcAyOPym6e9L1yMNqdpw4m8JEeXJZhN2yJi86j/WC0=";
|
||||
hash = "sha256-dd9j4eGXhNyaTOMiKK0qi8BW1Zy1kZ6+ZVMB7rrq4gE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RVKoy400ZPBC18gq87DntQw73AkIqSwpMqR0dtKA0wY=";
|
||||
cargoHash = "sha256-u83OgBEbZ4b2CLZv/M9Wv0tum3ZKZGOuba0leqfMDoo=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"lintspec"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
|
||||
@@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/set(OPENSSL_USE_STATIC_LIBS TRUE)/d' CMakeLists.txt
|
||||
substituteInPlace ./CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" \
|
||||
"cmake_minimum_required(VERSION 4.0)"
|
||||
'';
|
||||
|
||||
# causes redefinition of _FORTIFY_SOURCE
|
||||
|
||||
@@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Louvain Community Detection Library";
|
||||
homepage = "https://github.com/meelgroup/louvain-community";
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "manifest-tool";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
modRoot = "v2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "estesp";
|
||||
repo = "manifest-tool";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tEUsqrJGRhyirI8TEgG6r9crHX58webHO5v7JLLRQ30=";
|
||||
hash = "sha256-3Vzeq81zLfJLV1XcnQLixL9+acjIegjspquvMsgtuXg=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse HEAD > $out/.git-revision
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
return [
|
||||
- 'path.geoip2' => Piwik\DI::string('{path.root}/misc/'),
|
||||
+ 'path.geoip2' => PIWIK_USER_PATH . '/misc/',
|
||||
'geopip2.ispEnabled' => true
|
||||
'geopip2.ispEnabled' => true,
|
||||
];
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "matomo";
|
||||
version = "5.4.0";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-PRZYqJBebDsjeT9WBArRX3GKFbW5TtejV2FOo8jjaMU=";
|
||||
hash = "sha256-aL2mz7qyDT43Ez2BFzrdPyQX9/m3FUfz7copwa7u/zs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnu-mdk";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/mdk/v${version}/mdk-${version}.tar.gz";
|
||||
sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
|
||||
sha256 = "sha256-67ljk4xojBUP9qrtwp8w0JAgoeMdVbMMIQHwh3NRbRk=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
installShellFiles,
|
||||
}:
|
||||
let
|
||||
pname = "mdsf";
|
||||
@@ -24,6 +26,17 @@ rustPlatform.buildRustPackage {
|
||||
# many tests fail for various reasons of which most depend on the build sandbox
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd mdsf \
|
||||
--bash <($out/bin/mdsf completions bash) \
|
||||
--zsh <($out/bin/mdsf completions zsh) \
|
||||
--fish <($out/bin/mdsf completions fish) \
|
||||
--nushell <($out/bin/mdsf completions nushell)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
curl,
|
||||
fetchFromGitHub,
|
||||
ffmpeg,
|
||||
freeimage,
|
||||
gcc-unwrapped,
|
||||
icu,
|
||||
libmediainfo,
|
||||
@@ -19,7 +18,6 @@
|
||||
pkg-config,
|
||||
readline,
|
||||
sqlite,
|
||||
withFreeImage ? false, # default to false because freeimage is insecure
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -71,8 +69,7 @@ stdenv.mkDerivation {
|
||||
pcre-cpp
|
||||
readline
|
||||
sqlite
|
||||
]
|
||||
++ lib.optionals withFreeImage [ freeimage ];
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-examples"
|
||||
@@ -88,8 +85,8 @@ stdenv.mkDerivation {
|
||||
"--with-readline"
|
||||
"--with-sodium"
|
||||
"--with-termcap"
|
||||
]
|
||||
++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]);
|
||||
"--without-freeimage"
|
||||
];
|
||||
|
||||
# On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting.
|
||||
postConfigure = ''
|
||||
|
||||
@@ -7,24 +7,24 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "11.6.0";
|
||||
version = "11.12.0";
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "mermaid-cli";
|
||||
version = version;
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mermaid-js";
|
||||
repo = "mermaid-cli";
|
||||
rev = version;
|
||||
hash = "sha256-9Ozi5mAeFVdwGMjvlLG4hMWnCGi552SsT5RuvRiF9ww=";
|
||||
hash = "sha256-OpYq0nOYCGTorzDxybsEjJmhL646wMBbQw3eHVxTuqU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./remove-puppeteer-from-dev-deps.patch # https://github.com/mermaid-js/mermaid-cli/issues/830
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-SHGYv/IwrCB02M8w5HsEsB7BwWVRFYNDYJFRDgG3a14=";
|
||||
npmDepsHash = "sha256-Ex+tEm13feR/Vru0CHlvM3xS5wgGlYyqANeIquvRHwM=";
|
||||
|
||||
env = {
|
||||
PUPPETEER_SKIP_DOWNLOAD = true;
|
||||
|
||||
@@ -9,7 +9,7 @@ diff --git a/package.json b/package.json
|
||||
@@ -45,7 +45,6 @@
|
||||
"@tsconfig/node18": "^18.2.4",
|
||||
"@types/node": "~18.19.31",
|
||||
"jest": "^29.0.1",
|
||||
"jest": "^30.0.5",
|
||||
- "puppeteer": "^23.1.1",
|
||||
"standard": "^17.0.0",
|
||||
"typescript": "^5.0.1-rc",
|
||||
|
||||
@@ -12,11 +12,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "metabase";
|
||||
version = "0.56.6";
|
||||
version = "0.56.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
|
||||
hash = "sha256-OQ9B1KpuYrtTL46cKJtKyuiHEwGSkF+PlAjb8FOv4zo=";
|
||||
hash = "sha256-otpNh9TJnUoHjAVVCkrsJO93nIeEfaNC8amZdTvreIE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
cmake,
|
||||
pkg-config,
|
||||
libX11,
|
||||
libnotify,
|
||||
glfw,
|
||||
makeWrapper,
|
||||
libXrandr,
|
||||
@@ -16,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "midivisualizer";
|
||||
version = "7.0";
|
||||
version = "7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kosua20";
|
||||
repo = "MIDIVisualizer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE=";
|
||||
sha256 = "sha256-Ilsqc14PBTqreLhrEpvMOZAp37xOY/OwuhHTjeOjqm8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
glfw
|
||||
ffmpeg-full
|
||||
libnotify
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
@@ -65,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/kosua20/MIDIVisualizer";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
maintainers = [ maintainers.ericdallo ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -33,6 +33,13 @@ stdenv.mkDerivation rec {
|
||||
rm -rf thirdparty/gatb-core/gatb-core/thirdparty/{hdf5,boost}
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace thirdparty/gatb-core/gatb-core/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Short read genome assembler";
|
||||
mainProgram = "minia";
|
||||
|
||||
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
|
||||
|
||||
prePatch = ''
|
||||
cd mjpg-streamer-experimental
|
||||
substituteInPlace ./CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 2.8.3)" "cmake_minimum_required(VERSION 2.8.3...3.10)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,43 +1,66 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
cmake,
|
||||
perl,
|
||||
scotch,
|
||||
vtk,
|
||||
withVtk ? false,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mmg";
|
||||
version = "5.7.3-unstable-2024-05-31";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MmgTools";
|
||||
repo = "mmg";
|
||||
rev = "5a73683f84fe422031921bef4ced8905d8b9eb7e";
|
||||
hash = "sha256-8m4iDsJdjlzuXatfIIZCY8RgrEp4BQihhmQfytu8aaU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jiOScvzyO+bN2wYwcQmWhLkLSkTWVplMrXKRFttGisw=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"man"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build scripts
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
perl
|
||||
perl # required for generating fortran headers
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./
|
||||
'';
|
||||
propagatedBuildInputs = [
|
||||
scotch
|
||||
]
|
||||
++ lib.optional withVtk vtk;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS:BOOL=TRUE"
|
||||
"-DMMG_INSTALL_PRIVATE_HEADERS=ON"
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "MMG_INSTALL_PRIVATE_HEADERS" true) # required by downstream parmmg
|
||||
(lib.cmakeBool "USE_ELAS" false)
|
||||
(lib.cmakeBool "USE_SCOTCH" true)
|
||||
(lib.cmakeBool "USE_VTK" withVtk)
|
||||
(lib.cmakeBool "PMMG_CALL" vtk.mpiSupport)
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.tests = {
|
||||
cmake-config = testers.hasCmakeConfigModules {
|
||||
moduleNames = [ "mmg" ];
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Open source software for bidimensional and tridimensional remeshing";
|
||||
homepage = "http://www.mmgtools.org/";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ mkez ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ mkez ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
versionCheckHook,
|
||||
mydumper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mydumper";
|
||||
version = "0.20.1-2";
|
||||
@@ -82,7 +81,8 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
# as of mydumper v0.14.5-1, mydumper tries to install its config to /etc
|
||||
substituteInPlace CMakeLists.txt\
|
||||
--replace-fail "/etc" "$out/etc"
|
||||
--replace-fail "/etc" "$out/etc" \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
# copy man files & docs over
|
||||
|
||||
@@ -11,16 +11,23 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "netlify-cli";
|
||||
version = "19.0.2";
|
||||
version = "23.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netlify";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+P+hS/g/xRFNvzESZ5LyxyQSSRZ7BzCg9ZX/ndNLeDg=";
|
||||
hash = "sha256-rjxm/TrKsvYCKwoHkZRZXFpFTfLd0s0D/H6p5Bull0E=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-3C+tTqLJCm48pAbQMiIq2SsHmb4bcCaf3IU/cTeR5BA=";
|
||||
# Prevent postinstall script from running before package is built
|
||||
# See https://github.com/netlify/cli/blob/v23.9.2/scripts/postinstall.js#L70
|
||||
# This currently breaks completions: https://github.com/NixOS/nixpkgs/issues/455005
|
||||
postPatch = ''
|
||||
touch .git
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-itzEmCOBXxspGiwxt8t6di7/EuCo2Qkl5JVSkMfUemI=";
|
||||
|
||||
inherit nodejs;
|
||||
|
||||
|
||||
@@ -27,10 +27,15 @@ runCommand "netlify-cli-test"
|
||||
echo '/with-redirect /' >_redirects
|
||||
|
||||
# Start a local server and wait for it to respond
|
||||
netlify dev --offline --port 8888 2>&1 | tee log &
|
||||
# Edge functions require specific version of Deno and internet access for other Netlify stuff
|
||||
netlify dev --offline --internal-disable-edge-functions --port 8888 --debug 2>&1 | tee log &
|
||||
sleep 0.1 || true
|
||||
for (( i=0; i<300; i++ )); do
|
||||
if grep --ignore-case 'Server now ready' <log; then
|
||||
if ! jobs %% > /dev/null; then
|
||||
echo "Server died before starting" >&2
|
||||
exit 1
|
||||
fi
|
||||
if grep --ignore-case 'Local dev server ready' <log; then
|
||||
break
|
||||
else
|
||||
sleep 1
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ogen";
|
||||
version = "1.14.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ogen-go";
|
||||
repo = "ogen";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-w3h65MNXBgsH8PCHfoPqY+XNI6TMbLUAMI4Y3WWLEJM=";
|
||||
hash = "sha256-rZO6jdOzdayXnEEWxNE9gKkt0coi8pNfq+LT8JC8LiQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PQ2ZrigS9jZY1oL3Dsuc2RZwedZLzLKUqhMYfWiZ854=";
|
||||
vendorHash = "sha256-mL3xw0huTyLz33ja59/mJ+R2+KRIFOfKRUPrk5txJtA=";
|
||||
|
||||
patches = [ ./modify-version-handling.patch ];
|
||||
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openbao";
|
||||
version = "2.4.1";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openbao";
|
||||
repo = "openbao";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HfPkjeScegylpA/i8KlS3t468pmD5sRwp2Ct164fkTo=";
|
||||
hash = "sha256-gutZATBAaMXOZM/fDwU+T1fajFI/OIuKX/Na217r5y4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4SWpWGWoesUCgSpgOpblkxOpPbBC/grC2S1m7R9qasY=";
|
||||
vendorHash = "sha256-YxpWdwaPCk5mX8ZYJVNIG9end6/HkhXeGvgEq14cErY=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -18,6 +18,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# replace deprecated cmake version that are no longer supported by CMake > 4
|
||||
# https://github.com/NixOS/nixpkgs/issues/445447
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 3.0)" "cmake_minimum_required (VERSION 3.10)"
|
||||
substituteInPlace external_libs/oscpack_1_1_0/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required (VERSION 3.10)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "OttoMatic";
|
||||
version = "4.0.1-unstable-2025-04-27";
|
||||
version = "4.0.1-unstable-2025-09-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorio";
|
||||
repo = "OttoMatic";
|
||||
rev = "69f0111d1768abe56498bf8121f0f9cbc85aedd3";
|
||||
hash = "sha256-7RpEVL3tNhEhkZYVjgsI6S+CQfyiz/ukroldrtohA4k=";
|
||||
rev = "636056a92c1f276a5af5c3dc7df5c3cb952fd47a";
|
||||
hash = "sha256-nSLa/g1irZY9uU7lZkeT9C0iNPgBuD5wm1AxIrIzG54=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "parca-agent";
|
||||
version = "0.42.0";
|
||||
version = "0.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parca-dev";
|
||||
repo = "parca-agent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q/F7BzkeoZQfGROHVYF9n3SGidy4EhCLSRz2xa8eSKY=";
|
||||
hash = "sha256-xIe3s/7/raZuunR+Gx/icLHhT5VUNhcfBGbTqHybxu4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-nKLHe0MGdV05oSdDaaGN9elsAAzG6mfoT/ZZt+LcbI4=";
|
||||
vendorHash = "sha256-UQnIGTZQOgPWqJcc75pyaMFh8P8JKvtvlGneo5F3NEM=";
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.libc.static
|
||||
|
||||
@@ -1,59 +1,84 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch2,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
cmake,
|
||||
gfortran,
|
||||
perl,
|
||||
mpi,
|
||||
metis,
|
||||
mmg,
|
||||
scotch,
|
||||
vtk-full,
|
||||
withVtk ? true,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "parmmg";
|
||||
version = "1.4.0-unstable-2024-04-22";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MmgTools";
|
||||
repo = "ParMmg";
|
||||
rev = "f8a5338ea1bb2c778bfb4559c2c3974ba15b4730";
|
||||
hash = "sha256-ieFHREAVeD7IwDUCtsMG5UKxahxM+wzNCAqCOHIHwu8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LDbfGuTRd2wzmNHxXd381qVuOlWqqDdP8+Y/v1H68uM=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/MmgTools/ParMmg/commit/a9551c502c58a1f8a109fb17d8f45cb9370f8fc6.patch?full_index=1";
|
||||
hash = "sha256-i0KwzseffeI9UYIYuyNYmdF9eTZ+nQQfSI6ukSowIYs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build scripts
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gfortran
|
||||
mpi
|
||||
perl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
mpi
|
||||
metis
|
||||
mmg
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs --build ./
|
||||
'';
|
||||
scotch
|
||||
(mmg.override {
|
||||
inherit withVtk;
|
||||
vtk = vtk-full;
|
||||
})
|
||||
]
|
||||
++ lib.optional withVtk vtk-full;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS:BOOL=TRUE"
|
||||
"-DDOWNLOAD_MMG=OFF"
|
||||
"-DDOWNLOAD_METIS=OFF"
|
||||
"-Wno-dev"
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "DOWNLOAD_MMG" false)
|
||||
(lib.cmakeBool "DOWNLOAD_METIS" false)
|
||||
(lib.cmakeBool "USE_ELAS" false)
|
||||
(lib.cmakeBool "USE_SCOTCH" true)
|
||||
(lib.cmakeBool "USE_VTK" withVtk)
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.tests = {
|
||||
cmake-config = testers.hasCmakeConfigModules {
|
||||
moduleNames = [ "ParMmg" ];
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Distributed parallelization of 3D volume mesh adaptation";
|
||||
homepage = "http://www.mmgtools.org/";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ mkez ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ mkez ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
freeimage,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "perceptualdiff";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "myint";
|
||||
repo = "perceptualdiff";
|
||||
rev = "v${version}";
|
||||
sha256 = "176n518xv0pczf1yyz9r5a8zw5r6sh5ym596kmvw30qznp8n4a8j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ freeimage ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Program that compares two images using a perceptually based image metric";
|
||||
homepage = "https://github.com/myint/perceptualdiff";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ uri-canva ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "perceptualdiff";
|
||||
};
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
autoreconfHook,
|
||||
dos2unix,
|
||||
doxygen,
|
||||
freeimage,
|
||||
libpgf,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgf";
|
||||
version = "7.21.7";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://sourceforge/libpgf/libpgf/${version}/pgf-console.zip";
|
||||
hash = "sha256-W9eXYhbynLtvZQsn724Uw0SZ5TuyK2MwREwYKGFhJj0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
find . -type f | xargs dos2unix
|
||||
mv README.txt README
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
dos2unix
|
||||
doxygen
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freeimage
|
||||
libpgf
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.libpgf.org/";
|
||||
description = "Progressive Graphics Format command line program";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
cmake,
|
||||
unzip,
|
||||
pkg-config,
|
||||
libXpm,
|
||||
fltk13,
|
||||
freeimage,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "posterazor";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip";
|
||||
hash = "sha256-BbujA2ASyqQelb3iFAwgeJC0OhzXqufIa1UD+tFsF7c=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
unzip
|
||||
];
|
||||
buildInputs = [
|
||||
libXpm
|
||||
fltk13
|
||||
freeimage
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
unzip $src -d posterazor
|
||||
cd posterazor/src
|
||||
'';
|
||||
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667328
|
||||
patchPhase = ''
|
||||
sed "s/\(#define CASESENSITIVESTRCMP strcasecmp\)/#include <unistd.h>\n\1/" -i FlPosteRazorDialog.cpp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp PosteRazor $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://posterazor.sourceforge.net/";
|
||||
description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.madjar ];
|
||||
mainProgram = "PosteRazor";
|
||||
};
|
||||
}
|
||||
@@ -31,7 +31,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powershell";
|
||||
version = "7.5.3";
|
||||
version = "7.5.4";
|
||||
|
||||
src =
|
||||
passthru.sources.${stdenv.hostPlatform.system}
|
||||
@@ -96,19 +96,19 @@ stdenv.mkDerivation rec {
|
||||
sources = {
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz";
|
||||
hash = "sha256-9PrFxy6MCbo7b7hmfyGx1zVWBHgZhX/OeIMmjQI2nN4=";
|
||||
hash = "sha256-OqrdfKYvHk2+WRRbavJOkm1h+NqKR4K8U15QDBhBNfA=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
|
||||
hash = "sha256-SmtlbdDnUegsXfm5pCRb0ex9Id5TNK+72ALf0AlZVZk=";
|
||||
hash = "sha256-SzLUy4akPfuD1WAtApQpW/Ivr7+eB4XRqu+Bk4zakvg=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
|
||||
hash = "sha256-wxAB9bwKTSNkGarwVNjAMWAnozHTPi+0HPjSdko1fgU=";
|
||||
hash = "sha256-zRagTBuZzay9wDN7D9DaUNvxqLToQ3vLTKkRjvcpIRo=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
|
||||
hash = "sha256-XHTgu6/YvlnnImfwVwD9ZhU0TZz00wRg2bbRLNSoiow=";
|
||||
hash = "sha256-H9eYP+VsqeYjPxJpJe2yS/a2sz41a2mZbZJcTblOL+8=";
|
||||
};
|
||||
};
|
||||
tests.version = testers.testVersion {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user