Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
@@ -12,7 +12,7 @@ let
|
||||
cfg = config.programs.bash;
|
||||
|
||||
bashAliases = concatStringsSep "\n" (
|
||||
mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
|
||||
mapAttrsFlatten (k: v: "alias -- ${k}=${escapeShellArg v}")
|
||||
(filterAttrs (k: v: v != null) cfg.shellAliases)
|
||||
);
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
opt = options.programs.zsh;
|
||||
|
||||
zshAliases = concatStringsSep "\n" (
|
||||
mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
|
||||
mapAttrsFlatten (k: v: "alias -- ${k}=${escapeShellArg v}")
|
||||
(filterAttrs (k: v: v != null) cfg.shellAliases)
|
||||
);
|
||||
|
||||
|
||||
@@ -198,8 +198,8 @@ let
|
||||
|
||||
${optionalString cfg.statusPage ''
|
||||
server {
|
||||
listen 80;
|
||||
${optionalString enableIPv6 "listen [::]:80;" }
|
||||
listen ${toString cfg.defaultHTTPListenPort};
|
||||
${optionalString enableIPv6 "listen [::]:${toString cfg.defaultHTTPListenPort};" }
|
||||
|
||||
server_name localhost;
|
||||
|
||||
@@ -246,8 +246,8 @@ let
|
||||
if vhost.listen != [] then vhost.listen
|
||||
else
|
||||
let addrs = if vhost.listenAddresses != [] then vhost.listenAddresses else cfg.defaultListenAddresses;
|
||||
in optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = 443; ssl = true; }) addrs)
|
||||
++ optionals (!onlySSL) (map (addr: { inherit addr; port = 80; ssl = false; }) addrs);
|
||||
in optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = cfg.defaultSSLListenPort; ssl = true; }) addrs)
|
||||
++ optionals (!onlySSL) (map (addr: { inherit addr; port = cfg.defaultHTTPListenPort; ssl = false; }) addrs);
|
||||
|
||||
hostListen =
|
||||
if vhost.forceSSL
|
||||
@@ -449,6 +449,24 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
defaultHTTPListenPort = mkOption {
|
||||
type = types.port;
|
||||
default = 80;
|
||||
example = 8080;
|
||||
description = lib.mdDoc ''
|
||||
If vhosts do not specify listen.port, use these ports for HTTP by default.
|
||||
'';
|
||||
};
|
||||
|
||||
defaultSSLListenPort = mkOption {
|
||||
type = types.port;
|
||||
default = 443;
|
||||
example = 8443;
|
||||
description = lib.mdDoc ''
|
||||
If vhosts do not specify listen.port, use these ports for SSL by default.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.nginxStable;
|
||||
defaultText = literalExpression "pkgs.nginxStable";
|
||||
|
||||
@@ -300,7 +300,11 @@ in
|
||||
boot.supportedFilesystems = map (fs: fs.fsType) fileSystems;
|
||||
|
||||
# Add the mount helpers to the system path so that `mount' can find them.
|
||||
system.fsPackages = [ pkgs.dosfstools ];
|
||||
system.fsPackages = [
|
||||
pkgs.dosfstools
|
||||
# This is needed for the main fsck utility wrapping the fs-specific ones.
|
||||
pkgs.util-linux
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [ fuse3 fuse ] ++ config.system.fsPackages;
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, webkitgtk
|
||||
@@ -23,7 +24,15 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-QOKFnre5MW9EvrKrKBHWpOxi2fBKTDMhzCDX3ISd2cQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-D+3HIyj1zbs5m8hwLpITS25u/wrRM5GfnwlUUuLX8DQ=";
|
||||
cargoPatches = [
|
||||
(fetchpatch {
|
||||
name = "bump-rust-web-view.patch";
|
||||
url = "https://github.com/Revertron/Alfis/commit/03b461a740ab6ccbacd576eafc7a3faf4a66648f.patch";
|
||||
sha256 = "sha256-CSqSMdVD31w7QxxXWtjKmqlaEirmbs1EVuiefSf1NKY=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-B4xI++U6RCljXCyaOmNj/SwA6I16zoiZsgk2VTiKfkg=";
|
||||
|
||||
checkFlags = [
|
||||
# these want internet access, disable them
|
||||
|
||||
@@ -5,9 +5,9 @@ let
|
||||
in
|
||||
{
|
||||
sublime4 = common {
|
||||
buildVersion = "4142";
|
||||
x64sha256 = "JrFL17trcsUcS/bYbSbMhTnSMyla6AkoMII2lt2nAwY=";
|
||||
aarch64sha256 = "r6bxOYXVA2RAo8prdBQ7/gSNKFPmwDW5osblIE0azT4=";
|
||||
buildVersion = "4143";
|
||||
x64sha256 = "fehiw40ZNnQUEXEQMo3e11SscJ/tVMjMXLBzfIlMBzw=";
|
||||
aarch64sha256 = "4zpNHVEHO98vHcWTbqmwlrB4+HIwoQojeQvq7nAqSpM=";
|
||||
} {};
|
||||
|
||||
sublime4-dev = common {
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
diff -Naur source-old/ruby/GNUmakefile source-new/ruby/GNUmakefile
|
||||
--- source-old/ruby/GNUmakefile 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ source-new/ruby/GNUmakefile 2022-11-13 22:43:09.700197748 -0300
|
||||
@@ -11,17 +11,9 @@
|
||||
ruby += audio.openal
|
||||
ruby += input.quartz #input.carbon
|
||||
else ifeq ($(platform),linux)
|
||||
- pkg_check = $(if $(shell pkg-config $1 && echo 1),$2)
|
||||
- ruby += video.glx video.glx2 video.xshm
|
||||
- ruby += $(call pkg_check,xv,video.xvideo)
|
||||
- ruby += audio.oss audio.alsa
|
||||
- ruby += $(call pkg_check,openal,audio.openal)
|
||||
- ruby += $(call pkg_check,libpulse,audio.pulseaudio)
|
||||
- ruby += $(call pkg_check,libpulse-simple,audio.pulseaudiosimple)
|
||||
- ruby += $(call pkg_check,ao,audio.ao)
|
||||
- ruby += input.xlib
|
||||
- ruby += $(call pkg_check,libudev,input.udev)
|
||||
- ruby += $(call pkg_check,sdl2,input.sdl)
|
||||
+ ruby += video.glx video.glx2 video.xshm video.xvideo
|
||||
+ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao
|
||||
+ ruby += input.xlib input.udev input.sdl
|
||||
else ifeq ($(platform),bsd)
|
||||
pkg_check = $(if $(shell pkg-config $1 && echo 1),$2)
|
||||
ruby += video.glx video.glx2 video.xshm
|
||||
@@ -17,20 +17,20 @@
|
||||
, udev
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ares";
|
||||
version = "129";
|
||||
version = "130.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ares-emulator";
|
||||
repo = "ares";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-prfvoGtbnsl/1ahx98jBOgT64W566GoUtE8rIOF7lYc=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-q2wDpbNaDyKPBL20FDaHScKQEJYstlQdJ4CzbRoSPlk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./dont-rebuild-on-install.patch
|
||||
./fix-ruby.patch
|
||||
./000-dont-rebuild-on-install.patch
|
||||
./001-fix-ruby.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -64,12 +64,12 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ares.dev";
|
||||
homepage = "https://ares-emu.net";
|
||||
description = "Open-source multi-system emulator with a focus on accuracy and preservation";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ Madouura AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
# TODO: select between Qt, GTK2 and GTK3
|
||||
# TODO: support Darwin
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
diff --git a/ruby/GNUmakefile b/ruby/GNUmakefile
|
||||
index e85a51701..7fca89e0f 100644
|
||||
--- a/ruby/GNUmakefile
|
||||
+++ b/ruby/GNUmakefile
|
||||
@@ -8,19 +8,9 @@ ifeq ($(ruby),)
|
||||
ruby += audio.openal
|
||||
ruby += input.quartz #input.carbon
|
||||
else ifeq ($(platform),linux)
|
||||
- pkg_check1 = $(if $(shell test -e /usr/lib/lib$1.so && echo 1),$2)
|
||||
- pkg_check2 = $(if $(shell test -e /usr/lib/$(shell uname -m)-linux-gnu/lib$1.so && echo 1),$2)
|
||||
- pkg_check = $(call pkg_check1,$1,$2) $(call pkg_check2,$1,$2)
|
||||
- ruby += video.glx video.glx2 video.xshm
|
||||
- ruby += $(call pkg_check,Xv,video.xvideo)
|
||||
- ruby += audio.oss audio.alsa
|
||||
- ruby += $(call pkg_check,openal,audio.openal)
|
||||
- ruby += $(call pkg_check,pulse,audio.pulseaudio)
|
||||
- ruby += $(call pkg_check,pulse-simple,audio.pulseaudiosimple)
|
||||
- ruby += $(call pkg_check,ao,audio.ao)
|
||||
- ruby += input.xlib
|
||||
- ruby += $(call pkg_check,udev,input.udev)
|
||||
- ruby += $(call pkg_check,SDL2,input.sdl)
|
||||
+ ruby += video.glx video.glx2 video.xshm video.xvideo
|
||||
+ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao
|
||||
+ ruby += input.xlib input.udev input.sdl
|
||||
else ifeq ($(platform),bsd)
|
||||
pkg_check = $(if $(shell test -e /usr/local/lib/lib$1.so && echo 1),$2)
|
||||
ruby += video.glx video.glx2 video.xshm
|
||||
@@ -21,15 +21,15 @@
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "desmume";
|
||||
version = "0.9.11+unstable=2021-09-22";
|
||||
version = "0.9.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TASVideos";
|
||||
repo = pname;
|
||||
rev = "7fc2e4b6b6a58420de65a4089d4df3934d7a46b1";
|
||||
hash = "sha256-sTCyjQ31w1Lp+aa3VQ7/rdLbhjnqthce54mjKJZQIDM=";
|
||||
repo = "desmume";
|
||||
rev = "release_${lib.replaceChars ["."] ["_"] finalAttrs.version}";
|
||||
hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -81,7 +81,8 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isAarch64 && stdenv.isLinux; # ofborg failed
|
||||
};
|
||||
}
|
||||
})
|
||||
# TODO: investigate the patches
|
||||
# TODO: investigate other platforms
|
||||
|
||||
@@ -1,24 +1,44 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, SDL2, lua5_1, minizip, x264 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, cmake
|
||||
, lua
|
||||
, minizip
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, x264
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fceux";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TASEmulators";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM=";
|
||||
repo = "fceux";
|
||||
rev = "fceux-${finalAttrs.version}";
|
||||
hash = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
buildInputs = [ SDL2 lua5_1 minizip x264 ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
lua
|
||||
minizip
|
||||
x264
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.fceux.com/";
|
||||
description = "A Nintendo Entertainment System (NES) Emulator";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ sbruder scubed2 ];
|
||||
homepage = "http://www.fceux.com/";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doublecmd";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doublecmd";
|
||||
repo = "doublecmd";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kuqleoDoxzOj3baTK0lBJpbDECoHeFubWhLXAVkEqAk=";
|
||||
};
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
libqt5pas
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
|
||||
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build.sh install/linux/install.sh
|
||||
@@ -70,5 +70,5 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
# TODO: deal with other platforms too
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "5.1.1";
|
||||
version = "5.1.3";
|
||||
kde-channel = "stable";
|
||||
sha256 = "sha256-Tdv4l6+nsYcTFpfRKiO6OYlGOAaLLq4Ss7Q0/kKtjiQ=";
|
||||
sha256 = "sha256-69+P0wMIciGxuc6tmWG1OospmvvwcZl6zHNQygEngo0=";
|
||||
})
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, bluez, libusb1, curl
|
||||
, libiconv, gettext, sqlite
|
||||
{ lib, stdenv, fetchFromGitHub, substituteAll, pkg-config, cmake, bluez, libusb1, curl
|
||||
, libiconv, gettext, sqlite, bash, dialog
|
||||
, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
|
||||
, postgresSupport ? false, postgresql ? null
|
||||
}:
|
||||
@@ -17,13 +17,20 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I=";
|
||||
};
|
||||
|
||||
patches = [ ./bashcomp-dir.patch ./systemd.patch ];
|
||||
patches = [
|
||||
./bashcomp-dir.patch
|
||||
./systemd.patch
|
||||
(substituteAll {
|
||||
src = ./gammu-config-dialog.patch;
|
||||
dialog = "${dialog}/bin/dialog";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ bluez libusb1 curl gettext sqlite libiconv ]
|
||||
buildInputs = [ bash bluez libusb1 curl gettext sqlite libiconv ]
|
||||
++ optionals dbiSupport [ libdbi libdbiDrivers ]
|
||||
++ optionals postgresSupport [ postgresql ];
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
--- a/utils/gammu-config
|
||||
+++ b/utils/gammu-config
|
||||
@@ -59,16 +59,7 @@
|
||||
shift
|
||||
done
|
||||
|
||||
-if type dialog > /dev/null 2>&1 ; then
|
||||
- DIALOG=dialog
|
||||
-elif type cdialog > /dev/null 2>&1 ; then
|
||||
- DIALOG=cdialog
|
||||
-elif type whiptail > /dev/null 2>&1 ; then
|
||||
- DIALOG=whiptail
|
||||
-else
|
||||
- echo "You need dialog, cdialog or whiptail installed to make this work"
|
||||
- exit 1
|
||||
-fi
|
||||
+DIALOG=@dialog@
|
||||
|
||||
if [ -f "$CONFIG" ] ; then
|
||||
if [ ! -w "$CONFIG" ] ; then
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "organicmaps";
|
||||
version = "2022.09.22-3";
|
||||
version = "2022.11.02-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "organicmaps";
|
||||
repo = "organicmaps";
|
||||
rev = "${version}-android";
|
||||
sha256 = "sha256-b+XPsKeDVj3crOTxb52CxXmldkurVlNcZ/ODuJIbQ2A=";
|
||||
sha256 = "sha256-E/lJDw1QMPT0QcaTOxEyJL4hmEFkq21vQkgZbssszJg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2
|
||||
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols2
|
||||
, qtsvg, qttools, qtquick1, qtcharts
|
||||
, qmake
|
||||
}:
|
||||
|
||||
let
|
||||
breakpad_lss = fetchFromGitiles {
|
||||
url = "https://chromium.googlesource.com/linux-syscall-support";
|
||||
rev = "08056836f2b4a5747daff75435d10d649bed22f6";
|
||||
sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "redis-desktop-manager";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uglide";
|
||||
repo = "RedisDesktopManager";
|
||||
fetchSubmodules = true;
|
||||
rev = version;
|
||||
sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
buildInputs = [
|
||||
libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
|
||||
qtquick1 qtquickcontrols2 qtsvg qttools qtcharts
|
||||
];
|
||||
|
||||
dontUseQmakeConfigure = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ];
|
||||
|
||||
# Disable annoying update reminder
|
||||
postPatch = ''
|
||||
sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
srcdir=$PWD
|
||||
|
||||
cat <<EOF > src/version.h
|
||||
#ifndef RDM_VERSION
|
||||
#define RDM_VERSION "${version}-120"
|
||||
#endif // !RDM_VERSION
|
||||
EOF
|
||||
|
||||
cd $srcdir/3rdparty/gbreakpad
|
||||
cp -r ${breakpad_lss} src/third_party/lss
|
||||
chmod +w -R src/third_party/lss
|
||||
touch README
|
||||
|
||||
cd $srcdir/3rdparty/crashreporter
|
||||
qmake CONFIG+=release DESTDIR="$srcdir/rdm/bin/linux/release" QMAKE_LFLAGS_RPATH=""
|
||||
make
|
||||
|
||||
cd $srcdir/3rdparty/gbreakpad
|
||||
./configure
|
||||
make
|
||||
|
||||
cd $srcdir/src
|
||||
qmake
|
||||
make
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
instdir="$srcdir/bin/linux/release"
|
||||
cp $instdir/rdm $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "Cross-platform open source Redis DB management tool";
|
||||
homepage = "https://redisdesktop.com/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
{ stdenv
|
||||
, mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, brotli
|
||||
, lz4
|
||||
, pyotherside
|
||||
, python3
|
||||
, python3Packages
|
||||
, qtbase
|
||||
, qtcharts
|
||||
, qmake
|
||||
, qttools
|
||||
, rdbtools
|
||||
, snappy
|
||||
, wrapQtAppsHook
|
||||
, zstd
|
||||
}:
|
||||
|
||||
let
|
||||
rdbtools-patched = rdbtools.overridePythonAttrs (oldAttrs: {
|
||||
# Add required additional flag for resp-app
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "Add-flag-to-parse-only-key-names.patch";
|
||||
url = "https://github.com/uglide/redis-rdb-tools/commit/b74946e6fbca589947ef0186429d5ce45a074b87.patch";
|
||||
hash = "sha256-1gjqB/IDSsAbrwzWSezlAW/2SYr6BFm1QJ2HAHK2fFs=";
|
||||
})
|
||||
];
|
||||
});
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "RESP.app";
|
||||
version = "2022.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedisInsight";
|
||||
repo = "RedisDesktopManager";
|
||||
fetchSubmodules = true;
|
||||
rev = version;
|
||||
sha256 = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.wrapPython
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
brotli
|
||||
lz4
|
||||
pyotherside
|
||||
python3
|
||||
qtbase
|
||||
qtcharts
|
||||
qttools
|
||||
snappy
|
||||
zstd
|
||||
] ++ pythonPath;
|
||||
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
bitstring
|
||||
cbor
|
||||
msgpack
|
||||
phpserialize
|
||||
rdbtools-patched
|
||||
python-lzf
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/resp.pro \
|
||||
--replace 'which ccache' "false" \
|
||||
--replace 'target.files = $$DESTDIR/resp' "${placeholder "src"}/bin/linux/release/resp" \
|
||||
--replace '/opt/resp_app' "${placeholder "out"}" \
|
||||
--replace 'target.path = $$LINUX_INSTALL_PATH' 'target.path = $$LINUX_INSTALL_PATH/bin' \
|
||||
--replace '/usr/' "$out/"
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
"SYSTEM_LZ4=1"
|
||||
"SYSTEM_ZSTD=1"
|
||||
"SYSTEM_SNAPPY=1"
|
||||
"SYSTEM_BROTLI=1"
|
||||
"VERSION=${version}"
|
||||
"src/resp.pro"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$pythonPath"
|
||||
qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform Developer GUI for Redis";
|
||||
homepage = "https://resp.app/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
};
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, fetchFromGitLab
|
||||
, mkDerivation
|
||||
, cmake
|
||||
, exempi
|
||||
@@ -24,17 +24,21 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "tellico";
|
||||
version = "3.4.1";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
# version 3.3.0 just uses 3.3 in its file name
|
||||
urls = [
|
||||
"https://tellico-project.org/files/tellico-${version}.tar.xz"
|
||||
"https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz"
|
||||
];
|
||||
sha256 = "sha256-+FFN6sO0mvlage8JazyrqNZk4onejz1XJPiOK3gnhWE=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "office";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Qgan0mnDTQx+KKCAnRpgi9CCbXIRBMQtAyH/Mr20VSw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/gui/imagewidget.h \
|
||||
--replace ksane_version.h KF5/ksane_version.h
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
|
||||
@@ -204,6 +204,7 @@ stdenv.mkDerivation {
|
||||
else "https://archive.mozilla.org/pub/firefox/releases/";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
|
||||
description = "Mozilla Firefox, free web browser (binary package)";
|
||||
homepage = "https://www.mozilla.org/firefox/";
|
||||
license = licenses.mpl20;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -3,22 +3,14 @@
|
||||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "106.0.5";
|
||||
version = "107.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "879b054340d632c5d972888ceb67da0d02f28f6755e9683c8e4e7fb71b55bde0e588b98e24bae448ffea8ddd3e30c44dc0563554ecd69506862796a64ca040d7";
|
||||
sha512 = "4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e";
|
||||
};
|
||||
|
||||
# This patch could be applied anywhere (just rebuild, no effect)
|
||||
extraPatches = lib.optionals stdenv.isAarch64 [
|
||||
(fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1791275
|
||||
name = "no-sysctl-aarch64.patch";
|
||||
url = "https://hg.mozilla.org/mozilla-central/raw-rev/0efaf5a00aaceeed679885e4cd393bd9a5fcd0ff";
|
||||
hash = "sha256-wS/KufeLFxCexQalGGNg8+vnQhzDiL79OLt8FtL/JJ8=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
|
||||
description = "A web browser built from Firefox source tree";
|
||||
homepage = "http://www.mozilla.com/en-US/firefox/";
|
||||
maintainers = with lib.maintainers; [ lovesegfault hexa ];
|
||||
@@ -37,14 +29,15 @@ rec {
|
||||
|
||||
firefox-esr-102 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-102";
|
||||
version = "102.4.0esr";
|
||||
version = "102.5.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "30d9e6ef04fd86516e2cea3c797ec99af4c96b08576bb3409c0026da4fd1218167f89a007109e1fa4e2571f98f2dbe5ab58a26473533d45301f75b90ec3dbf28";
|
||||
sha512 = "f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc246c00caa386c0b0561055096d30b298329c69270dd085b943bdbc3a91a13";
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
|
||||
description = "A web browser built from Firefox Extended Support Release source tree";
|
||||
homepage = "http://www.mozilla.com/en-US/firefox/";
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "106.0.3-1",
|
||||
"packageVersion": "107.0-1",
|
||||
"source": {
|
||||
"rev": "106.0.3-1",
|
||||
"sha256": "0f0nz7fbp9k1pz7i8lh3fq3218crwqw2fdy9ia9hi9nlnybh114f"
|
||||
"rev": "107.0-1",
|
||||
"sha256": "1fm4z3s0z9shxj8667pnz3gly7jv1kmm1arbn52hq7n52ywykrv7"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "106.0.3",
|
||||
"sha512": "226bde9082330abe134d1726cec59b473d4d6839ea55ca20faddb901f032d89eb9d2bd5d887ccd4ba515c6b1a44817420cfee2e9f4f8a79ed46a38287083d28d"
|
||||
"version": "107.0",
|
||||
"sha512": "4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +1,10 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, attrs
|
||||
, click
|
||||
, cloudflare
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cloudflare-dyndns";
|
||||
version = "4.1";
|
||||
format = "pyproject";
|
||||
@@ -23,11 +16,11 @@ buildPythonApplication rec {
|
||||
hash = "sha256-6Q5fpJ+HuQ+hc3xTtB5tR43pn9WZ0nZZR723iLAkpis=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
attrs
|
||||
click
|
||||
cloudflare
|
||||
@@ -35,7 +28,7 @@ buildPythonApplication rec {
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@@ -2,23 +2,23 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubecolor";
|
||||
version = "0.0.20";
|
||||
version = "0.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hidetatz";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bKHEp9AxH1CcObhNzD3BkNOdyWZu7JrEdsXpo49wEcI=";
|
||||
sha256 = "sha256-d1gtbpeK9vp8bwhsMOPVKmohfyEZtQuvRB36VZCB3sY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-C1K7iEugA4HBLthcOI7EZ6H4YHW6el8X6FjVN1BeJR0=";
|
||||
vendorSha256 = "sha256-g5bLi0HQ7LQM+DKn5x8enXn8/9j3LFhgDjQ+YN0M7dM=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Colorizes kubectl output";
|
||||
homepage = "https://github.com/hidetatz/kubecolor";
|
||||
changelog = "https://github.com/hidetatz/kubecolor/releases/tag/v${version}";
|
||||
homepage = "https://github.com/kubecolor/kubecolor";
|
||||
changelog = "https://github.com/kubecolor/kubecolor/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 ];
|
||||
};
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchFromGitLab
|
||||
, callPackage
|
||||
, config
|
||||
, writeShellScript
|
||||
@@ -21,6 +22,7 @@ let
|
||||
, vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09
|
||||
, deleteVendor ? false
|
||||
, proxyVendor ? false
|
||||
, mkProviderFetcher ? fetchFromGitHub
|
||||
, mkProviderGoModule ? buildGoModule
|
||||
# Looks like "registry.terraform.io/vancluever/acme"
|
||||
, provider-source-address
|
||||
@@ -35,7 +37,7 @@ let
|
||||
# goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled
|
||||
CGO_ENABLED = 0;
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ];
|
||||
src = fetchFromGitHub {
|
||||
src = mkProviderFetcher {
|
||||
name = "source-${rev}";
|
||||
inherit owner repo rev hash;
|
||||
};
|
||||
@@ -68,6 +70,7 @@ let
|
||||
netlify = automated-providers.netlify.overrideAttrs (_: { meta.broken = stdenv.isDarwin; });
|
||||
pass = automated-providers.pass.overrideAttrs (_: { meta.broken = stdenv.isDarwin; });
|
||||
tencentcloud = automated-providers.tencentcloud.overrideAttrs (_: { meta.broken = stdenv.isDarwin; });
|
||||
gitlab = automated-providers.gitlab.override { mkProviderFetcher = fetchFromGitLab; owner = "gitlab-org"; };
|
||||
# mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
|
||||
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
|
||||
};
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
"version": "0.1.1"
|
||||
},
|
||||
"aiven": {
|
||||
"hash": "sha256-+Uzz2eu873lh707/zADfMK/4D5wDMxXZtAf0RU6V42M=",
|
||||
"hash": "sha256-2QdpXNCnnYh75CyqeKJbYgFB63TCcMrWlUPLe/puvOw=",
|
||||
"owner": "aiven",
|
||||
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v3.8.0",
|
||||
"vendorHash": "sha256-F+zF9xqHNCXrGxOjEoe8gaGS0C7EO0s61CjN9+9PiYk=",
|
||||
"version": "3.8.0"
|
||||
"rev": "v3.8.1",
|
||||
"vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=",
|
||||
"version": "3.8.1"
|
||||
},
|
||||
"akamai": {
|
||||
"hash": "sha256-QbCDaDII+xEA3lXjODsz8jai2mg3N/3uC4fruiLqvWc=",
|
||||
@@ -431,13 +431,13 @@
|
||||
"version": "5.8.0"
|
||||
},
|
||||
"gitlab": {
|
||||
"hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=",
|
||||
"hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=",
|
||||
"owner": "gitlabhq",
|
||||
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
|
||||
"repo": "terraform-provider-gitlab",
|
||||
"rev": "v3.18.0",
|
||||
"vendorHash": "sha256-YrgsycnRIB5UoWGADphfP6lf78M8ZnkJGP0Ti2QJtQ8=",
|
||||
"version": "3.18.0"
|
||||
"rev": "v3.19.0",
|
||||
"vendorHash": "sha256-e9J4g5ZuiKcI/WSXMFY3Qglgt87qbXv7tDpxYbRRuaU=",
|
||||
"version": "3.19.0"
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-guE04J0RCFOHPXGtEpxGZu8s6fnfoh0WLRRZ5GW/gLk=",
|
||||
@@ -777,13 +777,13 @@
|
||||
"version": "0.6.12"
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-C8lWtFECZrtj6ZyurbysZnCMfX1uJWhO4r188Wobg/M=",
|
||||
"hash": "sha256-TZM7MRdc3Fok2e8FR04ccC19rd1OXvrRnm6yQRRhXJU=",
|
||||
"owner": "newrelic",
|
||||
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.6.1",
|
||||
"vendorHash": "sha256-lEFcR908CK4RSSO/3kbqQ/wse5HKaqveWUZbzUhUTMI=",
|
||||
"version": "3.6.1"
|
||||
"rev": "v3.7.0",
|
||||
"vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=",
|
||||
"version": "3.7.0"
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=",
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
, libvpx
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8.2";
|
||||
version = "2.9.0";
|
||||
pname = "baresip";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "baresip";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+hkV9s4ORm4Kqu9zBmxtFZJFG3gh70OOxpjix052bM0=";
|
||||
sha256 = "sha256-B4d8D4IfLYAIYVN80Lrh5bywD5iacSnUVwEzbc6Xq7g=";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
||||
@@ -21,12 +21,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.2.8";
|
||||
version = "2.2.9";
|
||||
outputs = [ "out" "doc" "info" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "A/PSN6LuKh0WM2QXyaXxe0nPcEXu/qYCHwggu/hdClM=";
|
||||
sha256 = "+lMbIx1Y/h8wztoO1iZoPqnr37ds5H74uyfC93Qiz/s=";
|
||||
};
|
||||
|
||||
patches = lib.optional smimeSupport (fetchpatch {
|
||||
|
||||
@@ -205,6 +205,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
|
||||
description = "Mozilla Thunderbird, a full-featured email client (binary package)";
|
||||
homepage = "http://www.mozilla.org/thunderbird/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
|
||||
@@ -19,6 +19,7 @@ rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
|
||||
description = "A full-featured e-mail client";
|
||||
homepage = "https://thunderbird.net/";
|
||||
maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ];
|
||||
|
||||
@@ -70,6 +70,7 @@ buildPythonApplication rec {
|
||||
homepage = "https://github.com/ProtonVPN/linux-app";
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "protonvpn";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ clangStdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake
|
||||
{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, libyamlcpp, cmake
|
||||
, eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }:
|
||||
|
||||
clangStdenv.mkDerivation rec {
|
||||
@@ -12,6 +12,13 @@ clangStdenv.mkDerivation rec {
|
||||
sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "use_newer_cxxopts_which_builds_with_clang11.patch";
|
||||
url = "https://github.com/d-SEAMS/seams-core/commit/f6156057e43d0aa1a0df9de67d8859da9c30302d.patch";
|
||||
hash = "sha256-PLbT1lqdw+69lIHH96MPcGRjfIeZyb88vc875QLYyqw=";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ];
|
||||
buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ];
|
||||
|
||||
|
||||
@@ -14,15 +14,13 @@
|
||||
, libGLU
|
||||
, mpfr
|
||||
, proj
|
||||
# build with Python 3.10 fails, because boost <= 1.78 can't find
|
||||
# pythons with double digits in minor versions, like X.YZ
|
||||
, python39
|
||||
, python3
|
||||
, qtxmlpatterns
|
||||
, qwt
|
||||
}:
|
||||
|
||||
let
|
||||
python = python39.withPackages (ps: with ps; [
|
||||
python = python3.withPackages (ps: with ps; [
|
||||
numpy
|
||||
]);
|
||||
boost' = boost.override {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.20.0";
|
||||
version = "2.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g83JuV+RPtuQJoxcMgMlZbHftqohA9frIk/y89/PucY=";
|
||||
sha256 = "sha256-atUC6vb/tOO2GapMjTqFi4qjDAdSf2F8v3gZuzyt+9Q=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FSniCYr3emV9W/BuEkWe0a4aZ5RCoZJc7+K+f2q49ys=";
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "got";
|
||||
version = "0.78";
|
||||
version = "0.79";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
|
||||
sha256 = "sha256-fi0YF0YCOtzA02Ix42BU6fi1UKgF/X6mG3S0fP/ZwxE=";
|
||||
sha256 = "sha256-eL4cCpBRhO0ctQZGg1n6+H5O6GhRKRsWcEOcRr+z2Hw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config bison ];
|
||||
|
||||
@@ -4,8 +4,8 @@ let
|
||||
common = opts: callPackage (import ./common.nix opts);
|
||||
in {
|
||||
sublime-merge = common {
|
||||
buildVersion = "2077";
|
||||
x64sha256 = "6xgh/oSatTYHCnQEXiZAoHs3yI1iimLMtzCosBKBVp8=";
|
||||
buildVersion = "2079";
|
||||
x64sha256 = "y4ocLXxxEkGaw9O/vhX9MJnc56QgK37YPJkUwK2YS0U=";
|
||||
} {};
|
||||
|
||||
sublime-merge-dev = common {
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
, vulkanSupport ? stdenv.isLinux
|
||||
, libplacebo
|
||||
, shaderc
|
||||
, shaderc # instead of spirv-cross
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
|
||||
@@ -55,11 +55,13 @@
|
||||
, cacaSupport ? true, libcaca
|
||||
, cmsSupport ? true, lcms2
|
||||
, dvdnavSupport ? stdenv.isLinux, libdvdnav
|
||||
, dvbinSupport ? stdenv.isLinux
|
||||
, jackaudioSupport ? false, libjack2
|
||||
, javascriptSupport ? true, mujs
|
||||
, libpngSupport ? true, libpng
|
||||
, openalSupport ? true, openalSoft
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
|
||||
, pipewireSupport ? stdenv.isLinux, pipewire
|
||||
, rubberbandSupport ? true, rubberband
|
||||
, screenSaverSupport ? true, libXScrnSaver
|
||||
, sdl2Support ? true, SDL2
|
||||
@@ -75,14 +77,12 @@
|
||||
, zimgSupport ? true, zimg
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mpv";
|
||||
version = "0.34.1";
|
||||
version = "0.35.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
@@ -90,11 +90,11 @@ in stdenv.mkDerivation rec {
|
||||
owner = "mpv-player";
|
||||
repo = "mpv";
|
||||
rev = "v${version}";
|
||||
sha256 = "12qxwm1ww5vhjddl8yvj1xa0n1fi9z3lmzwhaiday2v59ca0qgsk";
|
||||
sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./TOOLS/
|
||||
patchShebangs version.* ./TOOLS/
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "
|
||||
@@ -119,13 +119,13 @@ in stdenv.mkDerivation rec {
|
||||
(lib.enableFeature sixelSupport "sixel")
|
||||
(lib.enableFeature vaapiSupport "vaapi")
|
||||
(lib.enableFeature waylandSupport "wayland")
|
||||
(lib.enableFeature stdenv.isLinux "dvbin")
|
||||
(lib.enableFeature dvbinSupport "dvbin")
|
||||
] # Disable whilst Swift isn't supported
|
||||
++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb";
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
docutils
|
||||
docutils # for rst2man
|
||||
perl
|
||||
pkg-config
|
||||
python3
|
||||
@@ -154,6 +154,7 @@ in stdenv.mkDerivation rec {
|
||||
++ lib.optionals javascriptSupport [ mujs ]
|
||||
++ lib.optionals libpngSupport [ libpng ]
|
||||
++ lib.optionals openalSupport [ openalSoft ]
|
||||
++ lib.optionals pipewireSupport [ pipewire ]
|
||||
++ lib.optionals pulseSupport [ libpulseaudio ]
|
||||
++ lib.optionals rubberbandSupport [ rubberband ]
|
||||
++ lib.optionals screenSaverSupport [ libXScrnSaver ]
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, mkDerivationWith
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, doxygen
|
||||
, gtk3
|
||||
, libopenshot
|
||||
@@ -47,6 +48,22 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# Following Arch PKGBUILD for Python 3.10 compatibility
|
||||
# https://github.com/OpenShot/openshot-qt/issues/4608
|
||||
# https://github.com/archlinux/svntogit-community/commits/packages/openshot/trunk
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "video-widget.patch";
|
||||
url = "https://github.com/OpenShot/openshot-qt/commit/9748a13268d66a5949aebc970637b5903756d018.patch";
|
||||
hash = "sha256-QwLtcooDJeYWDp80a1dUFo2so/zEWqqsq5IgkXWX324=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "python-3.10-int.patch";
|
||||
url = "https://github.com/OpenShot/openshot-qt/commit/fff785eb1e3e0c30ed6ca57e2d1933aaa807ae22.patch";
|
||||
hash = "sha256-ee/s7rhF71ot5oPkGK+j59mL1B3e72xoH27KFoDL8s8=";
|
||||
})
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/openshot-qt \
|
||||
''
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.6.9";
|
||||
version = "1.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KvQdYQLzgt/MKPsA/mO5un6nE3/xcvVYwIveNn/uDnU=";
|
||||
sha256 = "sha256-kz2UuWzVK5lu/d6K0LHauu2yhBF6Hl83P/a/HCCSObc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@@ -41,13 +41,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "icewm";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ice-wm";
|
||||
repo = "icewm";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-CLRLDJtp/rrdckzBKgof+vYFi+sqszevtCNGwokNxI0=";
|
||||
hash = "sha256-tVbBV3eaZ9MUXlzriiOeEuzojI3GHNaXRBjdsQjXrzw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -465,8 +465,11 @@ rec {
|
||||
*
|
||||
* This creates a simple derivation with symlinks to all inputs.
|
||||
*
|
||||
* entries is a list of attribute sets like
|
||||
* { name = "name" ; path = "/nix/store/..."; }
|
||||
* entries can be a list of attribute sets like
|
||||
* [ { name = "name" ; path = "/nix/store/..."; } ]
|
||||
*
|
||||
* or an attribute set name -> path like:
|
||||
* { name = "/nix/store/..."; other = "/nix/store/..."; }
|
||||
*
|
||||
* Example:
|
||||
*
|
||||
@@ -482,14 +485,28 @@ rec {
|
||||
*
|
||||
* See the note on symlinkJoin for the difference between linkFarm and symlinkJoin.
|
||||
*/
|
||||
linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; }
|
||||
''mkdir -p $out
|
||||
cd $out
|
||||
${lib.concatMapStrings (x: ''
|
||||
mkdir -p "$(dirname ${lib.escapeShellArg x.name})"
|
||||
ln -s ${lib.escapeShellArg "${x.path}"} ${lib.escapeShellArg x.name}
|
||||
'') entries}
|
||||
'';
|
||||
linkFarm = name: entries:
|
||||
let
|
||||
entries' =
|
||||
if (lib.isAttrs entries) then entries
|
||||
# We do this foldl to have last-wins semantics in case of repeated entries
|
||||
else if (lib.isList entries) then lib.foldl (a: b: a // { "${b.name}" = b.path; }) { } entries
|
||||
else throw "linkFarm entries must be either attrs or a list!";
|
||||
|
||||
linkCommands = lib.mapAttrsToList (name: path: ''
|
||||
mkdir -p "$(dirname ${lib.escapeShellArg "${name}"})"
|
||||
ln -s ${lib.escapeShellArg "${path}"} ${lib.escapeShellArg "${name}"}
|
||||
'') entries';
|
||||
in
|
||||
runCommand name {
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
passthru.entries = entries';
|
||||
} ''
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
${lib.concatStrings linkCommands}
|
||||
'';
|
||||
|
||||
/*
|
||||
* Easily create a linkFarm from a set of derivations.
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{ linkFarm, hello, writeTextFile, runCommand }:
|
||||
let
|
||||
foo = writeTextFile {
|
||||
name = "foo";
|
||||
text = "foo";
|
||||
};
|
||||
|
||||
linkFarmFromList = linkFarm "linkFarmFromList" [
|
||||
{ name = "foo"; path = foo; }
|
||||
{ name = "hello"; path = hello; }
|
||||
];
|
||||
|
||||
linkFarmWithRepeats = linkFarm "linkFarmWithRepeats" [
|
||||
{ name = "foo"; path = foo; }
|
||||
{ name = "hello"; path = hello; }
|
||||
{ name = "foo"; path = hello; }
|
||||
];
|
||||
|
||||
linkFarmFromAttrs = linkFarm "linkFarmFromAttrs" {
|
||||
inherit foo hello;
|
||||
};
|
||||
in
|
||||
runCommand "test-linkFarm" { } ''
|
||||
function assertPathEquals() {
|
||||
local a b;
|
||||
a="$(realpath "$1")"
|
||||
b="$(realpath "$2")"
|
||||
if [ "$a" != "$b" ]; then
|
||||
echo "path mismatch!"
|
||||
echo "a: $1 -> $a"
|
||||
echo "b: $2 -> $b"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
assertPathEquals "${linkFarmFromList}/foo" "${foo}"
|
||||
assertPathEquals "${linkFarmFromList}/hello" "${hello}"
|
||||
|
||||
assertPathEquals "${linkFarmWithRepeats}/foo" "${hello}"
|
||||
assertPathEquals "${linkFarmWithRepeats}/hello" "${hello}"
|
||||
|
||||
assertPathEquals "${linkFarmFromAttrs}/foo" "${foo}"
|
||||
assertPathEquals "${linkFarmFromAttrs}/hello" "${hello}"
|
||||
touch $out
|
||||
''
|
||||
@@ -186,6 +186,10 @@
|
||||
"volume-scroller": [
|
||||
"volume_scroller@trflynn89.pm.me",
|
||||
"volume_scroller@noskoski"
|
||||
],
|
||||
"auto-activities": [
|
||||
"auto-activities@acedron.github.io",
|
||||
"auto-activities@CleoMenezesJr.github.io"
|
||||
]
|
||||
},
|
||||
"43": {
|
||||
|
||||
@@ -34,6 +34,9 @@
|
||||
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
|
||||
"wireguard-indicator@atareao.es" = "wireguard-indicator";
|
||||
|
||||
"auto-activities@acedron.github.io" = "auto-activities-2";
|
||||
"auto-activities@CleoMenezesJr.github.io" = "auto-activities";
|
||||
|
||||
# ####### GNOME 41 #######
|
||||
|
||||
"floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./hardcode-gsettings.patch;
|
||||
CAJA_GSETTINGS_PATH = glib.getSchemaPath mate.caja;
|
||||
TERM_GSETTINGS_PATH = glib.getSchemaPath mate.mate-terminal;
|
||||
caja_gsetttings_path = glib.getSchemaPath mate.caja;
|
||||
desktop_gsetttings_path = glib.getSchemaPath mate.mate-desktop;
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ index e14a9bf..691afab 100644
|
||||
+ GSettingsSchemaSource* schema_source;
|
||||
+ GSettingsSchema* schema;
|
||||
+
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@CAJA_GSETTINGS_PATH@",
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@caja_gsetttings_path@",
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE, NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source,
|
||||
@@ -74,7 +74,7 @@ index e14a9bf..691afab 100644
|
||||
+ GSettingsSchemaSource* schema_source;
|
||||
+ GSettingsSchema* schema;
|
||||
+
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@",
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE, NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source,
|
||||
@@ -95,7 +95,7 @@ index e14a9bf..691afab 100644
|
||||
+ GSettingsSchemaSource* schema_source;
|
||||
+ GSettingsSchema* schema;
|
||||
+
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@",
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE, NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source,
|
||||
@@ -155,7 +155,7 @@ index 3119e9f..4f80c88 100644
|
||||
filename = g_filename_from_uri(uri, NULL, NULL);
|
||||
|
||||
- settings = g_settings_new (WP_SCHEMA);
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@",
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE, NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source,
|
||||
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
[PlankDockItemPreferences]
|
||||
Launcher=file:///run/current-system/sw/share/applications/io.elementary.files.desktop
|
||||
+1
-1
@@ -1,2 +1,2 @@
|
||||
[net.launchpad.plank.dock.settings]
|
||||
dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
|
||||
dock-items=['gala-multitaskingview.dockitem','io.elementary.files.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
|
||||
|
||||
@@ -1,19 +1,22 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, buildDocs ? false, tex
|
||||
, tex
|
||||
, buildDocs ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "asl";
|
||||
version = "142-bld211";
|
||||
version = "142-bld232";
|
||||
|
||||
src = fetchzip {
|
||||
src = let inherit (finalAttrs) pname version; in fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-${version}.tar.bz2";
|
||||
hash = "sha256-Sbm16JX7kC/7Ws7YgNBUXNqOCl6u+RXgfNjTODhCzSM=";
|
||||
hash = "sha256-Q50GzXBxFMhbt5s9OgHPNH4bdqz2hhEmTnMmKowVn2E=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
nativeBuildInputs = lib.optionals buildDocs [ tex ];
|
||||
|
||||
postPatch = lib.optionalString (!buildDocs) ''
|
||||
@@ -26,10 +29,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preBuild = ''
|
||||
bindir="${placeholder "out"}/bin" \
|
||||
docdir="${placeholder "out"}/doc/asl" \
|
||||
docdir="${placeholder "doc"}/share/doc/asl" \
|
||||
incdir="${placeholder "out"}/include/asl" \
|
||||
libdir="${placeholder "out"}/lib/asl" \
|
||||
mandir="${placeholder "out"}/share/man" \
|
||||
mandir="${placeholder "man"}/share/man" \
|
||||
substituteAll ${./Makefile-nixos.def} Makefile.def
|
||||
mkdir -p .objdir
|
||||
'';
|
||||
@@ -47,8 +50,7 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
# TODO: multiple outputs
|
||||
})
|
||||
# TODO: cross-compilation support
|
||||
# TODO: customize TeX input
|
||||
# TODO: report upstream about `mkdir -p .objdir/`
|
||||
|
||||
@@ -3,15 +3,15 @@
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jwasm";
|
||||
version = "2.15";
|
||||
version = "2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Baron-von-Riedesel";
|
||||
repo = "JWasm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ef4uEtEpnqYGhFmxuefJ40zyOuHsiPOLpH/52i7a7KI=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-X2qqS4ev0+PeA1Gcsi8nivKAGZv7jxThxmQL/Jf5oB0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
@@ -32,12 +32,13 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://github.com/Baron-von-Riedesel/JWasm/";
|
||||
description = "A MASM-compatible x86 assembler";
|
||||
changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
# TODO: generalize for Windows builds
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, brotli
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brunsli";
|
||||
version = "0.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "brunsli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZcrRz2xSoRepgG8KZYY/JzgONerItW0e6mH1PYsko98=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# unvendor brotli
|
||||
(fetchpatch {
|
||||
url = "https://cgit.freebsd.org/ports/plain/graphics/brunsli/files/patch-CMakeLists.txt";
|
||||
extraPrefix = "";
|
||||
hash = "sha256-/WPOG9OcEDj9ObBSXEM8Luq4Rix+PS2MvsYyHhK5mns=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://cgit.freebsd.org/ports/plain/graphics/brunsli/files/patch-brunsli.cmake";
|
||||
extraPrefix = "";
|
||||
hash = "sha256-+HXA9Tin+l2St7rRUEBM0AfhAjSoFxz8UX7hsg12aFg=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -r third_party
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
rm -r build
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
brotli
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Lossless JPEG repacking library";
|
||||
homepage = "https://github.com/google/brunsli";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A D-Bus API for the dLeyna services";
|
||||
homepage = "https://github.com/phako/dleyna-connector-dbus";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Library of utility functions that are used by the higher level dLeyna";
|
||||
homepage = "https://github.com/phako/dleyna-core";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Library to discover and manipulate Digital Media Renderers";
|
||||
homepage = "https://github.com/phako/dleyna-renderer";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Library to discover, browse and manipulate Digital Media Servers";
|
||||
homepage = "https://github.com/phako/dleyna-server";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,84 +1,152 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
|
||||
, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng
|
||||
, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2
|
||||
, autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl, pkg-config }:
|
||||
|
||||
with lib;
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, bison
|
||||
, cmake
|
||||
, doxygen
|
||||
, graphviz
|
||||
, pkg-config
|
||||
, python3
|
||||
, swig
|
||||
, armadillo
|
||||
, arrow-cpp
|
||||
, c-blosc
|
||||
, brunsli
|
||||
, cfitsio
|
||||
, crunch
|
||||
, curl
|
||||
, cryptopp
|
||||
, libdeflate
|
||||
, expat
|
||||
, libgeotiff
|
||||
, geos
|
||||
, giflib
|
||||
, libheif
|
||||
, dav1d
|
||||
, libaom
|
||||
, libde265
|
||||
, rav1e
|
||||
, x265
|
||||
, hdf4
|
||||
, hdf5-cpp
|
||||
, libiconv
|
||||
, libjpeg
|
||||
, json_c
|
||||
, libjxl
|
||||
, libhwy
|
||||
, lerc
|
||||
, xz
|
||||
, libxml2
|
||||
, lz4
|
||||
, libmysqlclient
|
||||
, netcdf
|
||||
, openexr
|
||||
, openjpeg
|
||||
, openssl
|
||||
, pcre2
|
||||
, libpng
|
||||
, poppler
|
||||
, postgresql
|
||||
, proj
|
||||
, qhull
|
||||
, libspatialite
|
||||
, sqlite
|
||||
, libtiff
|
||||
, tiledb
|
||||
, libwebp
|
||||
, xercesc
|
||||
, zlib
|
||||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
version = "3.4.2";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bE55VV0SrG8nxCLdpODRalnuAkn+olRdMLUjduavj6M=";
|
||||
sha256 = "sha256-jtAFI1J64ZaTqIljqQL1xOiTGC79AZWcIgidozWczMM=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/gdal";
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
doxygen
|
||||
graphviz
|
||||
pkg-config
|
||||
python3.pkgs.setuptools
|
||||
python3.pkgs.wrapPython
|
||||
swig
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config unzip ];
|
||||
cmakeFlags = [
|
||||
"-DGDAL_USE_INTERNAL_LIBS=OFF"
|
||||
"-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include"
|
||||
"-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
"-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql"
|
||||
"-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/mysql/libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
libtiff
|
||||
libpng
|
||||
proj
|
||||
openssl
|
||||
sqlite
|
||||
libspatialite
|
||||
libgeotiff
|
||||
poppler
|
||||
hdf4
|
||||
qhull
|
||||
giflib
|
||||
armadillo
|
||||
c-blosc
|
||||
brunsli
|
||||
cfitsio
|
||||
crunch
|
||||
curl
|
||||
cryptopp
|
||||
libdeflate
|
||||
expat
|
||||
libgeotiff
|
||||
geos
|
||||
giflib
|
||||
libheif
|
||||
dav1d # required by libheif
|
||||
libaom # required by libheif
|
||||
libde265 # required by libheif
|
||||
rav1e # required by libheif
|
||||
x265 # required by libheif
|
||||
hdf4
|
||||
hdf5-cpp
|
||||
libjpeg
|
||||
json_c
|
||||
libjxl
|
||||
libhwy # required by libjxl
|
||||
lerc
|
||||
xz
|
||||
libxml2
|
||||
lz4
|
||||
libmysqlclient
|
||||
netcdf
|
||||
openjpeg
|
||||
openssl
|
||||
pcre2
|
||||
libpng
|
||||
poppler
|
||||
postgresql
|
||||
] ++ (with pythonPackages; [ python setuptools numpy wrapPython ])
|
||||
++ lib.optional stdenv.isDarwin libiconv
|
||||
++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-expat=${expat.dev}"
|
||||
"--with-jpeg=${libjpeg.dev}"
|
||||
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
|
||||
"--with-png=${libpng.dev}" # optional
|
||||
"--with-poppler=${poppler.dev}" # optional
|
||||
"--with-libz=${zlib.dev}" # optional
|
||||
"--with-pg=yes" # since gdal 3.0 doesn't use ${postgresql}/bin/pg_config
|
||||
"--with-mysql=${getDev libmysqlclient}/bin/mysql_config"
|
||||
"--with-geotiff=${libgeotiff}"
|
||||
"--with-sqlite3=${sqlite.dev}"
|
||||
"--with-spatialite=${libspatialite.dev}"
|
||||
"--with-python" # optional
|
||||
"--with-proj=${proj.dev}" # optional
|
||||
"--with-geos=${geos}/bin/geos-config" # optional
|
||||
"--with-hdf4=${hdf4.dev}" # optional
|
||||
"--with-xml2=yes" # optional
|
||||
(if netcdfSupport then "--with-netcdf=${netcdf}" else "")
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
CXXFLAGS = lib.concatStringsSep " " [
|
||||
"-fpermissive"
|
||||
# poppler uses std::optional
|
||||
"-std=c++17"
|
||||
];
|
||||
|
||||
# - Unset CC and CXX as they confuse libtool.
|
||||
# - teach gdal that libdf is the legacy name for libhdf
|
||||
preConfigure = ''
|
||||
substituteInPlace configure \
|
||||
--replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace swig/python/GNUmakefile \
|
||||
--replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)"
|
||||
'';
|
||||
proj
|
||||
qhull
|
||||
libspatialite
|
||||
sqlite
|
||||
libtiff
|
||||
tiledb
|
||||
libwebp
|
||||
zlib
|
||||
zstd
|
||||
python3
|
||||
python3.pkgs.numpy
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
# tests for formats enabled by these packages fail on macos
|
||||
arrow-cpp
|
||||
openexr
|
||||
xercesc
|
||||
] ++ lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
postInstall = ''
|
||||
wrapPythonPrograms
|
||||
@@ -91,13 +159,11 @@ stdenv.mkDerivation rec {
|
||||
# calls (coming from the python world)
|
||||
preCheck = ''
|
||||
pushd ../autotest
|
||||
# something has made files here read-only by this point
|
||||
chmod -R u+w .
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
export PYTHONPATH="$out/${pythonPackages.python.sitePackages}:$PYTHONPATH"
|
||||
export PYTHONPATH="$out/${python3.sitePackages}:$PYTHONPATH"
|
||||
'';
|
||||
installCheckInputs = with pythonPackages; [
|
||||
installCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
pytest-env
|
||||
lxml
|
||||
@@ -115,12 +181,16 @@ stdenv.mkDerivation rec {
|
||||
# https://github.com/OSGeo/gdal/issues/5523
|
||||
"test_transformer_dem_overrride_srs"
|
||||
"test_osr_ct_options_area_of_interest"
|
||||
# ZIP does not support timestamps before 1980
|
||||
" test_sentinel2_zipped"
|
||||
] ++ lib.optionals (!stdenv.isx86_64) [
|
||||
# likely precision-related expecting x87 behaviour
|
||||
"test_jp2openjpeg_22"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# flaky on macos
|
||||
"test_rda_download_queue"
|
||||
] ++ lib.optionals (lib.versionOlder proj.version "8") [
|
||||
"test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members"
|
||||
];
|
||||
postCheck = ''
|
||||
popd # ../autotest
|
||||
@@ -129,8 +199,9 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Translator library for raster geospatial data formats";
|
||||
homepage = "https://www.gdal.org/";
|
||||
changelog = "https://docs.unidata.ucar.edu/netcdf-c/${src.rev}/RELEASE_NOTES.html";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = with lib.maintainers; [ marcweber dotlambda ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A GObject to SQLite object mapper";
|
||||
homepage = "https://wiki.gnome.org/Projects/Gom";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -94,6 +94,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A collection of plugins for the Grilo framework";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, mesonEmulatorHook
|
||||
, ninja
|
||||
@@ -34,6 +35,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "81Ks9zZlZpk0JwY2/t5mtS2mgB/iD2OMQEirJnhXey0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/b0d75be00b06cb0163dabbedecf9122a55273349.patch";
|
||||
sha256 = "sha256-Hwnc3TLN6n3w/MAFcprHv7nbTcwRfI0cmfDriNLnAvQ=";
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable-gtk-doc=true"
|
||||
];
|
||||
@@ -73,6 +81,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -50,7 +50,8 @@ stdenv.mkDerivation rec {
|
||||
"-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
|
||||
# Move developer documentation to devdoc output.
|
||||
@@ -73,7 +74,6 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "GObject-based API for handling resource discovery and announcement over SSDP";
|
||||
homepage = "http://www.gupnp.org/";
|
||||
license = licenses.lgpl2Plus;
|
||||
|
||||
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://gupnp.org/";
|
||||
description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://wiki.gnome.org/Projects/GUPnP/";
|
||||
description = "Library to ease DLNA-related bits for applications using GUPnP";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Library to handle UPnP IGD port mapping";
|
||||
homepage = "http://www.gupnp.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -67,7 +67,8 @@ stdenv.mkDerivation rec {
|
||||
"-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Bail out! ERROR:../tests/test-bugs.c:168:test_on_timeout: code should not be reached
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
@@ -80,6 +81,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.gupnp.org/";
|
||||
description = "An implementation of the UPnP specification";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
|
||||
# then stops downstream builds (mariadb in particular) from detecting it. This
|
||||
# option should remove the prefix and give us a working jemalloc.
|
||||
@@ -19,6 +20,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-LbgtHnEZ3z5xt2QCGbbf6EeJvAU3mDw7esT3GJrs/qo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix tests under --with-jemalloc-prefix=, see https://github.com/jemalloc/jemalloc/pull/2340
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jemalloc/jemalloc/commit/d00ecee6a8dfa90afcb1bbc0858985c17bef6559.patch";
|
||||
hash = "sha256-N5i4IxGJ4SSAgFiq5oGRnrNeegdk2flw9Sh2mP0yl4c=";
|
||||
})
|
||||
];
|
||||
|
||||
# see the comment on stripPrefix
|
||||
configureFlags = []
|
||||
++ lib.optional stripPrefix "--with-jemalloc-prefix="
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lerc";
|
||||
version = "3.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esri";
|
||||
repo = "lerc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QO5+ouQy5nOcAgvxMeBDoSBP+G3ClDjXipnkuSIDcP0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "C++ library for Limited Error Raster Compression";
|
||||
homepage = "https://github.com/esri/lerc";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfixposix";
|
||||
version="0.4.3";
|
||||
version="0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sionescu";
|
||||
repo = "libfixposix";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j";
|
||||
sha256 = "sha256-5qA6ytbqE+/05XQGxP9/4vEs9gFcuI3k7eJJYucW7fM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.isDarwin [ getconf ];
|
||||
|
||||
@@ -1,14 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, libjpeg
|
||||
, libtiff
|
||||
, proj
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.1";
|
||||
version = "1.7.1";
|
||||
pname = "libgeotiff";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "libgeotiff";
|
||||
rev = version;
|
||||
sha256 = "081ag23pn2n5y4fkb2rnh4hmcnq92siqiqv0s20jmx0j3s2nvfxy";
|
||||
hash = "sha256-bE6UAUKiorriTgYrqhxbMAN2NEtmV/8IIfF02RUghSI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
@@ -20,15 +29,19 @@ stdenv.mkDerivation rec {
|
||||
"--with-zlib=${zlib.dev}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ libtiff proj ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
#hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
|
||||
homepage = "https://github.com/OSGeo/libgeotiff";
|
||||
changelog = "https://github.com/OSGeo/libgeotiff/blob/${src.rev}/libgeotiff/NEWS";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [lib.maintainers.marcweber];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
|
||||
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Library tasked with managing, extracting and handling media art caches";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 0705ddce1..771291b88 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -7,8 +7,7 @@ include(FetchContent)
|
||||
|
||||
FetchContent_Declare(
|
||||
Catch2
|
||||
- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
||||
- GIT_TAG v2.13.7)
|
||||
+ SOURCE_DIR @catch2_src@)
|
||||
FetchContent_MakeAvailable(Catch2)
|
||||
|
||||
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0")
|
||||
@@ -0,0 +1,26 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d87a7052d..837867551 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -153,19 +153,8 @@ endif()
|
||||
|
||||
mapnik_find_package(Freetype REQUIRED)
|
||||
|
||||
-# try to find harfbuzz with the native configuration and fallback to our "own" FindHarfBuzz
|
||||
-mapnik_find_package(harfbuzz CONFIG QUIET)
|
||||
-if(harfbuzz_FOUND)
|
||||
- message(STATUS "Found harfbuzz native cmake")
|
||||
- list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz)
|
||||
-else()
|
||||
- # Use pkg-config when harfbuzz is not found.
|
||||
- # It might be possible that in future version harfbuzz could only be found via pkg-config.
|
||||
- # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653
|
||||
- message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...")
|
||||
- pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION})
|
||||
- list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
|
||||
-endif()
|
||||
+pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz)
|
||||
+list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
|
||||
|
||||
if(USE_EXTERNAL_MAPBOX_GEOMETRY)
|
||||
# this is used to provide a way to specify include dirs with CACHE VARIABLES
|
||||
@@ -1,111 +1,110 @@
|
||||
{ lib, stdenv, fetchzip
|
||||
, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
|
||||
, libwebp, libxml2, proj, python3, python ? python3, sqlite, zlib
|
||||
, sconsPackages
|
||||
|
||||
# supply a postgresql package to enable the PostGIS input plugin
|
||||
, postgresql ? null
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildPackages
|
||||
, cmake
|
||||
, pkg-config
|
||||
, substituteAll
|
||||
, boost
|
||||
, cairo
|
||||
, freetype
|
||||
, gdal
|
||||
, harfbuzz
|
||||
, icu
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, libwebp
|
||||
, libxml2
|
||||
, proj
|
||||
, python3
|
||||
, sqlite
|
||||
, zlib
|
||||
, catch2
|
||||
, postgresql
|
||||
}:
|
||||
|
||||
let
|
||||
scons = sconsPackages.scons_3_0_1;
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mapnik";
|
||||
version = "3.1.0";
|
||||
version = "unstable-2022-10-18";
|
||||
|
||||
src = fetchzip {
|
||||
# this one contains all git submodules and is cheaper than fetchgit
|
||||
url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
|
||||
sha256 = "sha256-qqPqN4vs3ZsqKgnx21yQhX8OzHca/0O+3mvQ/vnC5EY=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapnik";
|
||||
repo = "mapnik";
|
||||
rev = "05661e54392bcbb3367747f97a3ef6e468c105ba";
|
||||
hash = "sha256-96AneLPH1gbh/u880Pdc9OdFq2MniSdaTJoKYqId7sw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure \
|
||||
--replace '$PYTHON scons/scons.py' ${scons}/bin/scons
|
||||
--replace '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons
|
||||
rm -r scons
|
||||
'';
|
||||
|
||||
# a distinct dev output makes python-mapnik fail
|
||||
outputs = [ "out" ];
|
||||
|
||||
nativeBuildInputs = [ scons ];
|
||||
patches = [
|
||||
# The lib/cmake/harfbuzz/harfbuzz-config.cmake file in harfbuzz.dev is faulty,
|
||||
# as it provides the wrong libdir. The workaround is to just rely on
|
||||
# pkg-config to locate harfbuzz shared object files.
|
||||
# Upstream HarfBuzz wants to drop CMake support anyway.
|
||||
# See discussion: https://github.com/mapnik/mapnik/issues/4265
|
||||
./cmake-harfbuzz.patch
|
||||
# prevent CMake from trying to get libraries on the Internet
|
||||
(substituteAll {
|
||||
src = ./catch2-src.patch;
|
||||
catch2_src = catch2.src;
|
||||
})
|
||||
./include.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
|
||||
libwebp proj python sqlite zlib
|
||||
|
||||
# optional inputs
|
||||
boost
|
||||
cairo
|
||||
freetype
|
||||
gdal
|
||||
harfbuzz
|
||||
icu
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
libwebp
|
||||
proj
|
||||
python3
|
||||
sqlite
|
||||
zlib
|
||||
libxml2
|
||||
postgresql
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ libxml2 ];
|
||||
cmakeFlags = [
|
||||
# Would require qt otherwise.
|
||||
"-DBUILD_DEMO_VIEWER=OFF"
|
||||
];
|
||||
|
||||
prefixKey = "PREFIX=";
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./configure
|
||||
# mapnik-config is currently not build with CMake. So we use the SCons for
|
||||
# this one. We can't add SCons to nativeBuildInputs though, as stdenv would
|
||||
# then try to build everything with scons.
|
||||
preBuild = ''
|
||||
cd ..
|
||||
${buildPackages.scons}/bin/scons utils/mapnik-config
|
||||
cd build
|
||||
'';
|
||||
|
||||
# NOTE: 2021-05-06:
|
||||
# Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 for backwards compatibility
|
||||
# with major versions 6 and 7 of proj which are otherwise not compatible
|
||||
# with mapnik 3.1.0. Note that:
|
||||
#
|
||||
# 1. Starting with proj version 8, this workaround will no longer be
|
||||
# supported by the upstream proj project.
|
||||
#
|
||||
# 2. Without the workaround, mapnik configures itself without proj support.
|
||||
#
|
||||
# 3. The master branch of mapnik (after 3.1.0) appears to add native support
|
||||
# for the proj 6 api, so this workaround is not likely to be needed in
|
||||
# subsequent mapnik releases. At that point, this block comment and the
|
||||
# NIX_CFLAGS_COMPILE expression can be removed.
|
||||
|
||||
NIX_CFLAGS_COMPILE =
|
||||
if version != "3.1.0" && lib.versionAtLeast version "3.1.0"
|
||||
then throw "The mapnik compatibility workaround for proj 6 may no longer be required. Remove workaround after checking."
|
||||
else if lib.versionAtLeast (lib.getVersion proj) "8"
|
||||
then throw ("mapnik currently requires a version of proj less than 8, but proj version is: " + (lib.getVersion proj))
|
||||
else "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
|
||||
|
||||
configureFlags = [
|
||||
"BOOST_INCLUDES=${boost.dev}/include"
|
||||
"BOOST_LIBS=${boost.out}/lib"
|
||||
"CAIRO_INCLUDES=${cairo.dev}/include"
|
||||
"CAIRO_LIBS=${cairo.out}/lib"
|
||||
"FREETYPE_INCLUDES=${freetype.dev}/include"
|
||||
"FREETYPE_LIBS=${freetype.out}/lib"
|
||||
"GDAL_CONFIG=${gdal}/bin/gdal-config"
|
||||
"HB_INCLUDES=${harfbuzz.dev}/include"
|
||||
"HB_LIBS=${harfbuzz.out}/lib"
|
||||
"ICU_INCLUDES=${icu.dev}/include"
|
||||
"ICU_LIBS=${icu.out}/lib"
|
||||
"JPEG_INCLUDES=${libjpeg.dev}/include"
|
||||
"JPEG_LIBS=${libjpeg.out}/lib"
|
||||
"PNG_INCLUDES=${libpng.dev}/include"
|
||||
"PNG_LIBS=${libpng.out}/lib"
|
||||
"PROJ_INCLUDES=${proj.dev}/include"
|
||||
"PROJ_LIBS=${proj.out}/lib"
|
||||
"SQLITE_INCLUDES=${sqlite.dev}/include"
|
||||
"SQLITE_LIBS=${sqlite.out}/lib"
|
||||
"TIFF_INCLUDES=${libtiff.dev}/include"
|
||||
"TIFF_LIBS=${libtiff.out}/lib"
|
||||
"WEBP_INCLUDES=${libwebp}/include"
|
||||
"WEBP_LIBS=${libwebp}/lib"
|
||||
"XMLPARSER=libxml2"
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
"JOBS=$(NIX_BUILD_CORES)"
|
||||
];
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
cp ../utils/mapnik-config/mapnik-config $out/bin/mapnik-config
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source toolkit for developing mapping applications";
|
||||
homepage = "https://mapnik.org";
|
||||
maintainers = with maintainers; [ hrdinka erictapen ];
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.all;
|
||||
# https://github.com/mapnik/mapnik/issues/4232
|
||||
broken = lib.versionAtLeast proj.version "8.0.0";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
diff --git a/benchmark/src/test_png_encoding2.cpp b/benchmark/src/test_png_encoding2.cpp
|
||||
index 19897d180..5791b139c 100644
|
||||
--- a/benchmark/src/test_png_encoding2.cpp
|
||||
+++ b/benchmark/src/test_png_encoding2.cpp
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "bench_framework.hpp"
|
||||
#include "compare_images.hpp"
|
||||
+#include <memory>
|
||||
|
||||
class test : public benchmark::test_case
|
||||
{
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, buildPackages
|
||||
@@ -9,31 +10,28 @@
|
||||
, curl
|
||||
, gtest
|
||||
, nlohmann_json
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proj";
|
||||
version = "9.0.0";
|
||||
version = "9.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = version;
|
||||
sha256 = "sha256-zMP+WzC65BFz8g8mF5t7toqxmxCJePysd6WJuqpe8yg=";
|
||||
hash = "sha256-Upsp72RorV+5PFPHOK3zCJgVTRZ6fSVVFRope8Bp8/M=";
|
||||
};
|
||||
|
||||
# https://github.com/OSGeo/PROJ/issues/3206
|
||||
postPatch = ''
|
||||
# NB will not apply once https://github.com/OSGeo/PROJ/pull/3150 is released
|
||||
substituteInPlace cmake/ProjUtilities.cmake \
|
||||
--replace '$\{exec_prefix\}/$'{PROJ_LIB_SUBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
|
||||
--replace '$\{prefix\}/$'{PROJ_INCLUDE_SUBDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \
|
||||
--replace '$\{prefix\}/$'{CMAKE_INSTALL_DATAROOTDIR} '$'{CMAKE_INSTALL_FULL_DATAROOTDIR}
|
||||
substituteInPlace cmake/project-config.cmake.in \
|
||||
--replace '$'{_ROOT}/@INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \
|
||||
--replace '$'{_ROOT}/@LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
|
||||
--replace '$'{_ROOT}/@BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@
|
||||
'';
|
||||
patches = [
|
||||
# https://github.com/OSGeo/PROJ/pull/3252
|
||||
(fetchpatch {
|
||||
name = "only-add-find_dependencyCURL-for-static-builds.patch";
|
||||
url = "https://github.com/OSGeo/PROJ/commit/11f4597bbb7069bd5d4391597808703bd96df849.patch";
|
||||
hash = "sha256-4w5Cu2m5VJZr6E2dUVRyWJdED2TyS8cI8G20EwfQ4u0=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -62,6 +60,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
python = python3.pkgs.pyproj;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cartographic Projections Library";
|
||||
homepage = "https://proj.org/";
|
||||
|
||||
+9
-9
@@ -4,18 +4,18 @@ version = 3
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "0.7.18"
|
||||
version = "0.7.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
|
||||
checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.125"
|
||||
version = "0.2.137"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
|
||||
checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
@@ -25,9 +25,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.5.5"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
|
||||
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -36,13 +36,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.25"
|
||||
version = "0.6.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
||||
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
||||
|
||||
[[package]]
|
||||
name = "rure"
|
||||
version = "0.2.1"
|
||||
version = "0.2.2"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"regex",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"pname": "rure",
|
||||
"version": "0.2.1",
|
||||
"sha256": "18sd1dfagf2338mp32kfjbqpc3n0agm61p044jl7yhy299ws21r8"
|
||||
"version": "0.2.2",
|
||||
"sha256": "0n2c9b8arfgcq1l7gr8dfcmdvdbggvfd0msy6sbx3bln74wwbr06"
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomysensors";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "MartinHjelmare";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XPvnZOshA+PdFOzOlJXMfRTRYSue0uHsNwQsCwv3WOU=";
|
||||
hash = "sha256-VvGhFf9x257YdSmOxjztGZW9FLBNd028rH3+BvXAQ4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopvapi";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "sander76";
|
||||
repo = "aio-powerview-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RBZuYgTySVL1YtyZ4ZJZly2zvWt/5pZ99/aPCwZ91xQ=";
|
||||
hash = "sha256-cghfNi5T343/7GxNLDrE0iAewMlRMycQTP7SvDVpU2M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "airthings-ble";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "vincegio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EPzYIPoT5yAdobmdfaehOYhYeKM6NMpcNZWVR2Dac8k=";
|
||||
hash = "sha256-5moJ/Pu1Ixy4s7mCbjxQYROafjHVDM2cmpg0imDznl0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
, dill
|
||||
, fastavro
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, freezegun
|
||||
, grpcio
|
||||
, grpcio-tools
|
||||
@@ -53,6 +54,16 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/apache/beam/pull/24143
|
||||
name = "fix-for-dill-0.3.6.patch";
|
||||
url = "https://github.com/apache/beam/commit/7e014435b816015d21cc07f3f6c80809f3d8023d.patch";
|
||||
hash = "sha256-iUmnzrItTFM98w3mpadzrmtI3t0fucpSujAg/6qxCGk=";
|
||||
stripLen = 2;
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
# See https://github.com/NixOS/nixpkgs/issues/156957
|
||||
"dill"
|
||||
@@ -138,6 +149,10 @@ buildPythonPackage rec {
|
||||
"apache_beam/runners/portability/flink_runner_test.py"
|
||||
"apache_beam/runners/portability/samza_runner_test.py"
|
||||
"apache_beam/runners/portability/spark_runner_test.py"
|
||||
|
||||
# Fails starting from dill 0.3.6 because it tries to pickle pytest globals:
|
||||
# https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499.
|
||||
"apache_beam/transforms/window_test.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, sqlite
|
||||
@@ -9,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apsw";
|
||||
version = "3.39.3.0";
|
||||
version = "3.39.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = isPyPy;
|
||||
@@ -18,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "rogerbinns";
|
||||
repo = "apsw";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rUG6TXGdF+XaRTFn2luffYw+1EEChxtLgQx2Gn+7J6A=";
|
||||
hash = "sha256-vFPvevtAAEHG34G2ZPbETo/Erjem4G9r7xvkEoPBlLQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
{ lib
|
||||
, anyio
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, paho-mqtt
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncio-mqtt";
|
||||
version = "0.13.0";
|
||||
format = "setuptools";
|
||||
version = "0.14.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -17,22 +21,47 @@ buildPythonPackage rec {
|
||||
owner = "sbtinstruments";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-On4N5KPnbwYrJguWwBdrnaNq58ZeGIPYSFzIRBfojpQ=";
|
||||
hash = "sha256-ByVslOx/XsxVan2/xdRi+wOQR9oVpIGtHPcHlIcHMEk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
paho-mqtt
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# Module will have tests starting with > 0.13.0
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
anyio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asyncio_mqtt"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_client_filtered_messages"
|
||||
"test_client_unfiltered_messages"
|
||||
"test_client_unsubscribe"
|
||||
"test_client_will"
|
||||
"test_client_tls_context"
|
||||
"test_client_tls_params"
|
||||
"test_client_username_password "
|
||||
"test_client_logger"
|
||||
"test_client_max_concurrent_outgoing_calls"
|
||||
"test_client_websockets"
|
||||
"test_client_pending_calls_threshold"
|
||||
"test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Idomatic asyncio wrapper around paho-mqtt";
|
||||
homepage = "https://github.com/sbtinstruments/asyncio-mqtt";
|
||||
|
||||
@@ -16,23 +16,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "basemap";
|
||||
version = "1.3.4";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matplotlib";
|
||||
repo = "basemap";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-F/6xPmdXSJAuASyFaKOP+6Jz8U2JRZdqErEH7PFkr/w=";
|
||||
hash = "sha256-BSWifzh+Y1f+x89oNYMBvttWY9qZ0IM5QYqSgyVb1fE=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/packages/basemap";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "numpy >= 1.21, < 1.23" "numpy >= 1.21, < 1.24" \
|
||||
--replace "pyshp >= 1.2, < 2.2" "pyshp >= 1.2, < 2.4"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
geos
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "cypari2";
|
||||
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a";
|
||||
sha256 = "17beb467d3cb39fffec3227c468f0dd8db8a09129faeb95a6bb4c84b2b6c6683";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
, buildPythonPackage
|
||||
, dill
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fsspec
|
||||
, huggingface-hub
|
||||
, importlib-metadata
|
||||
@@ -32,6 +33,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-5j8HT/DzHH8xssv97g/9kpSgtpaY6daWOGwjasD1psg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Backport support for dill<3.7
|
||||
url = "https://github.com/huggingface/datasets/pull/5166.patch";
|
||||
hash = "sha256-QigpXKHi2B60M/iIWSqvBU9hW5vBu6IHGML22aCMevo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "responses<0.19" "responses"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, attrs, click, cligj, click-plugins, six, munch, enum34
|
||||
, pytestCheckHook, boto3, mock, giflib, pytz
|
||||
, gdal, certifi
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -14,6 +15,14 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-qCqZzps+eCV0AVfEXJ+yJZ1OkvCohqqsJfDbQP/h7qM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Toblerity/Fiona/pull/1122
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Toblerity/Fiona/commit/fa632130dcd9dfbb982ecaa4911b3fab3459168f.patch";
|
||||
hash = "sha256-IuNHr3yBqS1jY9Swvcq8XPv6BpVlInDx0FVuzEMaYTY=";
|
||||
})
|
||||
];
|
||||
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-nest-sdm";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = "python-google-nest-sdm";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-af1oYeNEQdz6HivAhvQY0xm3J4s+uXpcdema37oG15U=";
|
||||
hash = "sha256-gT8Zrjzzunm5nt0GHYY0z2ZxtKBSc6FXndlrStbwo64=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, aiofiles
|
||||
, buildPythonPackage
|
||||
, cached-property
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, pdm-pep517
|
||||
@@ -11,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -20,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-eoWOkAwAd3ab9+uUfAdrYhkheibfGYkuoNQX/3nS57w=";
|
||||
hash = "sha256-Gcht9pmh15dvSHRsG9y82l4HoJ7l/gxbmrRh7Jow2Bs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -34,7 +35,9 @@ buildPythonPackage rec {
|
||||
pdm-pep517
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
cached-property
|
||||
];
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "growattserver";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "indykoning";
|
||||
repo = "PyPi_GrowattServer";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-79/siHqwY3TNFIxodR24TJwsrKapG1GP4u4fIKxdFI4=";
|
||||
hash = "sha256-HZsgha7CAjJYDDBlh2Ib24glUiMAXpNR8KsSdm78BA8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "heatzypy";
|
||||
version = "2.1.1";
|
||||
version = "2.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Cyr-ius";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4/v0xodpJzVi6/ciW5icqDFGCtBFKtGoMB92CknH9xw=";
|
||||
hash = "sha256-Z60apquRzhkPbxgGKgDswtW9GUXGt9MbdAsh3Yh31b0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libsass";
|
||||
version = "0.21.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "libsass-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-4doz3kkRlyfVfeUarYw2tcybeDVeE2jpgmHxFJsPiVc=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-5O4Er3jNUFy83m/K0HzYR+fHcSDqF/3M+fXaFZY8zEg=";
|
||||
};
|
||||
|
||||
buildInputs = [ libsass ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy-wireguard";
|
||||
version = "0.1.17";
|
||||
version = "0.1.18";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "decathorpe";
|
||||
repo = "mitmproxy_wireguard";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-G//3h9QHModKNcGqG2FcV65bver809J4Xnig/Fr5zdg=";
|
||||
hash = "sha256-vDexI9ihZhisbtt7k9epYD3RjPUaUnEX1TuDQDHZO8A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-KPk6lLofsWDG+rswG5+q4bs9CZJFn4RuepX/OQvZ1Pw=";
|
||||
hash = "sha256-iVrF+9D4HHRx1E10GbGftcmil3Epw6iuRdf2m2o+/u8=";
|
||||
};
|
||||
|
||||
# Module has no tests, only a test client
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocstrings-python";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = "python";
|
||||
rev = version;
|
||||
hash = "sha256-cZk6Eu6Jp3tSPAb0HplR/I0pX2YIFhOaAsI3YRS0LVw=";
|
||||
hash = "sha256-KAVBK0ZR1R27cWH99DVOYNFWKa4ubBXzgM0hVpGRIpE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -39,6 +39,7 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'license = "ISC"' 'license = {text = "ISC"}' \
|
||||
--replace 'dynamic = ["version"]' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pikepdf";
|
||||
version = "6.2.2";
|
||||
version = "6.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-194CaN7Ei3/ja55BWsUst4EN/B7/JUmJxtCmnN9Z/bI=";
|
||||
hash = "sha256-YSzwcrWhqyKjdydwodf57S+HIGaKE124umJPtJKiM5g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,31 +2,36 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, poetry
|
||||
, rich
|
||||
, typer
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
pname = "pipenv-poetry-migrate";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhino";
|
||||
repo = "pipenv-poetry-migrate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2/e6uGwpUvzxXlz+51gUriE054bgNeJNyLDCIyiGflM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aP8bzWFUzAZrEsz8pYL2y5c7GaUjWG5GA+cc4/tGPZk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
poetry
|
||||
rich
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
poetry
|
||||
typer
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml --replace 'rich = "^9.6.1"' 'rich = ">9"'
|
||||
substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"'
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, zstd
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -52,5 +53,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://pymemcache.readthedocs.io/";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
broken = stdenv.is32bit;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/pyproj/datadir.py b/pyproj/datadir.py
|
||||
index 9ca1d25..4198490 100644
|
||||
index df625fee..a2beb06c 100644
|
||||
--- a/pyproj/datadir.py
|
||||
+++ b/pyproj/datadir.py
|
||||
@@ -70,7 +70,7 @@ def get_data_dir() -> str:
|
||||
@@ -8,23 +8,23 @@ index 9ca1d25..4198490 100644
|
||||
return _VALIDATED_PROJ_DATA
|
||||
- internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
|
||||
+ internal_datadir = Path("@proj@/share/proj")
|
||||
proj_lib_dirs = os.environ.get("PROJ_LIB", "")
|
||||
proj_lib_dirs = os.environ.get("PROJ_DATA", os.environ.get("PROJ_LIB", ""))
|
||||
prefix_datadir = Path(sys.prefix, "share", "proj")
|
||||
|
||||
conda_windows_prefix_datadir = Path(sys.prefix, "Library", "share", "proj")
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 6bb0c6c..b3d0321 100644
|
||||
index 71fb52cd..7984a68a 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -12,7 +12,7 @@ from setuptools import Extension, setup
|
||||
PROJ_MIN_VERSION = parse_version("7.2.0")
|
||||
@@ -13,7 +13,7 @@ from setuptools import Extension, setup
|
||||
PROJ_MIN_VERSION = parse_version("8.2.0")
|
||||
CURRENT_FILE_PATH = Path(__file__).absolute().parent
|
||||
BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
|
||||
-INTERNAL_PROJ_DIR = CURRENT_FILE_PATH / "pyproj" / BASE_INTERNAL_PROJ_DIR
|
||||
+INTERNAL_PROJ_DIR = Path("@proj@")
|
||||
PROJ_VERSION_SEARCH = re.compile(r".*Rel\.\s+(?P<version>\d+\.\d+\.\d+).*")
|
||||
|
||||
|
||||
def get_proj_version(proj_dir: Path) -> str:
|
||||
@@ -155,7 +155,7 @@ def get_extension_modules():
|
||||
@@ -163,7 +163,7 @@ def get_extension_modules():
|
||||
# By default we'll try to get options PROJ_DIR or the local version of proj
|
||||
proj_dir = get_proj_dir()
|
||||
library_dirs = get_proj_libdirs(proj_dir)
|
||||
@@ -34,7 +34,7 @@ index 6bb0c6c..b3d0321 100644
|
||||
proj_version = get_proj_version(proj_dir)
|
||||
check_proj_version(proj_version)
|
||||
diff --git a/test/test_cli.py b/test/test_cli.py
|
||||
index 7a696de..1b9b777 100644
|
||||
index 7a696de7..1b9b777b 100644
|
||||
--- a/test/test_cli.py
|
||||
+++ b/test/test_cli.py
|
||||
@@ -14,7 +14,7 @@ from pyproj.sync import _load_grid_geojson
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user