Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
90dcbd04ef
79 changed files with 631 additions and 440 deletions
|
|
@ -138,7 +138,8 @@ in
|
|||
StateDirectory = mkIf defaultStateDir "changedetection-io";
|
||||
StateDirectoryMode = mkIf defaultStateDir "0750";
|
||||
WorkingDirectory = cfg.datastorePath;
|
||||
Environment = lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}"
|
||||
Environment = [ "HIDE_REFERER=true" ]
|
||||
++ lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}"
|
||||
++ lib.optional cfg.behindProxy "USE_X_SETTINGS=1"
|
||||
++ lib.optional cfg.webDriverSupport "WEBDRIVER_URL=http://127.0.0.1:${toString cfg.chromePort}/wd/hub"
|
||||
++ lib.optional cfg.playwrightSupport "PLAYWRIGHT_DRIVER_URL=ws://127.0.0.1:${toString cfg.chromePort}/?stealth=1&--disable-web-security=true";
|
||||
|
|
|
|||
|
|
@ -7,6 +7,9 @@ with lib;
|
|||
###### interface
|
||||
|
||||
options = {
|
||||
boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systemds like containers which do not require a kernel.") // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
boot.blacklistedKernelModules = mkOption {
|
||||
type = types.listOf types.str;
|
||||
|
|
@ -38,7 +41,7 @@ with lib;
|
|||
|
||||
###### implementation
|
||||
|
||||
config = mkIf (!config.boot.isContainer) {
|
||||
config = mkIf config.boot.modprobeConfig.enable {
|
||||
|
||||
environment.etc."modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,9 @@ with lib;
|
|||
|
||||
# Disable some features that are not useful in a container.
|
||||
|
||||
# containers don't have a kernel
|
||||
boot.kernel.enable = false;
|
||||
boot.modprobeConfig.enable = false;
|
||||
|
||||
console.enable = mkDefault false;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ let
|
|||
messagebus:x:1:
|
||||
EOF
|
||||
|
||||
"${pkgs.dbus.daemon}/bin/dbus-daemon" --fork \
|
||||
--config-file="${pkgs.dbus.daemon}/share/dbus-1/system.conf"
|
||||
"${pkgs.dbus}/bin/dbus-daemon" --fork \
|
||||
--config-file="${pkgs.dbus}/share/dbus-1/system.conf"
|
||||
|
||||
${guestAdditions}/bin/VBoxService
|
||||
${(attrs.vmScript or (const "")) pkgs}
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
checkInputs = [
|
||||
dbus.daemon
|
||||
dbus
|
||||
gdk-pixbuf
|
||||
glibcLocales
|
||||
hicolor-icon-theme
|
||||
|
|
@ -154,7 +154,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
runHook preCheck
|
||||
|
||||
xvfb-run -s '-screen 0 1920x1080x24' \
|
||||
dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \
|
||||
pytest $pytestFlags
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
|
|||
checkPhase = ''
|
||||
export NO_AT_BRIDGE=1
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }:
|
||||
{ lib, stdenv, fetchpatch, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sameboy";
|
||||
|
|
@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ rgbds glib wrapGAppsHook ];
|
||||
buildInputs = [ SDL2 ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/LIJI32/SameBoy/commit/c0966ceebaf1cf2518427ffa3c0189d8f96ab5aa.patch";
|
||||
hash = "sha256-2o/aWimtAKqay7SGq5Q9vLDcQKqV6Bn2xJtnjACrLUw=";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"CONF=release"
|
||||
"FREEDESKTOP=true"
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xournalpp";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xournalpp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E/7S4JGLXR8u9fE8bTVPFb6XVKOC/BHnQwLhr7N2A48=";
|
||||
sha256 = "sha256-Hn7IDnbrmK3V+iz8UqdmHRV2TS4MwYSgYtnH6igbGJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
checkPhase = ''
|
||||
export NO_AT_BRIDGE=1
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,12 @@
|
|||
, sassc
|
||||
, python3Packages
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, libappindicator-gtk3
|
||||
, libxcb
|
||||
, qt5
|
||||
, ibus
|
||||
, usbutils
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
|
|
@ -28,11 +32,9 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
postPatch = ''
|
||||
patchShebangs scripts
|
||||
|
||||
substituteInPlace scripts/build-styles.sh \
|
||||
--replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \
|
||||
--replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass'
|
||||
|
||||
substituteInPlace pylib/common.py \
|
||||
--replace "/usr/share/polychromatic" "$out/share/polychromatic"
|
||||
'';
|
||||
|
|
@ -40,7 +42,6 @@ python3Packages.buildPythonApplication rec {
|
|||
preConfigure = ''
|
||||
scripts/build-styles.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
gettext
|
||||
gobject-introspection
|
||||
|
|
@ -48,18 +49,22 @@ python3Packages.buildPythonApplication rec {
|
|||
ninja
|
||||
sassc
|
||||
wrapGAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
colorama
|
||||
colour
|
||||
gtk3
|
||||
openrazer
|
||||
pygobject3
|
||||
pyqt5
|
||||
pyqtwebengine
|
||||
requests
|
||||
setproctitle
|
||||
libxcb
|
||||
openrazer-daemon
|
||||
libappindicator-gtk3
|
||||
ibus
|
||||
usbutils
|
||||
];
|
||||
|
||||
dontWrapGapps = true;
|
||||
|
|
@ -67,6 +72,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
makeWrapperArgs = [
|
||||
"\${gappsWrapperArgs[@]}"
|
||||
"\${qtWrapperArgs[@]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "eujv99L5svMhDIKHFOfm7sOwNZ4xiUaIsimfOf4BBik=";
|
||||
sha256 = "sha256-J0D49VESNgdBEWAf01LkiiU2I01r4PBLyWKpnE9t45Q=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
|
|||
NO_AT_BRIDGE=1 \
|
||||
XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, copyDesktopItems
|
||||
, electron_18
|
||||
, buildGoModule
|
||||
|
|
@ -8,9 +9,9 @@
|
|||
, libdeltachat
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, nodePackages
|
||||
, noto-fonts-emoji
|
||||
, pkg-config
|
||||
, python3
|
||||
, roboto
|
||||
, rustPlatform
|
||||
, sqlcipher
|
||||
|
|
@ -20,52 +21,48 @@
|
|||
|
||||
let
|
||||
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
|
||||
version = "1.86.0";
|
||||
version = "1.102.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0=";
|
||||
hash = "sha256-xw/lUNs39nkBrydpcgUBL3j6XrZFafKslxx6zUiElWw=";
|
||||
};
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${old.pname}-${version}";
|
||||
hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
|
||||
hash = "sha256-CiqYKFABHcFSjYUH/qop1xWCoygQJajI7nhv04ElD10=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "turn-off-hard-errors-for-lints.patch";
|
||||
url = "https://github.com/deltachat/deltachat-core-rust/commit/7598c50dbaa2abcbd417d96a02743269f666597b.patch";
|
||||
hash = "sha256-Xss44v6Wf6mL3FK9hH+oFYZ0fBA9rSh4wDrr7nSUibQ=";
|
||||
})
|
||||
];
|
||||
});
|
||||
esbuild' = esbuild.override {
|
||||
buildGoModule = args: buildGoModule (args // rec {
|
||||
version = "0.12.29";
|
||||
version = "0.14.54";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg=";
|
||||
hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w=";
|
||||
};
|
||||
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
|
||||
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
});
|
||||
};
|
||||
in nodePackages.deltachat-desktop.override rec {
|
||||
in buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.30.1";
|
||||
version = "1.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gZjZbXiqhFVfThZOsvL/nKkf6MX+E3KB5ldEAIuzBYA=";
|
||||
hash = "sha256-M2ZLWaxVq9PvxJemwv+7jd0cXKQb6T5VCyLvIRF+9d0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-wCsPKEgRpPsNmM0HzvS5QjlPnw8COPrOhQRIf+vYeig=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
pkg-config
|
||||
python3
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
copyDesktopItems
|
||||
];
|
||||
|
|
@ -81,20 +78,25 @@ in nodePackages.deltachat-desktop.override rec {
|
|||
USE_SYSTEM_LIBDELTACHAT = "true";
|
||||
VERSION_INFO_GIT_REF = src.rev;
|
||||
|
||||
postRebuild = ''
|
||||
preBuild = ''
|
||||
rm -r node_modules/deltachat-node/node/prebuilds
|
||||
|
||||
npm run build4production
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
npmBuildScript = "build4production";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
npm prune --production
|
||||
|
||||
install -D $out/lib/node_modules/deltachat-desktop/build/icon.png \
|
||||
$out/share/icons/hicolor/scalable/apps/deltachat.png
|
||||
mkdir -p $out/lib/node_modules/deltachat-desktop
|
||||
cp -r . $out/lib/node_modules/deltachat-desktop
|
||||
|
||||
awk '!/^#/ && NF' build/packageignore_list \
|
||||
| xargs -I {} sh -c "rm -rf {}" || true
|
||||
| xargs -I {} sh -c "rm -rf $out/lib/node_modules/deltachat-desktop/{}" || true
|
||||
|
||||
install -D build/icon.png \
|
||||
$out/share/icons/hicolor/scalable/apps/deltachat.png
|
||||
|
||||
ln -sf ${noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf \
|
||||
$out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji
|
||||
|
|
@ -106,6 +108,8 @@ in nodePackages.deltachat-desktop.override rec {
|
|||
makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
|
||||
--add-flags $out/lib/node_modules/deltachat-desktop
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = lib.singleton (makeDesktopItem {
|
||||
|
|
@ -117,7 +121,12 @@ in nodePackages.deltachat-desktop.override rec {
|
|||
comment = meta.description;
|
||||
categories = [ "Network" "InstantMessaging" "Chat" ];
|
||||
startupWMClass = "DeltaChat";
|
||||
mimeTypes = [ "x-scheme-handler/openpgp4fpr" "x-scheme-handler/mailto" ];
|
||||
mimeTypes = [
|
||||
"x-scheme-handler/openpgp4fpr"
|
||||
"x-scheme-handler/dcaccount"
|
||||
"x-scheme-handler/dclogin"
|
||||
"x-scheme-handler/mailto"
|
||||
];
|
||||
});
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
{
|
||||
"name": "deltachat-desktop",
|
||||
"version": "1.30.1",
|
||||
"dependencies": {
|
||||
"@blueprintjs/core": "^4.1.2",
|
||||
"@deltachat/message_parser_wasm": "^0.4.0",
|
||||
"@deltachat/react-qr-reader": "^4.0.0",
|
||||
"@mapbox/geojson-extent": "^1.0.0",
|
||||
"application-config": "^1.0.1",
|
||||
"classnames": "^2.3.1",
|
||||
"debounce": "^1.2.0",
|
||||
"deltachat-node": "1.86.0",
|
||||
"emoji-js-clean": "^4.0.0",
|
||||
"emoji-mart": "^3.0.1",
|
||||
"emoji-regex": "^9.2.2",
|
||||
"error-stack-parser": "^2.0.7",
|
||||
"filesize": "^8.0.6",
|
||||
"immutable": "^4.0.0",
|
||||
"mapbox-gl": "^1.12.0",
|
||||
"mime-types": "^2.1.31",
|
||||
"moment": "^2.29.2",
|
||||
"path-browserify": "^1.0.1",
|
||||
"rc": "^1.2.8",
|
||||
"react": "^17.0.2",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-string-replace": "^1.0.0",
|
||||
"react-virtualized-auto-sizer": "^1.0.5",
|
||||
"react-window": "^1.8.6",
|
||||
"react-window-infinite-loader": "^1.0.7",
|
||||
"react-zoom-pan-pinch": "^2.1.3",
|
||||
"source-map-support": "^0.5.19",
|
||||
"stackframe": "^1.2.1",
|
||||
"url-parse": "^1.5.9",
|
||||
"use-debounce": "^3.3.0",
|
||||
"@babel/core": "^7.7.7",
|
||||
"@babel/preset-env": "^7.7.7",
|
||||
"@babel/preset-react": "^7.7.4",
|
||||
"@types/debounce": "^1.2.0",
|
||||
"@types/emoji-mart": "^3.0.9",
|
||||
"@types/mapbox-gl": "^0.54.5",
|
||||
"@types/mime-types": "^2.1.0",
|
||||
"@types/node": "^14.14.20",
|
||||
"@types/rc": "^1.1.0",
|
||||
"@types/react": "^17.0.2",
|
||||
"@types/react-dom": "^17.0.2",
|
||||
"@types/react-window": "^1.8.4",
|
||||
"@types/react-window-infinite-loader": "^1.0.4",
|
||||
"@types/url-parse": "^1.4.3",
|
||||
"electron": "^18.0.3",
|
||||
"esbuild": "^0.12.29",
|
||||
"glob-watcher": "^5.0.5",
|
||||
"sass": "^1.26.5",
|
||||
"typescript": "^4.4.4",
|
||||
"xml-js": "^1.6.8"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch
|
||||
#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch prefetch-npm-deps
|
||||
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
|
|
@ -28,18 +28,5 @@ tac default.nix \
|
|||
| sponge default.nix
|
||||
|
||||
src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link)
|
||||
|
||||
jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@types/node-fetch","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","node-fetch","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \
|
||||
"$src/package.json" > package.json.new
|
||||
|
||||
if cmp --quiet package.json{.new,}; then
|
||||
echo "package.json not changed, skip updating nodePackages"
|
||||
rm package.json.new
|
||||
else
|
||||
echo "package.json changed, updating nodePackages"
|
||||
mv package.json{.new,}
|
||||
|
||||
pushd ../../../../development/node-packages
|
||||
./generate.sh
|
||||
popd
|
||||
fi
|
||||
hash=$(prefetch-npm-deps $src/package-lock.json)
|
||||
sed -i "s,npmDepsHash = \".*\",npmDepsHash = \"$hash\"," default.nix
|
||||
|
|
|
|||
|
|
@ -56,11 +56,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
|
||||
++ extraPythonPackages python3.pkgs;
|
||||
|
||||
checkInputs = [ xvfb-run dbus.daemon ];
|
||||
checkInputs = [ xvfb-run dbus ];
|
||||
|
||||
checkPhase = ''
|
||||
xvfb-run dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
${python3.interpreter} -m unittest discover -s test/gtk -v
|
||||
${python3.interpreter} -m unittest discover -s test/no_gui -v
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config libxslt python3 ];
|
||||
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ];
|
||||
|
||||
checkInputs = [ dbus.daemon ];
|
||||
checkInputs = [ dbus ];
|
||||
|
||||
configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ python3Packages.buildPythonApplication rec {
|
|||
done
|
||||
'';
|
||||
|
||||
checkInputs = [ dbus.daemon ];
|
||||
checkInputs = [ dbus ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
|
|
@ -114,7 +114,7 @@ python3Packages.buildPythonApplication rec {
|
|||
# only need to run a virtual X server + dbus but also have a large enough
|
||||
# resolution, because the Cairo test tries to draw a 200x200 window.
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
$out/bin/paperwork-gtk chkdeps
|
||||
|
||||
# content of make test, without the dep on make install
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
|
|||
libdatrie
|
||||
libxkbcommon
|
||||
libepoxy
|
||||
dbus.daemon
|
||||
dbus
|
||||
at-spi2-core
|
||||
libXtst
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,49 +1,39 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, go-mockery
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-team";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hekmekk";
|
||||
repo = "git-team";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pHKfehPyy01uVN6kjjPGtdkltw7FJ+HmIlwGs4iRhVo=";
|
||||
hash = "sha256-LZR30zqwit/xydQbpGm1LXd/tno/sTCaftgjVkVS6ZY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "1-update-dependencies-for-go-1.18.patch";
|
||||
url = "https://github.com/hekmekk/git-team/commit/d8632d9938379293521f9b3f2a93df680dd13a31.patch";
|
||||
hash = "sha256-hlmjPf3qp8WPNSH+GgkqATDiKIRzo+t81Npkptw8vgI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "2-update-dependencies-for-go-1.18.patch";
|
||||
url = "https://github.com/hekmekk/git-team/commit/f6acc96c2ffe76c527f2f2897b368cbb631d738c.patch";
|
||||
hash = "sha256-Pe+UAK9N1NpXhFGYv9l1iZ1/fCCqnT8OSgKdt/vUqO4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "3-update-dependencies-for-go-1.18.patch";
|
||||
url = "https://github.com/hekmekk/git-team/commit/2f38137298e4749a8dfe37e085015360949e73ad.patch";
|
||||
hash = "sha256-+6C8jp/qwYVmbL+SpV9FJIVyBRvX4tXBcoHMB//nNTk=";
|
||||
})
|
||||
vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
go-mockery
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-GdwksPmYEGTq/FkG/rvn3o0zMKU1cSkpgZ+GrfVgLWM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
preBuild = ''
|
||||
mockery --dir=src/ --all --keeptree
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
go run main.go --generate-man-page > ${pname}.1
|
||||
installManPage ${pname}.1
|
||||
go run main.go --generate-man-page > git-team.1
|
||||
installManPage git-team.1
|
||||
|
||||
# Currently only bash completions are provided
|
||||
installShellCompletion --cmd git-team --bash <($out/bin/git-team completion bash)
|
||||
installShellCompletion --cmd git-team \
|
||||
--bash <($out/bin/git-team completion bash) \
|
||||
--zsh <($out/bin/git-team completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||
autoPatchelfHook
|
||||
cairo
|
||||
cups.lib
|
||||
dbus.daemon.lib
|
||||
dbus.lib
|
||||
expat
|
||||
gcc-unwrapped
|
||||
gdk-pixbuf
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ lib, callPackage, fetchFromGitHub }:
|
||||
|
||||
with lib;
|
||||
|
||||
rec {
|
||||
dockerGen = {
|
||||
version, rev, sha256
|
||||
|
|
@ -13,11 +11,14 @@ rec {
|
|||
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
|
||||
, makeWrapper, installShellFiles, pkg-config, glibc
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||
, sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose
|
||||
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
||||
, procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs
|
||||
, nixosTests
|
||||
, sqlite, iproute2, docker-buildx, docker-compose
|
||||
, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
||||
, procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests
|
||||
, clientOnly ? !stdenv.isLinux, symlinkJoin
|
||||
, withSystemd ? true, systemd
|
||||
, withBtrfs ? true, btrfs-progs
|
||||
, withLvm ? true, lvm2
|
||||
, withSeccomp ? true, libseccomp
|
||||
}:
|
||||
let
|
||||
docker-runc = runc.overrideAttrs (oldAttrs: {
|
||||
|
|
@ -46,7 +47,8 @@ rec {
|
|||
sha256 = containerdSha256;
|
||||
};
|
||||
|
||||
buildInputs = oldAttrs.buildInputs ++ [ libseccomp ];
|
||||
buildInputs = oldAttrs.buildInputs
|
||||
++ lib.optional withSeccomp [ libseccomp ];
|
||||
});
|
||||
|
||||
docker-tini = tini.overrideAttrs (oldAttrs: {
|
||||
|
|
@ -68,7 +70,7 @@ rec {
|
|||
NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
|
||||
});
|
||||
|
||||
moby = buildGoPackage (optionalAttrs stdenv.isLinux rec {
|
||||
moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec {
|
||||
pname = "moby";
|
||||
inherit version;
|
||||
|
||||
|
|
@ -77,11 +79,15 @@ rec {
|
|||
goPackagePath = "github.com/docker/docker";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ];
|
||||
buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ];
|
||||
buildInputs = [ sqlite ]
|
||||
++ lib.optional withLvm lvm2
|
||||
++ lib.optional withBtrfs btrfs-progs
|
||||
++ lib.optional withSystemd systemd
|
||||
++ lib.optional withSeccomp libseccomp;
|
||||
|
||||
extraPath = optionals stdenv.isLinux (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);
|
||||
extraPath = lib.optionals stdenv.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);
|
||||
|
||||
extraUserPath = optionals (stdenv.isLinux && !clientOnly) (makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]);
|
||||
extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]);
|
||||
|
||||
patches = [
|
||||
# This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver.
|
||||
|
|
@ -132,15 +138,21 @@ rec {
|
|||
--prefix PATH : "$out/libexec/docker:$extraPath:$extraUserPath"
|
||||
'';
|
||||
|
||||
DOCKER_BUILDTAGS = [ "journald" "seccomp" ];
|
||||
DOCKER_BUILDTAGS = lib.optional withSystemd "journald"
|
||||
++ lib.optional withBtrfs "exclude_graphdriver_btrfs"
|
||||
++ lib.optional withLvm "exclude_graphdriver_devicemapper"
|
||||
++ lib.optional withSeccomp "seccomp";
|
||||
});
|
||||
|
||||
plugins = optionals buildxSupport [ docker-buildx ]
|
||||
++ optionals composeSupport [ docker-compose ];
|
||||
plugins = lib.optional buildxSupport docker-buildx
|
||||
++ lib.optional composeSupport docker-compose;
|
||||
pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; };
|
||||
in
|
||||
buildGoPackage (optionalAttrs (!clientOnly) {
|
||||
} // rec {
|
||||
buildGoPackage (lib.optionalAttrs (!clientOnly) {
|
||||
# allow overrides of docker components
|
||||
# TODO: move packages out of the let...in into top-level to allow proper overrides
|
||||
inherit docker-runc docker-containerd docker-proxy docker-tini moby;
|
||||
} // rec {
|
||||
pname = "docker";
|
||||
inherit version;
|
||||
|
||||
|
|
@ -156,14 +168,17 @@ rec {
|
|||
nativeBuildInputs = [
|
||||
makeWrapper pkg-config go-md2man go libtool installShellFiles
|
||||
];
|
||||
buildInputs = optionals (!clientOnly) [
|
||||
sqlite lvm2 btrfs-progs systemd libseccomp
|
||||
] ++ plugins;
|
||||
buildInputs = lib.optional (!clientOnly) sqlite
|
||||
++ lib.optional withLvm lvm2
|
||||
++ lib.optional withBtrfs btrfs-progs
|
||||
++ lib.optional withSystemd systemd
|
||||
++ lib.optional withSeccomp libseccomp
|
||||
++ plugins;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs man scripts/build/
|
||||
substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
|
||||
'' + optionalString (plugins != []) ''
|
||||
'' + lib.optionalString (plugins != []) ''
|
||||
substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
|
||||
"${pluginsRef}/libexec/docker/cli-plugins"
|
||||
'';
|
||||
|
|
@ -194,7 +209,7 @@ rec {
|
|||
|
||||
makeWrapper $out/libexec/docker/docker $out/bin/docker \
|
||||
--prefix PATH : "$out/libexec/docker:$extraPath"
|
||||
'' + optionalString (!clientOnly) ''
|
||||
'' + lib.optionalString (!clientOnly) ''
|
||||
# symlink docker daemon to docker cli derivation
|
||||
ln -s ${moby}/bin/dockerd $out/bin/dockerd
|
||||
ln -s ${moby}/bin/dockerd-rootless $out/bin/dockerd-rootless
|
||||
|
|
@ -222,17 +237,18 @@ rec {
|
|||
installManPage man/*/*.[1-9]
|
||||
'';
|
||||
|
||||
passthru.tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; };
|
||||
passthru = {
|
||||
# Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)
|
||||
inherit moby-src;
|
||||
tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.docker.com/";
|
||||
description = "An open source project to pack, ship and run any application as a lightweight container";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem maxeaubrey ];
|
||||
};
|
||||
|
||||
# Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)
|
||||
inherit moby-src;
|
||||
});
|
||||
|
||||
# Get revisions from
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preCheck
|
||||
export NO_AT_BRIDGE=1
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
|||
checkPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
make check
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
|
|||
HOME=$TMPDIR \
|
||||
XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test -v --no-stdsplit
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rgbds";
|
||||
version = "0.5.2";
|
||||
version = "0.6.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gbdev";
|
||||
repo = "rgbds";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/GjxdB3Nt+XuKKQWjU12mS91U4FFoeP+9t0L+HsB/o8=";
|
||||
sha256 = "sha256-2nyjI6z6W959/Yc8EwdQVmGnG0PKwsndPLmeDlNpj18=";
|
||||
};
|
||||
nativeBuildInputs = [ bison flex pkg-config ];
|
||||
buildInputs = [ libpng ];
|
||||
|
|
|
|||
|
|
@ -272,6 +272,9 @@ package-maintainers:
|
|||
- wstunnel
|
||||
gridaphobe:
|
||||
- located-base
|
||||
ivanbrennan:
|
||||
- xmonad
|
||||
- xmonad-contrib
|
||||
jb55:
|
||||
# - bson-lens
|
||||
- cased
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
checkPhase = ''
|
||||
export NO_AT_BRIDGE=1
|
||||
${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
dbus-launch = "${dbus.lib}/bin/dbus-launch";
|
||||
daemon = dbus.out;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -257,7 +257,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
export XDG_RUNTIME_HOME="$TMP"
|
||||
export HOME="$TMP"
|
||||
export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"
|
||||
export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
|
||||
export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon"
|
||||
export PATH="$PATH:$(pwd)/gobject"
|
||||
echo "PATH=$PATH"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
NO_AT_BRIDGE=1 \
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
make check
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --no-rebuild --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --no-rebuild --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
|||
|
|
@ -1,17 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl
|
||||
, x11Support ? false, libX11 ? null, cairo ? null
|
||||
, x11Support ? false, libX11, cairo
|
||||
}:
|
||||
|
||||
assert x11Support -> libX11 != null && cairo != null;
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hwloc";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.open-mpi.org/software/hwloc/v${versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
|
||||
url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
|
||||
sha256 = "sha256-NIpy/NSMMqgj7h2hSa6ZIgPnrQM1SeZK7W6m7rAfQsE=";
|
||||
};
|
||||
|
||||
|
|
@ -23,32 +19,26 @@ stdenv.mkDerivation rec {
|
|||
# XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
# Filter out `null' inputs. This allows users to `.override' the
|
||||
# derivation and set optional dependencies to `null'.
|
||||
buildInputs = lib.filter (x: x != null)
|
||||
([ expat ncurses ]
|
||||
++ (optionals x11Support [ cairo libX11 ])
|
||||
++ (optionals stdenv.isLinux [ numactl ]));
|
||||
buildInputs = [ expat ncurses ]
|
||||
++ lib.optionals x11Support [ cairo libX11 ]
|
||||
++ lib.optionals stdenv.isLinux [ numactl ];
|
||||
|
||||
propagatedBuildInputs =
|
||||
# Since `libpci' appears in `hwloc.pc', it must be propagated.
|
||||
optional stdenv.isLinux pciutils;
|
||||
# Since `libpci' appears in `hwloc.pc', it must be propagated.
|
||||
propagatedBuildInputs = lib.optional stdenv.isLinux pciutils;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall =
|
||||
optionalString (stdenv.isLinux && numactl != null)
|
||||
'' if [ -d "${numactl}/lib64" ]
|
||||
then
|
||||
numalibdir="${numactl}/lib64"
|
||||
else
|
||||
numalibdir="${numactl}/lib"
|
||||
test -d "$numalibdir"
|
||||
fi
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
if [ -d "${numactl}/lib64" ]; then
|
||||
numalibdir="${numactl}/lib64"
|
||||
else
|
||||
numalibdir="${numactl}/lib"
|
||||
test -d "$numalibdir"
|
||||
fi
|
||||
|
||||
sed -i "$lib/lib/libhwloc.la" \
|
||||
-e "s|-lnuma|-L$numalibdir -lnuma|g"
|
||||
'';
|
||||
sed -i "$lib/lib/libhwloc.la" \
|
||||
-e "s|-lnuma|-L$numalibdir -lnuma|g"
|
||||
'';
|
||||
|
||||
# Checks disabled because they're impure (hardware dependent) and
|
||||
# fail on some build machines.
|
||||
|
|
@ -56,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "lib" "dev" "doc" "man" ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Portable abstraction of hierarchical architectures for high-performance computing";
|
||||
longDescription = ''
|
||||
hwloc provides a portable abstraction (across OS,
|
||||
|
|
@ -73,7 +63,6 @@ stdenv.mkDerivation rec {
|
|||
gather information about the hardware, bind processes, and much
|
||||
more.
|
||||
'';
|
||||
|
||||
# https://www.open-mpi.org/projects/hwloc/license.php
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://www.open-mpi.org/projects/hwloc/";
|
||||
|
|
|
|||
|
|
@ -2,21 +2,28 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
# for passthru.tests
|
||||
, intel-compute-runtime
|
||||
, intel-media-driver
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.3.0";
|
||||
version = "22.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-ZJQ4KLKWA9SIXqKffU/uxUU+aXgfDdxQ5Wejgcfowgs=";
|
||||
sha256 = "sha256-bk1yBxMrPkFnPcV5uvEmbf3X2WG6iJNbD1WNxoOSnA8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit intel-compute-runtime intel-media-driver;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/intel/gmmlib";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,46 @@
|
|||
diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
index 66fab63de..a2cdf79d7 100644
|
||||
--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
@@ -2195,8 +2195,8 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
diff --git a/media_driver/linux/common/ddi/media_libva_util.cpp b/media_driver/linux/common/ddi/media_libva_util.cpp
|
||||
index 25b4cb0b5..49254c2f0 100755
|
||||
--- a/media_driver/linux/common/ddi/media_libva_util.cpp
|
||||
+++ b/media_driver/linux/common/ddi/media_libva_util.cpp
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <dlfcn.h>
|
||||
#include <errno.h>
|
||||
+#include "inttypes.h"
|
||||
|
||||
int64_t diff = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec;
|
||||
float fps = m_frameCountFps / (diff / 1000000.0);
|
||||
- DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
#include "media_libva_util.h"
|
||||
#include "mos_utilities.h"
|
||||
@@ -91,7 +92,7 @@ void DdiMediaUtil_MediaPrintFps()
|
||||
int64_t diff = (tv2.tv_sec - tv1.tv_sec)*1000000 + tv2.tv_usec - tv1.tv_usec;
|
||||
float fps = frameCountFps / (diff / 1000000.0);
|
||||
DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
- sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11llu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ sprintf(temp,"FPS:%6.4f, Interval:%11llu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ sprintf(temp,"FPS:%6.4f, Interval:%" PRIu64"\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
|
||||
MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME);
|
||||
sprintf(fpsFileName, FPS_FILE_NAME);
|
||||
@@ -2213,4 +2213,4 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
index 66fab63de..38b1fae28 100644
|
||||
--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
//! \brief libva util next implementaion.
|
||||
//!
|
||||
#include <sys/time.h>
|
||||
+#include "inttypes.h"
|
||||
#include "media_libva_util_next.h"
|
||||
#include "mos_utilities.h"
|
||||
#include "mos_os.h"
|
||||
@@ -2196,7 +2197,7 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
int64_t diff = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec;
|
||||
float fps = m_frameCountFps / (diff / 1000000.0);
|
||||
DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
- sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ sprintf(temp,"FPS:%6.4f, Interval:%" PRIu64"\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
|
||||
MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME);
|
||||
sprintf(fpsFileName, FPS_FILE_NAME);
|
||||
@@ -2213,4 +2214,4 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
pthread_mutex_unlock(&m_fpsMutex);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,9 +33,8 @@ stdenv.mkDerivation rec {
|
|||
url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch";
|
||||
sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0=";
|
||||
})
|
||||
] ++ lib.optional stdenv.is32bit [
|
||||
# fix compilation on i686-linux but also breaks x86_64
|
||||
# a similar issue got fixed in https://github.com/intel/media-driver/pull/1493 but thats to much C magic for me
|
||||
# fix compilation on 32bit
|
||||
# https://github.com/intel/media-driver/pull/1557
|
||||
./32bit.patch
|
||||
];
|
||||
|
||||
|
|
@ -73,6 +72,6 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}";
|
||||
license = with licenses; [ bsd3 mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jfrankenau SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,17 +2,15 @@
|
|||
|
||||
{ stdenv, fetchgit, lib
|
||||
, pkg-config, autoreconfHook
|
||||
, glib, dbus-glib, gtkVersion ? "3"
|
||||
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
|
||||
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
|
||||
, glib, dbus-glib
|
||||
, gtkVersion ? "3"
|
||||
, gtk2, libindicator-gtk2, libdbusmenu-gtk2
|
||||
, gtk3, libindicator-gtk3, libdbusmenu-gtk3
|
||||
, gtk-doc, vala, gobject-introspection
|
||||
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
|
||||
, monoSupport ? false, mono, gtk-sharp-2_0
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
|
||||
in "libappindicator-${postfix}";
|
||||
version = "12.10.1+20.10.20200706.1";
|
||||
|
|
@ -35,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
glib dbus-glib
|
||||
] ++ (if gtkVersion == "2"
|
||||
then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
|
||||
then [ libindicator-gtk2 ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]
|
||||
else [ libindicator-gtk3 ]);
|
||||
|
||||
preAutoreconf = ''
|
||||
|
|
@ -56,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
"localstatedir=\${TMPDIR}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A library to allow applications to export a menu into the Unity Menu bar";
|
||||
homepage = "https://launchpad.net/libappindicator";
|
||||
license = with licenses; [ lgpl21 lgpl3 ];
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
checkPhase = ''
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
, pkg-config, intltool
|
||||
, glib, dbus-glib, json-glib
|
||||
, gobject-introspection, vala
|
||||
, gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
|
||||
|
||||
with lib;
|
||||
, gtkVersion ? null, gtk2, gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}";
|
||||
|
|
@ -19,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
glib dbus-glib json-glib
|
||||
] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
|
||||
] ++ lib.optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
|
||||
|
||||
postPatch = ''
|
||||
for f in {configure,ltmain.sh,m4/libtool.m4}; do
|
||||
|
|
@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
"--localstatedir=/var"
|
||||
(if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}")
|
||||
"--disable-scrollkeeper"
|
||||
] ++ optional (gtkVersion != "2") "--disable-dumper";
|
||||
] ++ lib.optional (gtkVersion != "2") "--disable-dumper";
|
||||
|
||||
doCheck = false; # generates shebangs in check phase, too lazy to fix
|
||||
|
||||
|
|
@ -50,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
"typelibdir=${placeholder "out"}/lib/girepository-1.0"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Library for passing menu structures across DBus";
|
||||
homepage = "https://launchpad.net/dbusmenu";
|
||||
license = with licenses; [ gpl3 lgpl21 lgpl3 ];
|
||||
|
|
|
|||
|
|
@ -35,13 +35,12 @@
|
|||
, perlPackages
|
||||
, ocamlPackages
|
||||
, libtirpc
|
||||
, appliance ? null
|
||||
, withAppliance ? true
|
||||
, appliance
|
||||
, javaSupport ? false
|
||||
, jdk
|
||||
}:
|
||||
|
||||
assert appliance == null || lib.isDerivation appliance;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libguestfs";
|
||||
version = "1.48.4";
|
||||
|
|
@ -128,13 +127,13 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (appliance != null) ''
|
||||
postFixup = lib.optionalString withAppliance ''
|
||||
mkdir -p $out/{lib,lib64}
|
||||
ln -s ${appliance} $out/lib64/guestfs
|
||||
ln -s ${appliance} $out/lib/guestfs
|
||||
'';
|
||||
|
||||
doInstallCheck = appliance != null;
|
||||
doInstallCheck = withAppliance;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
|
|
@ -161,6 +160,6 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ offline ];
|
||||
platforms = platforms.linux;
|
||||
# this is to avoid "output size exceeded"
|
||||
hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux;
|
||||
hydraPlatforms = if withAppliance then appliance.meta.hydraPlatforms else platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
NO_AT_BRIDGE=1 \
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ stdenv, fetchurl, lib, file
|
||||
, pkg-config
|
||||
, gtkVersion ? "3", gtk2 ? null, gtk3 ? null }:
|
||||
|
||||
with lib;
|
||||
, gtkVersion ? "3", gtk2, gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libindicator-gtk${gtkVersion}";
|
||||
|
|
@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = false; # fails 8 out of 8 tests
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A set of symbols and convenience functions for Ayatana indicators";
|
||||
homepage = "https://launchpad.net/libindicator";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preCheck
|
||||
|
||||
dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
|||
|
|
@ -3,7 +3,13 @@
|
|||
, minimal ? false, libva-minimal
|
||||
, libX11, libXext, libXfixes, wayland, libffi, libGL
|
||||
, mesa
|
||||
# for passthru.tests
|
||||
, intel-compute-runtime
|
||||
, intel-media-driver
|
||||
, ffmpeg
|
||||
, mpv
|
||||
, vaapiIntel
|
||||
, vlc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -31,7 +37,9 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit intel-media-driver;
|
||||
# other drivers depending on libva and selected application users.
|
||||
# Please get a confirmation from the maintainer before adding more applications.
|
||||
inherit intel-compute-runtime intel-media-driver vaapiIntel mpv vlc;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, libpsm2, libfabric, pmix, ucx
|
||||
|
||||
# Enable CUDA support
|
||||
, cudaSupport ? false, cudatoolkit ? null
|
||||
, cudaSupport ? false, cudatoolkit
|
||||
|
||||
# Enable the Sun Grid Engine bindings
|
||||
, enableSGE ? false
|
||||
|
|
@ -18,8 +18,6 @@
|
|||
, fortranSupport ? true
|
||||
}:
|
||||
|
||||
assert !cudaSupport || cudatoolkit != null;
|
||||
|
||||
let
|
||||
cudatoolkit_joined = symlinkJoin {
|
||||
name = "${cudatoolkit.name}-unsplit";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake pkg-config python ];
|
||||
propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];
|
||||
buildInputs = [ dbus-glib ];
|
||||
checkInputs = [ dbus.daemon dbus-python ];
|
||||
checkInputs = [ dbus dbus-python ];
|
||||
|
||||
# No point in building tests if they are not run
|
||||
# On 0.9.7, they do not even build with QT4
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preCheck
|
||||
|
||||
dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test \
|
||||
--timeout-multiplier 2 \
|
||||
--print-errorlogs
|
||||
|
|
|
|||
|
|
@ -9,21 +9,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unicorn";
|
||||
version = "2.0.1";
|
||||
version = "2.0.1.post1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unicorn-engine";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-D8kwrHo58zksVjB13VtzoVqmz++FRfJ4zI2CT+YeBVE=";
|
||||
hash = "sha256-Jz5C35rwnDz0CXcfcvWjkwScGNQO1uijF7JrtZhM7mI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compilation on aarch64-darwin
|
||||
# See https://github.com/unicorn-engine/unicorn/issues/1730
|
||||
./tests_unit_endian_aarch64.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/tests/unit/endian.h b/tests/unit/endian.h
|
||||
index 5bc86308..b455899e 100644
|
||||
--- a/tests/unit/endian.h
|
||||
+++ b/tests/unit/endian.h
|
||||
@@ -54,6 +54,7 @@
|
||||
|| defined(_POWER) || defined(__powerpc__) \
|
||||
|| defined(__ppc__) || defined(__hpux) || defined(__hppa) \
|
||||
|| defined(_MIPSEB) || defined(_POWER) \
|
||||
+ || defined(__ARMEB__) || defined(__AARCH64EB__) \
|
||||
|| defined(__s390__)
|
||||
# define BOOST_BIG_ENDIAN
|
||||
# define BOOST_BYTE_ORDER 4321
|
||||
@@ -63,6 +64,7 @@
|
||||
|| defined(_M_ALPHA) || defined(__amd64) \
|
||||
|| defined(__amd64__) || defined(_M_AMD64) \
|
||||
|| defined(__x86_64) || defined(__x86_64__) \
|
||||
+ || defined(__ARMEL__) || defined(__AARCH64EL__) \
|
||||
|| defined(_M_X64) || defined(__bfin__)
|
||||
|
||||
# define BOOST_LITTLE_ENDIAN
|
||||
|
|
@ -5,7 +5,6 @@
|
|||
, gperftools ? null, leveldb ? null
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
|
||||
|
||||
|
|
@ -32,26 +31,26 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ];
|
||||
|
||||
configureFlags = [
|
||||
(withFeature false "attach")
|
||||
(withFeatureAs true "builtins" "")
|
||||
(enableFeature (optBzip2 != null) "bzip2")
|
||||
(enableFeature false "diagnostic")
|
||||
(enableFeature false "java")
|
||||
(enableFeature (optLeveldb != null) "leveldb")
|
||||
(enableFeature false "python")
|
||||
(enableFeature (optSnappy != null) "snappy")
|
||||
(enableFeature (optLz4 != null) "lz4")
|
||||
(enableFeature (optGperftools != null) "tcmalloc")
|
||||
(enableFeature (optZlib != null) "zlib")
|
||||
(withFeatureAs (optDb != null) "berkeleydb" optDb)
|
||||
(withFeature false "helium")
|
||||
(lib.withFeature false "attach")
|
||||
(lib.withFeatureAs true "builtins" "")
|
||||
(lib.enableFeature (optBzip2 != null) "bzip2")
|
||||
(lib.enableFeature false "diagnostic")
|
||||
(lib.enableFeature false "java")
|
||||
(lib.enableFeature (optLeveldb != null) "leveldb")
|
||||
(lib.enableFeature false "python")
|
||||
(lib.enableFeature (optSnappy != null) "snappy")
|
||||
(lib.enableFeature (optLz4 != null) "lz4")
|
||||
(lib.enableFeature (optGperftools != null) "tcmalloc")
|
||||
(lib.enableFeature (optZlib != null) "zlib")
|
||||
(lib.withFeatureAs (optDb != null) "berkeleydb" optDb)
|
||||
(lib.withFeature false "helium")
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "http://wiredtiger.com/";
|
||||
description = "";
|
||||
license = licenses.gpl2;
|
||||
|
|
|
|||
|
|
@ -117,7 +117,6 @@
|
|||
, "csslint"
|
||||
, "dat"
|
||||
, "degit"
|
||||
, {"deltachat-desktop": "../../applications/networking/instant-messengers/deltachat-desktop"}
|
||||
, "dhcp"
|
||||
, "diagnostic-languageserver"
|
||||
, "dockerfile-language-server-nodejs"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, icalendar
|
||||
, lxml
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
, recurring-ical-events
|
||||
, requests
|
||||
, six
|
||||
, tzlocal
|
||||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "caldav";
|
||||
version = "0.9.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-caldav";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Gil0v4pGyp5+TnYPjb8Vk0xTqnQKaeD8Ko/ZWhvkbUk=";
|
||||
hash = "sha256-fTl2mxQncsITSC8XpcCBYWYmjDboiueGkNGHbQxn+F8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -28,30 +28,27 @@ buildPythonPackage rec {
|
|||
lxml
|
||||
requests
|
||||
six
|
||||
icalendar
|
||||
recurring-ical-events
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
icalendar
|
||||
nose
|
||||
pytestCheckHook
|
||||
tzlocal
|
||||
pytz
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests tests
|
||||
'';
|
||||
|
||||
# xandikos and radicale is only a optional test dependency, not available for python3
|
||||
# xandikos and radicale are only optional test dependencies, not available for python3
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace ", 'xandikos<0.2.4'" "" \
|
||||
--replace ", 'radicale'" ""
|
||||
--replace xandikos "" \
|
||||
--replace radicale ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "caldav" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This project is a CalDAV (RFC4791) client library for Python.";
|
||||
description = "CalDAV (RFC4791) client library";
|
||||
homepage = "https://github.com/python-caldav/caldav";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marenz dotlambda ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPyPy
|
||||
, pytest, pytest-cov, pytest-mock, freezegun
|
||||
, jinja2, future, binaryornot, click, jinja2_time, requests
|
||||
, jinja2, future, binaryornot, click, jinja2-time, requests
|
||||
, python-slugify
|
||||
, pyyaml
|
||||
}:
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
jinja2
|
||||
click
|
||||
pyyaml
|
||||
jinja2_time
|
||||
jinja2-time
|
||||
python-slugify
|
||||
requests
|
||||
];
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
# test_tcp_connection_with_forwarding fails due to dbus
|
||||
# creating unix socket anyway on v1.14.4
|
||||
checkPhase = ''
|
||||
dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \
|
||||
${python.interpreter} -m pytest -sv --cov=dbus_next \
|
||||
-k "not test_peer_interface and not test_tcp_connection_with_forwarding"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ buildPythonPackage {
|
|||
# export NO_AT_BRIDGE=1
|
||||
gsettings set org.gnome.desktop.interface toolkit-accessibility true
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
${python.interpreter} nix_run_setup test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,25 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, arrow
|
||||
, freezegun
|
||||
, jinja2
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.2.0";
|
||||
pname = "jinja2-time";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix usage of arrow in tests
|
||||
(fetchpatch {
|
||||
url = "https://github.com/hackebrot/jinja2-time/pull/19/commits/3b2476c266ba53262352153104ca3501722823a4.patch";
|
||||
sha256 = "sha256-zh4PpAj2GtpgaEap/Yvu6DNY84AwH/YTJlUPRRHPyTs=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ arrow jinja2 ];
|
||||
|
||||
checkInputs = [ freezegun pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "jinja2_time" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/hackebrot/jinja2-time";
|
||||
description = "Jinja2 Extension for Dates and Times";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,12 +1,14 @@
|
|||
{ buildPythonPackage, fetchPypi, lib, jq }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, cython, jq, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jq";
|
||||
version = "1.2.3";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-15bXqaa6c6RMoHKqUAcOhPrhMBbqYHrDdnZAaFaHElc=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mwilliamson";
|
||||
repo = "jq.py";
|
||||
rev = version;
|
||||
sha256 = "sha256-1EQm5ShjFHbO1IO5QD42fsGHFGDBrJulLrcl+WeU7wo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -14,10 +16,18 @@ buildPythonPackage rec {
|
|||
./jq-py-setup.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
buildInputs = [ jq ];
|
||||
|
||||
# no tests executed
|
||||
doCheck = false;
|
||||
preBuild = ''
|
||||
cython jq.pyx
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jq" ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,8 @@
|
|||
From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
|
||||
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
|
||||
Date: Fri, 7 May 2021 19:14:20 -0400
|
||||
Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
|
||||
|
||||
---
|
||||
setup.py | 98 +-------------------------------------------------------
|
||||
1 file changed, 1 insertion(+), 97 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 663792c..3ebcabe 100644
|
||||
index 01cc813..15e9048 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1,113 +1,19 @@
|
||||
@@ -1,97 +1,18 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import os
|
||||
|
|
@ -20,50 +11,42 @@ index 663792c..3ebcabe 100644
|
|||
-import shutil
|
||||
-import sysconfig
|
||||
|
||||
-import requests
|
||||
from setuptools import setup
|
||||
-from setuptools.command.build_ext import build_ext
|
||||
from setuptools.extension import Extension
|
||||
|
||||
|
||||
-def urlretrieve(source_url, destination_path):
|
||||
- response = requests.get(source_url, stream=True)
|
||||
- if response.status_code != 200:
|
||||
- raise Exception("status code was: {}".format(response.status_code))
|
||||
-
|
||||
- with open(destination_path, "wb") as fileobj:
|
||||
- for chunk in response.iter_content(chunk_size=128):
|
||||
- fileobj.write(chunk)
|
||||
-
|
||||
-def path_in_dir(relative_path):
|
||||
-def _path_in_dir(relative_path):
|
||||
- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
|
||||
-
|
||||
-def dependency_path(relative_path):
|
||||
- return os.path.join(path_in_dir("_deps"), relative_path)
|
||||
-def _dep_source_path(relative_path):
|
||||
- return os.path.join(_path_in_dir("deps"), relative_path)
|
||||
-
|
||||
def read(fname):
|
||||
-def _dep_build_path(relative_path):
|
||||
- return os.path.join(_path_in_dir("_deps/build"), relative_path)
|
||||
-
|
||||
def _read(fname):
|
||||
return open(os.path.join(os.path.dirname(__file__), fname)).read()
|
||||
|
||||
|
||||
-jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz")
|
||||
-jq_lib_dir = dependency_path("jq-1.6")
|
||||
-jq_lib_tarball_path = _dep_source_path("jq-1.6.tar.gz")
|
||||
-jq_lib_dir = _dep_build_path("jq-1.6")
|
||||
-
|
||||
-oniguruma_version = "6.9.4"
|
||||
-oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version))
|
||||
-oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version))
|
||||
-oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version))
|
||||
-oniguruma_lib_tarball_path = _dep_source_path("onig-{}.tar.gz".format(oniguruma_version))
|
||||
-oniguruma_lib_build_dir = _dep_build_path("onig-{}".format(oniguruma_version))
|
||||
-oniguruma_lib_install_dir = _dep_build_path("onig-install-{}".format(oniguruma_version))
|
||||
-
|
||||
-class jq_build_ext(build_ext):
|
||||
- def run(self):
|
||||
- if not os.path.exists(dependency_path(".")):
|
||||
- os.makedirs(dependency_path("."))
|
||||
- if not os.path.exists(_dep_build_path(".")):
|
||||
- os.makedirs(_dep_build_path("."))
|
||||
- self._build_oniguruma()
|
||||
- self._build_libjq()
|
||||
- build_ext.run(self)
|
||||
-
|
||||
- def _build_oniguruma(self):
|
||||
- self._build_lib(
|
||||
- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version),
|
||||
- tarball_path=oniguruma_lib_tarball_path,
|
||||
- lib_dir=oniguruma_lib_build_dir,
|
||||
- commands=[
|
||||
|
|
@ -75,7 +58,6 @@ index 663792c..3ebcabe 100644
|
|||
-
|
||||
- def _build_libjq(self):
|
||||
- self._build_lib(
|
||||
- source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz",
|
||||
- tarball_path=jq_lib_tarball_path,
|
||||
- lib_dir=jq_lib_dir,
|
||||
- commands=[
|
||||
|
|
@ -83,9 +65,8 @@ index 663792c..3ebcabe 100644
|
|||
- ["make"],
|
||||
- ])
|
||||
-
|
||||
- def _build_lib(self, source_url, tarball_path, lib_dir, commands):
|
||||
- self._download_tarball(
|
||||
- source_url=source_url,
|
||||
- def _build_lib(self, tarball_path, lib_dir, commands):
|
||||
- self._extract_tarball(
|
||||
- tarball_path=tarball_path,
|
||||
- lib_dir=lib_dir,
|
||||
- )
|
||||
|
|
@ -101,16 +82,10 @@ index 663792c..3ebcabe 100644
|
|||
- for command in commands:
|
||||
- run_command(command)
|
||||
-
|
||||
- def _download_tarball(self, source_url, tarball_path, lib_dir):
|
||||
- if os.path.exists(tarball_path):
|
||||
- os.unlink(tarball_path)
|
||||
- print("Downloading {}".format(source_url))
|
||||
- urlretrieve(source_url, tarball_path)
|
||||
- print("Downloaded {}".format(source_url))
|
||||
-
|
||||
- def _extract_tarball(self, tarball_path, lib_dir):
|
||||
- if os.path.exists(lib_dir):
|
||||
- shutil.rmtree(lib_dir)
|
||||
- tarfile.open(tarball_path, "r:gz").extractall(dependency_path("."))
|
||||
- tarfile.open(tarball_path, "r:gz").extractall(_dep_build_path("."))
|
||||
-
|
||||
-
|
||||
jq_extension = Extension(
|
||||
|
|
@ -126,19 +101,11 @@ index 663792c..3ebcabe 100644
|
|||
)
|
||||
|
||||
setup(
|
||||
@@ -120,7 +26,6 @@ setup(
|
||||
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
|
||||
@@ -104,7 +25,6 @@ def _extract_tarball(self, tarball_path, lib_dir):
|
||||
python_requires='>=3.5',
|
||||
license='BSD 2-Clause',
|
||||
ext_modules = [jq_extension],
|
||||
- cmdclass={"build_ext": jq_build_ext},
|
||||
classifiers=[
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Intended Audience :: Developers',
|
||||
@@ -137,4 +42,3 @@ setup(
|
||||
'Programming Language :: Python :: 3.9',
|
||||
],
|
||||
)
|
||||
-
|
||||
--
|
||||
2.29.3
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ buildPythonPackage rec {
|
|||
PATH="$TMP/bin:$PATH" pytest
|
||||
'' else if stdenv.isLinux then ''
|
||||
dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
pytest
|
||||
'' else ''
|
||||
pytest
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openapi-core";
|
||||
version = "0.16.1";
|
||||
version = "0.16.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -35,8 +35,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "p1c2u";
|
||||
repo = "openapi-core";
|
||||
rev = version;
|
||||
hash = "sha256-J3n34HR5lfMM0ik5HAZ2JCr75fX5FTqBWrZ7E3/6XSE=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-i1MeKPVWowB12gE4kIWBjq6zvn2aIVW4ZDK8bKNAP1o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, icalendar
|
||||
, pytz
|
||||
, python-dateutil
|
||||
, x-wr-timezone
|
||||
, pytestCheckHook
|
||||
, restructuredtext_lint
|
||||
, pygments
|
||||
, tzdata
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "recurring-ical-events";
|
||||
version = "1.1.0b0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "niccokunzmann";
|
||||
repo = "python-recurring-ical-events";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ePbyZd/l/O3p/6Mbq1kMFsktkFKpPAw/u7uUynZYP2Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
icalendar
|
||||
pytz
|
||||
python-dateutil
|
||||
x-wr-timezone
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
restructuredtext_lint
|
||||
pygments
|
||||
tzdata
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "recurring_ical_events" ];
|
||||
|
||||
meta = {
|
||||
description = "Repeat ICalendar events by RRULE, RDATE and EXDATE";
|
||||
homepage = "https://github.com/niccokunzmann/python-recurring-ical-events";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,6 +6,9 @@
|
|||
, pytest-asyncio
|
||||
, pretend
|
||||
, freezegun
|
||||
, hatch-fancy-pypi-readme
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, simplejson
|
||||
, typing-extensions
|
||||
, pythonAtLeast
|
||||
|
|
@ -13,16 +16,24 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "structlog";
|
||||
version = "22.1.0";
|
||||
format = "flit";
|
||||
version = "22.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hynek";
|
||||
repo = "structlog";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-2sdH6iP+l+6pBNC+sjpAX8bCdCANqqkaqZRmR68uwxY=";
|
||||
sha256 = "sha256-+r+M+uTXdNBWQf0TGQuZgsCXg2CBKwH8ZE2+uAe0Dzg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatch-fancy-pypi-readme
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
];
|
||||
|
|
|
|||
47
pkgs/development/python-modules/x-wr-timezone/default.nix
Normal file
47
pkgs/development/python-modules/x-wr-timezone/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, icalendar
|
||||
, pytz
|
||||
, pytestCheckHook
|
||||
, restructuredtext_lint
|
||||
, pygments
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "x-wr-timezone";
|
||||
version = "0.0.5";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "niccokunzmann";
|
||||
repo = "x-wr-timezone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vUhAq6b5I0gYbXmbElxSSL6Mu9BSLs0uT5gb8zXdmpg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
icalendar
|
||||
pytz
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
restructuredtext_lint
|
||||
pygments
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "x_wr_timezone" ];
|
||||
|
||||
meta = {
|
||||
description = "Convert calendars using X-WR-TIMEZONE to standard ones";
|
||||
homepage = "https://github.com/niccokunzmann/x-wr-timezone";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
67
pkgs/development/tools/ldid/default.nix
Normal file
67
pkgs/development/tools/ldid/default.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, fetchgit
|
||||
, libplist
|
||||
, libxml2
|
||||
, openssl_1_1
|
||||
, CoreFoundation
|
||||
, Security
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ldid";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.saurik.com/ldid.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [
|
||||
libplist
|
||||
libxml2
|
||||
openssl_1_1
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
Security
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = [
|
||||
"-lcrypto"
|
||||
"-lplist-2.0"
|
||||
"-lxml2"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-framework CoreFoundation"
|
||||
"-framework Security"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
cc -c -o lookup2.o lookup2.c -I.
|
||||
c++ -std=c++11 -o ldid lookup2.o ldid.cpp -I. ${toString NIX_LDFLAGS}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 {,$out/bin/}ldid
|
||||
ln -s $out/bin/ldid $out/bin/ldid2
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Link Identity Editor";
|
||||
homepage = "https://cydia.saurik.com/info/ldid/";
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.agpl3Only;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, patchelf
|
||||
, cmake
|
||||
, pkg-config
|
||||
|
||||
, intel-gmmlib
|
||||
, intel-graphics-compiler
|
||||
, libva
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "22.35.24055";
|
||||
version = "22.43.24558";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
rev = version;
|
||||
sha256 = "sha256-MOWlhzhEGYyHGk6N+H7O2BLho4YFyvcCbj/zafhzLEw=";
|
||||
sha256 = "sha256-/hiDJLtEOLbnFjT697yLie5E7819fZM3xricPwe4xN0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
@ -26,10 +26,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
"-DSKIP_UNIT_TESTS=1"
|
||||
|
||||
"-DIGC_DIR=${intel-graphics-compiler}"
|
||||
"-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors"
|
||||
|
||||
# The install script assumes this path is relative to CMAKE_INSTALL_PREFIX
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
|
@ -45,10 +43,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/intel/compute-runtime";
|
||||
homepage = "https://github.com/intel/compute-runtime";
|
||||
description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ gloaming ];
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,6 +61,22 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
caldav = super.caldav.overridePythonAttrs (old: rec {
|
||||
version = "0.9.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-caldav";
|
||||
repo = "caldav";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gil0v4pGyp5+TnYPjb8Vk0xTqnQKaeD8Ko/ZWhvkbUk=";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace ", 'xandikos<0.2.4'" "" \
|
||||
--replace ", 'radicale'" ""
|
||||
'';
|
||||
checkInputs = old.checkInputs ++ [ self.nose ];
|
||||
});
|
||||
|
||||
gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "4.0.0";
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -18,8 +18,10 @@
|
|||
, withDevdoc ? false
|
||||
, doxygen
|
||||
, dblatex # Extra developer documentation
|
||||
, withNcurses
|
||||
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
|
||||
, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
|
||||
, withTsm ? false
|
||||
, tsm-client # Tivoli Storage Manager Backup Client from IBM
|
||||
}:
|
||||
|
||||
with (import ./srcs.nix { inherit fetchurl; });
|
||||
|
|
@ -45,7 +47,8 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ libkrb5 ncurses ];
|
||||
|
||||
patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
|
||||
patches = [ ./bosserver.patch ./cross-build.patch ]
|
||||
++ optional withTsm ./tsmbac.patch;
|
||||
|
||||
outputs = [ "out" "dev" "man" "doc" ] ++ optional withDevdoc "devdoc";
|
||||
|
||||
|
|
@ -80,12 +83,12 @@ stdenv.mkDerivation {
|
|||
"--disable-kernel-module"
|
||||
"--disable-fuse-client"
|
||||
"--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
|
||||
${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
|
||||
${optionalString (ncurses == null) "--disable-gtx"}
|
||||
${optionalString withTsm "--enable-tivoli-tsm"}
|
||||
${optionalString withNcurses "--disable-gtx"}
|
||||
"--disable-linux-d_splice-alias-extra-iput"
|
||||
)
|
||||
'' + optionalString (tsmbac != null) ''
|
||||
export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
|
||||
'' + optionalString withTsm ''
|
||||
export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/lib64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\""
|
||||
export XBSA_XLIBS="-ldl"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -31,21 +31,21 @@ let
|
|||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "changedetection-io";
|
||||
version = "0.39.20.4";
|
||||
version = "0.39.21.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgtlmoon";
|
||||
repo = "changedetection.io";
|
||||
rev = version;
|
||||
sha256 = "sha256-XhCByQbGWAwWe71jsitpYJnQ2xRIdmhc9mY6Smxmp3w=";
|
||||
sha256 = "sha256-cX2HwlsWOJ34msEnPP38jq+kzSxOM/spe0Ja2lZ/Q7w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "bs4" "beautifulsoup4" \
|
||||
--replace "cryptography ~= 3.4" "cryptography" \
|
||||
--replace "selenium ~= 4.1.0" "selenium"
|
||||
--replace "cryptography~=3.4" "cryptography" \
|
||||
--replace "selenium~=4.1.0" "selenium"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
|
|
@ -58,6 +58,8 @@ py.pkgs.buildPythonApplication rec {
|
|||
feedgen
|
||||
flask-login
|
||||
flask-restful
|
||||
jinja2
|
||||
jinja2-time
|
||||
pytz
|
||||
brotli
|
||||
requests
|
||||
|
|
|
|||
|
|
@ -4,24 +4,16 @@ with python3Packages;
|
|||
|
||||
toPythonModule (buildPythonApplication rec {
|
||||
pname = "searx";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
# pypi doesn't receive updates
|
||||
src = fetchFromGitHub {
|
||||
owner = "searx";
|
||||
repo = "searx";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh";
|
||||
sha256 = "sha256-+Wsg1k/h41luk5aVfSn11/lGv8hZYVvpHLbbYHfsExw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix a crash, remove with the next update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/searx/searx/commit/9c10b150963babb7f0b52081693a42b2e61eede9.patch";
|
||||
sha256 = "0svp8799628wja2hq59da6rxqi99am8p6hb8y27ciwzsjz0wwba7";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/==.*$//' requirements.txt
|
||||
'';
|
||||
|
|
@ -50,6 +42,7 @@ toPythonModule (buildPythonApplication rec {
|
|||
pyyaml
|
||||
requests
|
||||
speaklater
|
||||
setproctitle
|
||||
werkzeug
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -963,7 +963,9 @@ self: super:
|
|||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xauth ]
|
||||
++ lib.optionals isDarwin [ xorg.libX11 xorg.xorgproto ];
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/startx --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc
|
||||
substituteInPlace $out/bin/startx \
|
||||
--replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc \
|
||||
--replace $out/etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc
|
||||
'';
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ let
|
|||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \
|
||||
--add-flags --config-file=${dbus.daemon}/share/dbus-1/session.conf
|
||||
--add-flags --config-file=${dbus}/share/dbus-1/session.conf
|
||||
'';
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "calendar-cli";
|
||||
version = "0.13.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobixen";
|
||||
repo = "calendar-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wGigrBl5PJL+fVfnFnHDJ5zyB+Rq3Fm+q9vMvLuBBys=";
|
||||
hash = "sha256-VVE4+qoUam2szbMsdWetq6hyhXoE1V3Pw5j/bYbfGVQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -19,6 +19,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
caldav
|
||||
pytz
|
||||
tzlocal
|
||||
click
|
||||
six
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
# install check instead, when those paths will have been created.
|
||||
doInstallCheck = true;
|
||||
preInstallCheck = ''
|
||||
export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
|
||||
export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon"
|
||||
patchShebangs tools/tests/test-wrapper.sh
|
||||
'';
|
||||
installCheckTarget = "check";
|
||||
|
|
|
|||
36
pkgs/tools/security/bkcrack/default.nix
Normal file
36
pkgs/tools/security/bkcrack/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, openmp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bkcrack";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimci86";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iyx4mOTr6MHECk9S9zrIAE5pt+cxWnOKS7iQPUyWfzs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ openmp ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin $out/share/licenses/bkcrack
|
||||
mv $out/bkcrack $out/bin/
|
||||
mv $out/license.txt $out/share/licenses/bkcrack
|
||||
rm -r $out/example $out/tools $out/readme.md
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Crack legacy zip encryption with Biham and Kocher's known plaintext attack";
|
||||
homepage = "https://github.com/kimci86/bkcrack";
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ erdnaxe ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1046,6 +1046,7 @@ mapAliases ({
|
|||
odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
|
||||
ofp = throw "ofp is not compatible with odp-dpdk";
|
||||
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
|
||||
openafs_1_8 = openafs; # Added 2022-08-22
|
||||
openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
|
||||
openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
|
||||
opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22
|
||||
|
|
|
|||
|
|
@ -5122,6 +5122,10 @@ with pkgs;
|
|||
|
||||
bbe = callPackage ../tools/misc/bbe { };
|
||||
|
||||
bkcrack = callPackage ../tools/security/bkcrack {
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
|
||||
bdsync = callPackage ../tools/backup/bdsync { };
|
||||
|
||||
beamerpresenter = beamerpresenter-mupdf;
|
||||
|
|
@ -5378,7 +5382,12 @@ with pkgs;
|
|||
|
||||
crlfuzz = callPackage ../tools/security/crlfuzz {};
|
||||
|
||||
hedgedoc = callPackage ../servers/web-apps/hedgedoc { };
|
||||
hedgedoc = callPackage ../servers/web-apps/hedgedoc {
|
||||
inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix {
|
||||
nodejs = nodejs-16_x;
|
||||
}) mkYarnPackage;
|
||||
nodejs = nodejs-16_x;
|
||||
};
|
||||
|
||||
colord = callPackage ../tools/misc/colord { };
|
||||
|
||||
|
|
@ -24016,9 +24025,7 @@ with pkgs;
|
|||
|
||||
openbgpd = callPackage ../servers/openbgpd { };
|
||||
|
||||
openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
|
||||
# Current stable release; don't backport release updates!
|
||||
openafs = openafs_1_8;
|
||||
openafs = callPackage ../servers/openafs/1.8 { };
|
||||
|
||||
openresty = callPackage ../servers/http/openresty {
|
||||
withPerl = false;
|
||||
|
|
@ -38071,6 +38078,10 @@ with pkgs;
|
|||
|
||||
lc3tools = callPackage ../development/tools/lc3tools {};
|
||||
|
||||
ldid = callPackage ../development/tools/ldid {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
xcolor = callPackage ../tools/graphics/xcolor { };
|
||||
|
||||
xcfun = callPackage ../development/libraries/science/chemistry/xcfun { };
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ mapAliases ({
|
|||
ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30
|
||||
influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10
|
||||
itanium_demangler = itanium-demangler; # added 2022-1017
|
||||
jinja2_time = jinja2-time; # added 2022-11-07
|
||||
jupyter_client = jupyter-client; # added 2021-10-15
|
||||
Keras = keras; # added 2021-11-25
|
||||
ldap = python-ldap; # added 2022-09-16
|
||||
|
|
|
|||
|
|
@ -4756,7 +4756,7 @@ self: super: with self; {
|
|||
|
||||
jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { };
|
||||
|
||||
jinja2_time = callPackage ../development/python-modules/jinja2_time { };
|
||||
jinja2-time = callPackage ../development/python-modules/jinja2-time { };
|
||||
|
||||
jira = callPackage ../development/python-modules/jira { };
|
||||
|
||||
|
|
@ -9648,6 +9648,8 @@ self: super: with self; {
|
|||
|
||||
recordlinkage = callPackage ../development/python-modules/recordlinkage { };
|
||||
|
||||
recurring-ical-events = callPackage ../development/python-modules/recurring-ical-events { };
|
||||
|
||||
redbaron = callPackage ../development/python-modules/redbaron { };
|
||||
|
||||
redis = callPackage ../development/python-modules/redis { };
|
||||
|
|
@ -12051,6 +12053,7 @@ self: super: with self; {
|
|||
};
|
||||
};
|
||||
|
||||
x-wr-timezone = callPackage ../development/python-modules/x-wr-timezone { };
|
||||
|
||||
x11_hash = callPackage ../development/python-modules/x11_hash { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue