Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
1b9cef352a
|
|
@ -4,7 +4,10 @@ with lib;
|
|||
let
|
||||
cfg = config.virtualisation.cri-o;
|
||||
|
||||
crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; });
|
||||
crioPackage = pkgs.cri-o.override {
|
||||
extraPackages = cfg.extraPackages
|
||||
++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;
|
||||
};
|
||||
|
||||
format = pkgs.formats.toml { };
|
||||
|
||||
|
|
@ -19,7 +22,7 @@ in
|
|||
enable = mkEnableOption (lib.mdDoc "Container Runtime Interface for OCI (CRI-O)");
|
||||
|
||||
storageDriver = mkOption {
|
||||
type = types.enum [ "btrfs" "overlay" "vfs" ];
|
||||
type = types.enum [ "aufs" "btrfs" "devmapper" "overlay" "vfs" "zfs" ];
|
||||
default = "overlay";
|
||||
description = lib.mdDoc "Storage driver to be used";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
# gcc only supports objc on darwin
|
||||
buildGoModule.override { stdenv = clangStdenv; } rec {
|
||||
pname = "go-musicfox";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anhoder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZxyW/NUKSCcx/KGgFV2pt5ucTBP7BE7qFeTvBoRmUvQ=";
|
||||
hash = "sha256-6JOD0RsZY79jLYJqPrzc43jgR03XQEfa8B0mGvlIkF4=";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tageditor";
|
||||
version = "3.7.8";
|
||||
version = "3.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martchus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/34KS6nxpIsKEklSRpO+AmGAdpJhapoGe24DCCodU38=";
|
||||
hash = "sha256-QQvc9S+9h0Qy/qBROwJMZIALf/Rbj/9my4PZGxQzlnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,19 +8,18 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "vorta";
|
||||
version = "0.8.10";
|
||||
version = "0.8.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "borgbase";
|
||||
repo = "vorta";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-okxZ1kALB5l94ShStAJLfzD37MLhob8MCzhbqfVISkw=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nLdLTh1qSKvOR2cE9HWQrIWQ9L+ynX4qF+lTtKn/Ubs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
paramiko
|
||||
peewee
|
||||
pyqt5
|
||||
python-dateutil
|
||||
|
|
@ -29,6 +28,9 @@ python3Packages.buildPythonApplication rec {
|
|||
secretstorage
|
||||
appdirs
|
||||
setuptools
|
||||
platformdirs
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
qt5.qtwayland
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -27,21 +27,9 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DxW9uefY6Fks3qSUeLMp3BB85SfLgzwBr4KO9do2y2o=";
|
||||
hash = "sha256-suqoYV+YsbCB7sUNzds6OoEMH9KO3bt2udok6oXXyls=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://gitlab.com/valos/Komikku/-/merge_requests/208
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/valos/Komikku/-/commit/c9a09817acd767a7cb4ceea9b212fffd798eae61.patch";
|
||||
hash = "sha256-McjQApLY7OKbdelrTeh3aRw90B6T9V5FtLL5Y62BmGA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/valos/Komikku/-/commit/bda93631420f6a69a50be0068f259d60b9558930.patch";
|
||||
hash = "sha256-Xu+IaQKf0I99a2uh97j8xSlGYSJHuNPMy/zZtWRxLaM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
hash = "sha256-8jplCIylG1xbpp/VGnU06MwfqWe2E9iVQApZaWbhuVc=";
|
||||
hash = "sha256-nXNzUHZXh2NGcg/OXRKhag/BWLB/YOAkCPITiBiMIIE=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,14 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-7jzS3pRklPsCTgCr3nrywfHCNlBDHuyuGGvrVoI9+A0=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
|
||||
'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
perl
|
||||
|
|
@ -44,22 +52,28 @@ stdenv.mkDerivation rec {
|
|||
qtmultimedia
|
||||
qtserialport
|
||||
qttranslations
|
||||
qtwayland
|
||||
qtwebengine
|
||||
calcmysky
|
||||
qxlsx
|
||||
indilib
|
||||
libnova
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
qtwayland
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
|
||||
'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
|
||||
export LC_ALL=en_US.UTF-8
|
||||
'';
|
||||
|
||||
# fatal error: 'QtSerialPort/QSerialPortInfo' file not found
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-F${qtserialport}/lib";
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
makeWrapper $out/Applications/Stellarium.app/Contents/MacOS/Stellarium $out/bin/stellarium
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dataexplorer";
|
||||
version = "3.7.4";
|
||||
version = "3.7.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz";
|
||||
sha256 = "sha256-bghI7Hun7ZKUVEj7T58K0oaclnhUGd4z+eIqZF3eXHQ=";
|
||||
sha256 = "sha256-mwz4o1m2ldjyD4pbwMQxeaI8a8JXzis+s0I+6GW8WaY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant makeWrapper ];
|
||||
|
|
@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
|
|||
--set SWT_GTK3 0 \
|
||||
--set LIBOVERLAY_SCROLLBAR 0
|
||||
|
||||
install -Dvm644 build/misc/GNU_LINUX_JUNSI_ICHARER_DUO_UDEV_RULE/50-Junsi-iCharger-DUO.rules \
|
||||
$out/etc/udev/rules.d/50-Junsi-iCharger-DUO.rules
|
||||
install -Dvm644 build/misc/GNU_LINUX_JUNSI_ICHARER_USB_UDEV_RULE/50-Junsi-iCharger-USB.rules \
|
||||
$out/etc/udev/rules.d/50-Junsi-iCharger-USB.rules
|
||||
install -Dvm644 build/misc/GNU_LINUX_SKYRC_UDEV_RULE/50-SkyRC-Charger.rules \
|
||||
$out/etc/udev/rules.d/50-SkyRC-Charger.rules
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, lib
|
||||
, extraPackages ? []
|
||||
, runc # Default container runtime
|
||||
, conntrack-tools
|
||||
, crun # Container runtime (default with cgroups v2 for podman/buildah)
|
||||
, conmon # Container runtime monitor
|
||||
, util-linux # nsenter
|
||||
|
|
@ -13,6 +14,7 @@
|
|||
let
|
||||
binPath = lib.makeBinPath ([
|
||||
runc
|
||||
conntrack-tools
|
||||
crun
|
||||
conmon
|
||||
util-linux
|
||||
|
|
|
|||
|
|
@ -46,20 +46,30 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "chore: dont use </usr/include/linux/cdrom.h>";
|
||||
url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/2afc63541589adab8b0c8c48e290f03535ec2996.patch";
|
||||
sha256 = "sha256-Q9dv5L5sUGeuvNxF8ypQlZuZVuU4NIR/8d8EyP/Q5wk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "feat: rewrite libPath to read LD_LIBRARY_PATH";
|
||||
name = "feat-rewrite-libPath-to-read-LD_LIBRARY_PATH.patch";
|
||||
url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/432bf452ed244c256e99ecaf80bb6a0eef9b4a74.patch";
|
||||
sha256 = "sha256-5hRQ8D9twBKgouVpIBa1pdAGk0lI/wEdQaHBBHFCZBA";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/linuxdeepin/deepin-movie-reborn/pull/198
|
||||
substituteInPlace src/common/diskcheckthread.cpp \
|
||||
--replace "/usr/include/linux/cdrom.h" "linux/cdrom.h"
|
||||
substituteInPlace src/widgets/toolbox_proxy.cpp \
|
||||
--replace "/bin/bash" "${runtimeShell}"
|
||||
|
||||
# libdmr always assume that these libraries exist
|
||||
# otherwise it will lead to coredump
|
||||
# This affects the preview plugin for dde-file-manager
|
||||
|
||||
substituteInPlace src/libdmr/{filefilter.cpp,playlist_model.cpp,gstutils.cpp} \
|
||||
--replace 'LibraryLoader::libPath("libavcodec.so")' '"${lib.getLib ffmpeg}/lib/libavcodec.so"' \
|
||||
--replace 'LibraryLoader::libPath("libavformat.so")' '"${lib.getLib ffmpeg}/lib/libavformat.so"' \
|
||||
--replace 'LibraryLoader::libPath("libavutil.so")' '"${lib.getLib ffmpeg}/lib/libavutil.so"' \
|
||||
--replace 'LibraryLoader::libPath("libffmpegthumbnailer.so")' '"${lib.getLib ffmpegthumbnailer}/lib/libffmpegthumbnailer.so"' \
|
||||
--replace 'LibraryLoader::libPath("libgstreamer-1.0.so")' '"${lib.getLib gst_all_1.gstreamer}/lib/libgstreamer-1.0.so"' \
|
||||
--replace 'LibraryLoader::libPath("libgstpbutils-1.0.so")' '"${lib.getLib gst_all_1.gst-plugins-base}/lib/libgstpbutils-1.0.so"'
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
171
pkgs/desktops/deepin/core/dde-file-manager/default.nix
Normal file
171
pkgs/desktops/deepin/core/dde-file-manager/default.nix
Normal file
|
|
@ -0,0 +1,171 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, runtimeShell
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, docparser
|
||||
, dde-dock
|
||||
, deepin-movie-reborn
|
||||
, cmake
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, qtmultimedia
|
||||
, kcodecs
|
||||
, pkg-config
|
||||
, ffmpegthumbnailer
|
||||
, libsecret
|
||||
, libmediainfo
|
||||
, mediainfo
|
||||
, libzen
|
||||
, poppler
|
||||
, polkit-qt
|
||||
, polkit
|
||||
, wrapQtAppsHook
|
||||
, wrapGAppsHook
|
||||
, lucenepp
|
||||
, boost
|
||||
, taglib
|
||||
, cryptsetup
|
||||
, glib
|
||||
, qtbase
|
||||
, util-dfm
|
||||
, deepin-pdfium
|
||||
, libuuid
|
||||
, libselinux
|
||||
, glibmm
|
||||
, pcre
|
||||
, udisks2
|
||||
, libisoburn
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-file-manager";
|
||||
version = "6.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Kn8LuAQNWY2SwzKjMyylEAlQNxsP+3bl5hM83yHfjvo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
wrapGAppsHook
|
||||
];
|
||||
dontWrapGApps = true;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "chore-cmake-use_CMAKE_INSTALL_SYSCONFDIR.patch";
|
||||
url = "https://github.com/linuxdeepin/dde-file-manager/commit/b3b6b1e5ace0fdd86d0a94687a4e60e7bdfb1086.patch";
|
||||
sha256 = "sha256-GEMuMa1UMSGf0dlHZRQyR1hC08U0GlAlmUKLIxzzoc4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "feat-GRANDSEARCHDAEMON_LIB_DIR-use-CMAKE_INSTALL_FULL_LIBDIR.patch";
|
||||
url = "https://github.com/linuxdeepin/dde-file-manager/commit/58e3826fc4ad46145b57c2b6f8ca2c74efd8d4d3.patch";
|
||||
sha256 = "sha256-athDoFhQ9v9cXOf4YKmZld1RScX43+6/q1zBa/1yAgQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-include-path-should-follow-Qt5Widgets_PRIVATE_INCLUDE_DIRS.patch";
|
||||
url = "https://github.com/linuxdeepin/dde-file-manager/commit/19fdfffc6ddba2844176ee8384e4147bebee9be4.patch";
|
||||
sha256 = "sha256-VPyiKKxFgNsY70ZdYE5oNF8BFosq/92YrZuZ882Fj4E=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "chore-do-not-hardcode-APPSHAREDIR.patch";
|
||||
url = "https://github.com/linuxdeepin/dde-file-manager/commit/74f5cbda8114e24259b6fd998ade794e7880c725.patch";
|
||||
sha256 = "sha256-oZQcuPP9JTZ7aybPnmY/6RyqmJhvpxer4mhv+XpqeQY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-use-pkgconfig-to-check-mount.patch";
|
||||
url = "https://github.com/linuxdeepin/dde-file-manager/commit/4d5be539ba2c567bee1ec4aad90ecda0b87878d5.patch";
|
||||
sha256 = "sha256-k808IsaV/RJg7bYNmUnhcFZMnMRQ8sGRagMlx5i4h4Q=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
||||
substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \
|
||||
--replace "/usr/bin/deepin-compressor" "deepin-compressor"
|
||||
|
||||
substituteInPlace src/plugins/filemanager/dfmplugin-avfsbrowser/utils/avfsutils.cpp \
|
||||
--replace "/usr/bin/mountavfs" "mountavfs" \
|
||||
--replace "/usr/bin/umountavfs" "umountavfs"
|
||||
|
||||
substituteInPlace src/plugins/common/core/dfmplugin-menu/{extendmenuscene/extendmenu/dcustomactionparser.cpp,oemmenuscene/oemmenu.cpp} \
|
||||
--replace "/usr" "$out"
|
||||
|
||||
substituteInPlace src/tools/upgrade/dialog/processdialog.cpp \
|
||||
--replace "/usr/bin/dde-file-manager" "dde-file-manager" \
|
||||
--replace "/usr/bin/dde-desktop" "dde-desktop"
|
||||
|
||||
substituteInPlace src/dfm-base/file/local/localfilehandler.cpp \
|
||||
--replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
|
||||
|
||||
substituteInPlace src/plugins/desktop/ddplugin-background/backgroundservice.cpp \
|
||||
src/plugins/desktop/ddplugin-wallpapersetting/wallpapersettings.cpp \
|
||||
--replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds"
|
||||
|
||||
find . -type f -regex ".*\\.\\(service\\|policy\\|desktop\\)" -exec sed -i -e "s|/usr/|$out/|g" {} \;
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
qt5integration
|
||||
deepin-pdfium
|
||||
util-dfm
|
||||
dde-qt-dbus-factory
|
||||
glibmm
|
||||
docparser
|
||||
dde-dock
|
||||
deepin-movie-reborn
|
||||
qtx11extras
|
||||
qtmultimedia
|
||||
kcodecs
|
||||
ffmpegthumbnailer
|
||||
libsecret
|
||||
libmediainfo
|
||||
mediainfo
|
||||
poppler
|
||||
polkit-qt
|
||||
polkit
|
||||
lucenepp
|
||||
boost
|
||||
taglib
|
||||
cryptsetup
|
||||
libuuid
|
||||
libselinux
|
||||
pcre
|
||||
udisks2
|
||||
libisoburn
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVERSION=${version}"
|
||||
"-DDEEPIN_OS_VERSION=20"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "File manager for deepin desktop environment";
|
||||
homepage = "https://github.com/linuxdeepin/dde-file-manager";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -28,6 +28,7 @@ let
|
|||
dde-calendar = callPackage ./core/dde-calendar { };
|
||||
dde-clipboard = callPackage ./core/dde-clipboard { };
|
||||
dde-dock = callPackage ./core/dde-dock { };
|
||||
dde-file-manager = callPackage ./core/dde-file-manager { };
|
||||
dde-launcher = callPackage ./core/dde-launcher { };
|
||||
dde-network-core = callPackage ./core/dde-network-core { };
|
||||
dde-session-shell = callPackage ./core/dde-session-shell { };
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ let
|
|||
update = "18";
|
||||
build = "10";
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk = stdenv.mkDerivation rec {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${major}.${minor}.${update}+${build}";
|
||||
|
|
@ -29,7 +32,7 @@ let
|
|||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -58,7 +61,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk11-bootstrap.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-version-pre="
|
||||
"--enable-unlimited-crypto"
|
||||
"--with-native-debug-symbols=internal"
|
||||
|
|
@ -155,7 +158,7 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk11-bootstrap ];
|
||||
disallowedReferences = [ openjdk-bootstrap ];
|
||||
|
||||
meta = import ./meta.nix lib version;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
|
||||
, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
|
||||
, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch
|
||||
, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap, fetchpatch
|
||||
, setJavaClassPath
|
||||
, headless ? false
|
||||
, enableJavaFX ? false, openjfx
|
||||
|
|
@ -13,6 +13,9 @@ let
|
|||
update = ".0.2";
|
||||
build = "ga";
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk = stdenv.mkDerivation rec {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${major}${update}-${build}";
|
||||
|
|
@ -26,7 +29,7 @@ let
|
|||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk11
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -59,7 +62,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk11.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-version-pre="
|
||||
"--enable-unlimited-crypto"
|
||||
"--with-native-debug-symbols=internal"
|
||||
|
|
@ -151,7 +154,7 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk11 ];
|
||||
disallowedReferences = [ openjdk-bootstrap ];
|
||||
|
||||
meta = import ./meta.nix lib version;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@ let
|
|||
update = ".0.2";
|
||||
build = "-ga";
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk13-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk = stdenv.mkDerivation rec {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${major}${update}${build}";
|
||||
|
|
@ -26,7 +29,7 @@ let
|
|||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -59,7 +62,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk13-bootstrap.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-version-pre="
|
||||
"--enable-unlimited-crypto"
|
||||
"--with-native-debug-symbols=internal"
|
||||
|
|
@ -151,7 +154,7 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk13-bootstrap ];
|
||||
disallowedReferences = [ openjdk-bootstrap ];
|
||||
|
||||
meta = import ./meta.nix lib version;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@ let
|
|||
update = ".0.2";
|
||||
build = "-ga";
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk14-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk = stdenv.mkDerivation rec {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${major}${update}${build}";
|
||||
|
|
@ -26,7 +29,7 @@ let
|
|||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -54,7 +57,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk14-bootstrap.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-version-pre="
|
||||
"--enable-unlimited-crypto"
|
||||
"--with-native-debug-symbols=internal"
|
||||
|
|
@ -147,7 +150,7 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk14-bootstrap ];
|
||||
disallowedReferences = [ openjdk-bootstrap ];
|
||||
|
||||
meta = import ./meta.nix lib version;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,9 @@ let
|
|||
__toString = self: "${self.major}${self.update}${self.build}";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk15-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
inherit version;
|
||||
|
|
@ -29,7 +32,7 @@ let
|
|||
buildInputs = [
|
||||
cpio perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -57,7 +60,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk15-bootstrap.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-version-pre="
|
||||
"--enable-unlimited-crypto"
|
||||
"--with-native-debug-symbols=internal"
|
||||
|
|
@ -150,7 +153,7 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk15-bootstrap ];
|
||||
disallowedReferences = [ openjdk-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "major" version;
|
||||
meta = import ./meta.nix lib version.major;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ let
|
|||
build = "36";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk16-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${version.feature}+${version.build}";
|
||||
|
|
@ -30,7 +33,7 @@ let
|
|||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -59,7 +62,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk16-bootstrap.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-version-build=${version.build}"
|
||||
"--with-version-opt=nixos"
|
||||
"--with-version-pre="
|
||||
|
|
@ -154,7 +157,7 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk16-bootstrap ];
|
||||
disallowedReferences = [ openjdk-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "feature" version;
|
||||
meta = import ./meta.nix lib version.feature;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ let
|
|||
build = "10";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk17-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${version.feature}${version.interim}+${version.build}";
|
||||
|
|
@ -30,7 +33,7 @@ let
|
|||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk17-bootstrap
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -76,7 +79,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk17-bootstrap.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-version-build=${version.build}"
|
||||
"--with-version-opt=nixos"
|
||||
"--with-version-pre="
|
||||
|
|
@ -173,7 +176,7 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk17-bootstrap ];
|
||||
disallowedReferences = [ openjdk-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "feature" version;
|
||||
meta = import ./meta.nix lib version.feature;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ let
|
|||
build = "36";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk18-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${version.feature}+${version.build}";
|
||||
|
|
@ -29,7 +32,7 @@ let
|
|||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk18-bootstrap
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -66,7 +69,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk18-bootstrap.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-version-build=${version.build}"
|
||||
"--with-version-opt=nixos"
|
||||
"--with-version-pre="
|
||||
|
|
@ -163,7 +166,7 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk18-bootstrap ];
|
||||
disallowedReferences = [ openjdk-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "feature" version;
|
||||
meta = import ./meta.nix lib version.feature;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ let
|
|||
build = "7";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk19-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${version.feature}${version.interim}+${version.build}";
|
||||
|
|
@ -33,7 +36,7 @@ let
|
|||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk19-bootstrap
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -78,7 +81,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk19-bootstrap.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-version-build=${version.build}"
|
||||
"--with-version-opt=nixos"
|
||||
"--with-version-pre="
|
||||
|
|
@ -173,7 +176,7 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk19-bootstrap ];
|
||||
disallowedReferences = [ openjdk-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "feature" version;
|
||||
meta = import ./meta.nix lib version.feature;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@ let
|
|||
update = "362";
|
||||
build = "ga";
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk8-bootstrap.override { gtkSupport = !headless; };
|
||||
|
||||
openjdk8 = stdenv.mkDerivation rec {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "8u${update}-${build}";
|
||||
|
|
@ -37,9 +40,9 @@ let
|
|||
|
||||
nativeBuildInputs = [ pkg-config lndir unzip ];
|
||||
buildInputs = [
|
||||
cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsa-lib
|
||||
cpio file which zip perl zlib cups freetype alsa-lib
|
||||
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk2 gnome_vfs GConf glib
|
||||
];
|
||||
|
|
@ -64,7 +67,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk8-bootstrap.home}"
|
||||
"--with-boot-jdk=${openjdk-bootstrap.home}"
|
||||
"--with-update-version=${update}"
|
||||
"--with-build-number=${build}"
|
||||
"--with-milestone=fcs"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ let
|
|||
providedCpuTypes = builtins.filter
|
||||
(arch: builtins.elem arch validCpuTypes)
|
||||
(builtins.attrNames sourcePerArch);
|
||||
result = stdenv.mkDerivation rec {
|
||||
result = stdenv.mkDerivation {
|
||||
pname = if sourcePerArch.packageType == "jdk"
|
||||
then "${name-prefix}-bin"
|
||||
else "${name-prefix}-${sourcePerArch.packageType}-bin";
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
, qtbase ? null
|
||||
, pythonSupport ? false
|
||||
, swig2 ? null
|
||||
, python ? null
|
||||
# only for passthru.tests
|
||||
, libsForQt5
|
||||
, python3
|
||||
|
|
@ -51,12 +50,16 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
texinfo
|
||||
] ++ lib.optionals pythonSupport [
|
||||
python3.pythonForBuild
|
||||
ncurses
|
||||
python
|
||||
swig2
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals pythonSupport [
|
||||
python3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
libassuan
|
||||
|
|
|
|||
|
|
@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/indilib/indi/releases/tag/v${version}";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
# error: use of undeclared identifier 'MSG_NOSIGNAL'
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "3.1.6";
|
||||
version = "3.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9WVLvyehbXSLD7HNIwMkkq1XzF0jB8PkltsWSNfXaDk=";
|
||||
sha256 = "sha256-a6I1qcuBSkwQxuU4T7tKrqouhLMJsY/rfCKqhGGvkjQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -12,25 +12,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "accuweather";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bieniu";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-v4mFvW+p0g+5IeZT8o0Z60MafHyYZ62d4lNH27wlAeI=";
|
||||
hash = "sha256-kWhb9tDp7/p5iCXTpf4/fjSo1ceuA9I2eqSprt50rWU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytest-runner" ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov --cov-report term-missing" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
orjson
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mypy-extensions
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -30,6 +31,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mypy-extensions
|
||||
ruamel-yaml
|
||||
schema-salad
|
||||
];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cwl-utils";
|
||||
version = "0.23";
|
||||
version = "0.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "common-workflow-language";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tr4QQ/p0jx/e5kHx4WSYfo06/qMNFyxIGsaAA8nBBoA=";
|
||||
hash = "sha256-g8HnY5/UDmujijXStNRwKBGMZ3soUHKPIlpJdIQaAlE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dicom2nifti";
|
||||
version = "2.4.3";
|
||||
version = "2.4.8";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
# no tests in PyPI dist
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "icometrix";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-za2+HdnUhPu3+p29JsF4iL1lyPQVmEv3fam0Yf1oeMQ=";
|
||||
hash = "sha256-2Pspxdeu3pHwXpbjS6bQQnvdeMuITRwYarPuLlmNcv8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy setuptools ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "frigidaire";
|
||||
version = "0.18.5";
|
||||
version = "0.18.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,13 +20,11 @@ buildPythonPackage rec {
|
|||
owner = "bm1549";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mmHcS0cjj43hCHLiCO8cGPfQoh+nqlNK3MdFP8IhD4w=";
|
||||
hash = "sha256-U6ko6P5/ANGy84GQDuSQq+YArou0TrXH5SIc5x4euvU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/bm1549/frigidaire/issues/14
|
||||
substituteInPlace setup.py \
|
||||
--replace "urllib3>=1.26.42" "urllib3" \
|
||||
--replace 'version = "SNAPSHOT"' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ocrmypdf";
|
||||
version = "14.0.4";
|
||||
version = "14.1.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
|||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-SLWpMkXq5DlmVgDfRAHtYfEUAVpVKgtnJKO2ffyH5cU=";
|
||||
hash = "sha256-Jyx9FPXNjcA04s+l2wY/LVX83RqExt78/EAHsL1VNMU=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pikepdf";
|
||||
version = "7.1.2";
|
||||
version = "7.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-Lm05lqqZM1zucdIDgSnYsCcfo7wCDLcY02vv7CyHTGo=";
|
||||
hash = "sha256-acGIhIWC1nUQiN0iwb1kLKxz+ytIqYIW4VXF45Tx50g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
#, withLocation ? true
|
||||
# Not currently part of PyQt6
|
||||
#, withConnectivity ? true
|
||||
, withPrintSupport ? true
|
||||
, cups
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -102,6 +104,10 @@ buildPythonPackage rec {
|
|||
dbus-python
|
||||
pyqt6-sip
|
||||
setuptools
|
||||
]
|
||||
# ld: library not found for -lcups
|
||||
++ lib.optionals (withPrintSupport && stdenv.isDarwin) [
|
||||
cups
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cppcheck";
|
||||
version = "2.10.2";
|
||||
version = "2.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danmar";
|
||||
repo = "cppcheck";
|
||||
rev = version;
|
||||
hash = "sha256-wr2O9EqDvHaMQwnjFLLtP1XxfUwFa/P6gGqYNNPVyaA=";
|
||||
hash = "sha256-M63uHhyEDmuWrEu7Y3Zks1Eq5WgenSlqWln2DMBj3fU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PG+4PibJE7mka+1ann88AgqNTI+BeE0IxHpVJRG4Iuk=";
|
||||
hash = "sha256-HrkSwaLBhjotQYkkpFpRF8NXgPAeugvINBSCKS2l2I4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin-language-server";
|
||||
version = "1.3.1";
|
||||
version = "1.3.3";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip";
|
||||
hash = "sha256-FxpNA4OGSgFdILl0yKBDTtVdQl6Bw9tm2eURbsJdZzI=";
|
||||
hash = "sha256-m0AgPJ8KgzOxHPB33pgSFe7JQxidPkhDUga56LuaDBA=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-run";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-GLJrM5vIGYH5lNvwmpYKE/ISTRUwikCCj2o5h6Y9kW4=";
|
||||
hash = "sha256-e5HXqqnRnz+6RHOZnZ4VTJhiYKeBSHEjdKBAPKLXf5Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YevCel3HqwslwVmEA1vncsYYPMGQPUnwlkxLNQsnKG0=";
|
||||
cargoHash = "sha256-8Hpjrjd+dCu9eaFxJ3SRHNBuRaNmvt42vkN2ls3hskA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-script";
|
||||
version = "0.25.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fornwall";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-oY971/+3PizyOtKSXeyHUlC+Rf+qS+Zf5Ls+OL6rIgE=";
|
||||
sha256 = "sha256-2ZEFtpaKBhF8puYB5gqttrdxKI2zrm6wjukRM+mBeF0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-NtYmJS9SBNZkF5hv5IcPzk6DxYLAu1/nBexahdjUYgY=";
|
||||
cargoSha256 = "sha256-HRT0PSI0x2I/zuKKDcn08cyBC8gxkC5XXRFle/Ayrkg=";
|
||||
|
||||
# tests require network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typeshare";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "1password";
|
||||
repo = "typeshare";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TGs7Czq13ghifKUhoz+n9I4UlOrzQosWTwBqBWv572E=";
|
||||
hash = "sha256-Zmb6GZVtjx/PXOT1vaxKjPObY902pRqttOYExDx5UvI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hF+1v9bHioKQixg0C46ligLy/ibU+iI/H85g4wQhne4=";
|
||||
cargoHash = "sha256-83LAZ7b1j/iBnYmY0oSSWDH0w7WPU1O85X+IBwSe1bs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -16,20 +16,20 @@
|
|||
|
||||
buildGo120Module rec {
|
||||
pname = "evcc";
|
||||
version = "0.115.0";
|
||||
version = "0.116.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-vA2HpkzNuHulUUZKL6Wm2Y052v4JdC5V8hADq78rK5c=";
|
||||
hash = "sha256-YM6E1g6lrgDTMrfSRacbPM0yXPAgBzGvLHdyaqncuWc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/TqA2WTNJ3cSrqLgEly1KHGvMA/MQ+p364G0ne0ezfQ=";
|
||||
vendorHash = "sha256-O13m6yQvPha1AToK3Y2naeA70BUx+WBv6D8YniMSk7s=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-LGlM+itulqtlwyVKfVGiZtTpcCmx+lVvE3JOFkYRHXk=";
|
||||
hash = "sha256-OqY1pAkr/0uRzD2/wLwNYCV6XQLRsG+Jc5ST+04NFuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -53,6 +53,7 @@ buildGo120Module rec {
|
|||
|
||||
tags = [
|
||||
"release"
|
||||
"test"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -72,9 +73,6 @@ buildGo120Module rec {
|
|||
# requires network access
|
||||
rm meter/template_test.go
|
||||
rm charger/template_test.go
|
||||
rm vehicle/template_test.go
|
||||
# times out (since 0.115.0, bisected to 31ab90e6381b30278731bd01effa62bdfb884ebc)
|
||||
rm util/templates/render_testing.go
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oven-media-engine";
|
||||
version = "0.15.7";
|
||||
version = "0.15.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AirenSoft";
|
||||
repo = "OvenMediaEngine";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Zn2zUR3YvZw6xdebPidD7lKWvvvS2XVo/Vy0yn+bTRY=";
|
||||
sha256 = "sha256-8aR/v0xrHRLkoq0+VYLSMzDeRva5+6XFkrXZgu1tG8o=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.160";
|
||||
version = "3.0.161";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aliyun";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-gMAYtvmP8dKiLITPx5sWkj3vRJNT468kEA2obCIDER4=";
|
||||
sha256 = "sha256-UYRCVkeNLaTqjcf3cxIXoT+t1ZhDKUsxsbfJzRMaYVI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-H1qeJ37FaQY/EQtg3467gG8tA1PLyXaF8Sb5qKLf4wU=";
|
||||
vendorHash = "sha256-EyaJxlif+jo8N7oi6VCJx/kO+ZR4Mb3od8jJFWbwEoo=";
|
||||
|
||||
subPackages = [ "main" ];
|
||||
|
||||
|
|
|
|||
830
pkgs/tools/misc/asciinema-agg/Cargo.lock
generated
830
pkgs/tools/misc/asciinema-agg/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "agg";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciinema";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QZtsL4siO/ydumHiJX9ely+04OKyEZ8ak/KFwDhU7q8=";
|
||||
sha256 = "sha256-ozkC3jaM7Q0BKS7KrgN+sI6YU0996ioTgbrJ4uJ6/9E=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"avt-0.5.1" = "sha256-AhOhmWxrMCyEKSLU/CDOoyCS12wQqBIaEjZd6oUsKHU=";
|
||||
"avt-0.6.0" = "sha256-JA1Ln90Pew6m5YOZp8weOC9JdKJqjFG0PDPNL2kDWUc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "krapslog";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acj";
|
||||
repo = "krapslog-rs";
|
||||
rev = version;
|
||||
sha256 = "sha256-GSjS/6wetm3kHXdGyeenzALZ3tVi7BMM/GLS1ZhMQas=";
|
||||
sha256 = "sha256-zBtoKU9OHo1hyCgyQVAb3fsEW/IHwISht8VAss7LLq4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dgbi0mUI8WqqXF1VNOTbHuCKcvb4B18/1vBlJZ8Jivs=";
|
||||
cargoHash = "sha256-gZr79VmvZrGglF6aC6j2c45ueJytgUslzBT5fyM3/V8=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dnstwist";
|
||||
version = "20230402";
|
||||
version = "20230413";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elceef";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WZj33QpiRo4C1p18Y/S6YQtCu7154w78HQZQsxV7QJ4=";
|
||||
hash = "sha256-YYERI+GNRP2wGWhYAy6m8QI4alFZniCSWp9/fdb9mpM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-04-11";
|
||||
version = "2023-04-13";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LGC8AK6e0zhl7jOTSirwv7ZSfVveqNRhM/+afcMmnHU=";
|
||||
hash = "sha256-TjBU2yQNKS2AknCAAaBgyvRqKQ2N1tjBK1uyzchZoP4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ in {
|
|||
package = if stdenv.isLinux
|
||||
then package-linux
|
||||
else package-darwin;
|
||||
in rec {
|
||||
in {
|
||||
inherit package-linux package-darwin;
|
||||
|
||||
jdk-hotspot = callPackage package.jdk-hotspot {};
|
||||
|
|
@ -66,11 +66,7 @@ in {
|
|||
headless = openjdk.override { headless = true; };
|
||||
};
|
||||
|
||||
openjdkDarwinMissing = version:
|
||||
abort "OpenJDK ${builtins.toString version} is currently not supported on Darwin by nixpkgs.";
|
||||
|
||||
in rec {
|
||||
|
||||
adoptopenjdk-8 = mkAdoptopenjdk
|
||||
../development/compilers/adoptopenjdk-bin/jdk8-linux.nix
|
||||
../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix;
|
||||
|
|
@ -110,6 +106,7 @@ in {
|
|||
openjdk13-bootstrap = mkBootstrap adoptopenjdk-13
|
||||
../development/compilers/openjdk/12.nix
|
||||
(bootstrapArgs // {
|
||||
inherit openjdk11-bootstrap;
|
||||
/* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
|
||||
stdenv = gcc8Stdenv;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4131,7 +4131,7 @@ self: super: with self; {
|
|||
|
||||
gpgme = toPythonModule (pkgs.gpgme.override {
|
||||
pythonSupport = true;
|
||||
inherit python;
|
||||
python3 = python;
|
||||
});
|
||||
|
||||
gphoto2 = callPackage ../development/python-modules/gphoto2 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue