Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
da4d99e016
@ -100,6 +100,32 @@ rec {
|
||||
];
|
||||
};
|
||||
|
||||
# given two patterns, return a pattern which is their logical AND.
|
||||
# Since a pattern is a list-of-disjuncts, this needs to
|
||||
patternLogicalAnd = pat1_: pat2_:
|
||||
let
|
||||
# patterns can be either a list or a (bare) singleton; turn
|
||||
# them into singletons for uniform handling
|
||||
pat1 = lib.toList pat1_;
|
||||
pat2 = lib.toList pat2_;
|
||||
in
|
||||
lib.concatMap (attr1:
|
||||
map (attr2:
|
||||
lib.recursiveUpdateUntil
|
||||
(path: subattr1: subattr2:
|
||||
if (builtins.intersectAttrs subattr1 subattr2) == {} || subattr1 == subattr2
|
||||
then true
|
||||
else throw ''
|
||||
pattern conflict at path ${toString path}:
|
||||
${builtins.toJSON subattr1}
|
||||
${builtins.toJSON subattr2}
|
||||
'')
|
||||
attr1
|
||||
attr2
|
||||
)
|
||||
pat2)
|
||||
pat1;
|
||||
|
||||
matchAnyAttrs = patterns:
|
||||
if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns
|
||||
else matchAttrs patterns;
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schismtracker";
|
||||
version = "20230906";
|
||||
version = "20231029";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eW1sqfcAR3lutSyQKj7j1elkFTa8jfZqgrJYYAzMlzo=";
|
||||
sha256 = "sha256-ELCV5c79fFX1C4+S9bnDFOx3jAs/R2TERH1Q9fkBGnY=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-dependency-tracking" ]
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exodus";
|
||||
version = "23.9.25";
|
||||
version = "23.10.24";
|
||||
|
||||
src = fetchurl {
|
||||
name = "exodus-linux-x64-${version}.zip";
|
||||
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
|
||||
curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
|
||||
sha256 = "a3e314de257e1ec01baa1023886f327ade4b233d833f7fe79f6c3e0f26d07ced";
|
||||
sha256 = "sha256-g28jSQaqjnM34sCpyYLSipUoU3pqAcXQIyWhlrR4xz4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Reference client for NEAR Protocol";
|
||||
homepage = "https://github.com/near/nearcore";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ mic92 mikroskeem ];
|
||||
maintainers = with maintainers; [ mikroskeem ];
|
||||
# only x86_64 is supported in nearcore because of sse4+ support, macOS might
|
||||
# be also possible
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
@ -47,7 +47,7 @@ let
|
||||
Enhancing productivity for every C and C++
|
||||
developer on Linux, macOS and Windows.
|
||||
'';
|
||||
maintainers = with maintainers; [ edwtjo mic92 tymscar ];
|
||||
maintainers = with maintainers; [ edwtjo tymscar ];
|
||||
};
|
||||
}).overrideAttrs (attrs: {
|
||||
nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, SDL2
|
||||
, aalib
|
||||
, alsa-lib
|
||||
, libXext
|
||||
, libXxf86vm
|
||||
, libcaca
|
||||
, libpulseaudio
|
||||
, libsndfile
|
||||
, ncurses
|
||||
, openssl
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zesarux";
|
||||
version = "10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chernandezba";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-cxV2dAzGnIzJiCRdq8vN/Cl4AQeJqjmiCAahijIJQ9k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
aalib
|
||||
alsa-lib
|
||||
libXxf86vm
|
||||
libXext
|
||||
libcaca
|
||||
libpulseaudio
|
||||
libsndfile
|
||||
ncurses
|
||||
openssl
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Patch the shell scripts; remove it when the next version arrives
|
||||
(fetchpatch {
|
||||
name = "000-fix-shebangs.patch";
|
||||
url = "https://github.com/chernandezba/zesarux/commit/4493439b38f565c5be7c36239ecaf0cf80045627.diff";
|
||||
sha256 = "sha256-f+21naPcPXdcVvqU8ymlGfl1WkYGOeOBe9B/WFUauTI=";
|
||||
})
|
||||
|
||||
# Patch pending upstream release for libcaca-0.99.beta20 support:
|
||||
# https://github.com/chernandezba/zesarux/pull/1
|
||||
(fetchpatch {
|
||||
name = "libcaca-0.99.beta20.patch";
|
||||
url = "https://github.com/chernandezba/zesarux/commit/542786338d00ab6fcdf712bbd6f5e891e8b26c34.diff";
|
||||
sha256 = "sha256-UvXvBb9Nzw5HNz0uiv2SV1Oeiw7aVCa0jhEbThDRVec=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cd src
|
||||
patchShebangs ./configure *.sh
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--prefix=${placeholder "out"}"
|
||||
"--c-compiler ${stdenv.cc.targetPrefix}cc"
|
||||
"--enable-cpustats"
|
||||
"--enable-memptr"
|
||||
"--enable-sdl2"
|
||||
"--enable-ssl"
|
||||
"--enable-undoc-scfccf"
|
||||
"--enable-visualmem"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
./generate_install_sh.sh
|
||||
patchShebangs ./install.sh
|
||||
./install.sh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/chernandezba/zesarux";
|
||||
description = " ZX Second-Emulator And Released for UniX";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
# TODO: Darwin support
|
||||
@ -7,54 +7,7 @@
|
||||
, radicale3
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
flask = super.flask.overridePythonAttrs (old: rec {
|
||||
version = "2.0.3";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pulling in this patch lets us continue running tests without any
|
||||
# other changes using setuptools >= 67.5.0.
|
||||
(fetchpatch {
|
||||
name = "remove-deprecated-pkg-resources.patch";
|
||||
url = "https://github.com/pallets/flask/commit/751d85f3de3f726446bb12e4ddfae885a6645ba1.patch";
|
||||
hash = "sha256-T4vKSSe3P0xtb2/iQjm0RH2Bwk1ZHWiPoX1Ycr63EqU=";
|
||||
includes = [ "src/flask/cli.py" ];
|
||||
})
|
||||
];
|
||||
});
|
||||
flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec {
|
||||
version = "0.15.1";
|
||||
format = "setuptools";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
pname = "Flask-WTF";
|
||||
hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw=";
|
||||
};
|
||||
disabledTests = [
|
||||
"test_outside_request"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
"tests/test_form.py"
|
||||
"tests/test_html5.py"
|
||||
];
|
||||
patches = [ ];
|
||||
});
|
||||
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
|
||||
version = "2.0.3";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "etesync-dav";
|
||||
version = "0.32.1";
|
||||
|
||||
@ -71,7 +24,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appdirs
|
||||
etebase
|
||||
etesync
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flashprint";
|
||||
version = "5.8.0";
|
||||
version = "5.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-T7NHSTDFqM/LygTU3zO64Ut/tdd3vDPQoZuhAv7PWHU=";
|
||||
hash = "sha256-X5CsJmJa3qGQxdZ1xg3xoVnIaChzxZ/GaLZFqBE2dIk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ];
|
||||
|
||||
@ -12,9 +12,11 @@
|
||||
, widevine-cdm
|
||||
, enableVulkan ? stdenv.isLinux
|
||||
, vulkan-loader
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
let
|
||||
isQt6 = lib.versions.major qtbase.version == "6";
|
||||
pdfjs = let
|
||||
version = "3.9.179";
|
||||
in
|
||||
@ -50,10 +52,14 @@ python3.pkgs.buildPythonApplication {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; ([
|
||||
pyyaml pyqt6-webengine jinja2 pygments
|
||||
pyyaml (if isQt6 then pyqt6-webengine else pyqtwebengine) jinja2 pygments
|
||||
# scripts and userscripts libs
|
||||
tldextract beautifulsoup4
|
||||
readability-lxml pykeepass stem
|
||||
readability-lxml pykeepass
|
||||
] ++ lib.optionals ((builtins.tryEval stem.outPath).success) [
|
||||
# error: stem-1.8.2 not supported for interpreter python3.11
|
||||
stem
|
||||
] ++ [
|
||||
pynacl
|
||||
# extensive ad blocking
|
||||
adblock
|
||||
@ -80,7 +86,7 @@ python3.pkgs.buildPythonApplication {
|
||||
runHook preInstall
|
||||
|
||||
make -f misc/Makefile \
|
||||
PYTHON=${python3}/bin/python3 \
|
||||
PYTHON=${buildPackages.python3}/bin/python3 \
|
||||
PREFIX=. \
|
||||
DESTDIR="$out" \
|
||||
DATAROOTDIR=/share \
|
||||
|
||||
@ -1,38 +1,55 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, testers
|
||||
, deltachat-cursed
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "deltachat-cursed";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adbenitez";
|
||||
repo = "deltachat-cursed";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cv2QT8GsPAcA5TTZGfNvFNwnUITSR0PmQE0QCO1nFNk=";
|
||||
hash = "sha256-1QNhNPa6ZKn0lGQXs/cmfdSFHscwlYwFC/2DpnMoHvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.setuptools-scm
|
||||
nativeBuildInputs = with python3.pythonForBuild.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appdirs
|
||||
deltachat
|
||||
emoji
|
||||
notify-py
|
||||
setuptools # for pkg_resources
|
||||
urwid-readline
|
||||
];
|
||||
|
||||
doCheck = false; # no tests implemented
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion rec {
|
||||
package = deltachat-cursed;
|
||||
command = ''
|
||||
HOME="$TEMP" ${lib.getExe package} --version
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight Delta Chat client";
|
||||
homepage = "https://github.com/adbenitez/deltachat-cursed";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "curseddelta";
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, copyDesktopItems
|
||||
, electron_22
|
||||
, electron_26
|
||||
, buildGoModule
|
||||
, esbuild
|
||||
, fetchFromGitHub
|
||||
@ -33,16 +33,16 @@ let
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.40.4";
|
||||
version = "unstable-2023-11-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cNCM0McWBmHUUutMDa/Cy0qOxhx4NJnhjrW++HRl/nU=";
|
||||
rev = "40152e9543eb773fc27e7a4f96ef1eecebe9310e";
|
||||
hash = "sha256-9GPXFUCu9GKa/bJgO8CIPMLccI6WAJ6PhfoyJ6s/DHE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-CoWa0l2If+SGqD47nP91qsvUlTzOEWP5or5zNUdV7P0=";
|
||||
npmDepsHash = "sha256-g3nkgqZNoq+xuwXbXLHEMVpHH6Sq3792xhITCx7WvOc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@ -92,7 +92,7 @@ buildNpmPackage rec {
|
||||
$out/lib/node_modules/deltachat-desktop/html-dist/fonts
|
||||
done
|
||||
|
||||
makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \
|
||||
makeWrapper ${electron_26}/bin/electron $out/bin/deltachat \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
|
||||
--add-flags $out/lib/node_modules/deltachat-desktop
|
||||
|
||||
|
||||
26
pkgs/by-name/de/deltachat-repl/package.nix
Normal file
26
pkgs/by-name/de/deltachat-repl/package.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, libdeltachat
|
||||
, perl
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "deltachat-repl";
|
||||
|
||||
inherit (libdeltachat) version src cargoLock buildInputs;
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--package" "deltachat-repl" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = libdeltachat.meta // {
|
||||
description = "Delta Chat CLI client";
|
||||
mainProgram = "deltachat-repl";
|
||||
};
|
||||
}
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "fantomas";
|
||||
version = "6.2.2";
|
||||
version = "6.2.3";
|
||||
|
||||
nugetSha256 = "sha256-r5F44iwAV3QSeh3TyGTVhrN2oL4A68eD5dKiz/VnwdI=";
|
||||
nugetSha256 = "sha256-Aol10o5Q7l8s6SdX0smVdi3ec2IgAx+gMksAMjXhIfU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "F# source code formatter";
|
||||
|
||||
@ -48,5 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
# The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling.
|
||||
broken = stdenv.buildPlatform != stdenv.hostPlatform;
|
||||
};
|
||||
})
|
||||
|
||||
@ -5,30 +5,37 @@
|
||||
|
||||
let
|
||||
pname = "wtfis";
|
||||
version = "0.6.1";
|
||||
in python3.pkgs.buildPythonApplication {
|
||||
inherit pname version;
|
||||
|
||||
version = "0.7.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pirxthepilot";
|
||||
repo = "wtfis";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bHgv5+HoM1hFhpkqml+HxqiMDvKbMqsTH+zYtDrV7Ko=";
|
||||
hash = "sha256-X3e0icyhNPg8P6+N9k6a9WwBJ8bXRPdo3fj4cj+yY6w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# TODO: get rid of that newbie patch
|
||||
./000-pyproject-remove-versions.diff
|
||||
];
|
||||
in python3.pkgs.buildPythonApplication {
|
||||
inherit pname version src;
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3.pkgs.hatchling
|
||||
python3.pkgs.pydantic
|
||||
python3.pkgs.python-dotenv
|
||||
python3.pkgs.rich
|
||||
python3.pkgs.shodan
|
||||
python3.pkgs.python-dotenv
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pydantic"
|
||||
"python-dotenv"
|
||||
"requests"
|
||||
"rich"
|
||||
"shodan"
|
||||
"types-requests"
|
||||
];
|
||||
|
||||
meta = {
|
||||
82
pkgs/by-name/ze/zesarux/package.nix
Normal file
82
pkgs/by-name/ze/zesarux/package.nix
Normal file
@ -0,0 +1,82 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, SDL2
|
||||
, aalib
|
||||
, alsa-lib
|
||||
, libXext
|
||||
, libXxf86vm
|
||||
, libcaca
|
||||
, libpulseaudio
|
||||
, libsndfile
|
||||
, ncurses
|
||||
, openssl
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zesarux";
|
||||
version = "unstable-2023-10-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chernandezba";
|
||||
repo = "zesarux";
|
||||
rev = "02e734b088c3b880b2d260a9812404f029dfc92a";
|
||||
hash = "sha256-1PWFpUNekDKyCUNuV/cNUZ7hWGZBMu0nxswD6pap8pg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
aalib
|
||||
alsa-lib
|
||||
libXxf86vm
|
||||
libXext
|
||||
libcaca
|
||||
libpulseaudio
|
||||
libsndfile
|
||||
ncurses
|
||||
openssl
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./configure *.sh
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--prefix=${placeholder "out"}"
|
||||
"--c-compiler ${stdenv.cc.targetPrefix}cc"
|
||||
"--enable-cpustats"
|
||||
"--enable-memptr"
|
||||
"--enable-sdl2"
|
||||
"--enable-ssl"
|
||||
"--enable-undoc-scfccf"
|
||||
"--enable-visualmem"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
./generate_install_sh.sh
|
||||
patchShebangs ./install.sh
|
||||
./install.sh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/chernandezba/zesarux";
|
||||
description = "ZX Second-Emulator And Released for UniX";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nmrpflash";
|
||||
version = "0.9.21";
|
||||
version = "0.9.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jclehner";
|
||||
repo = "nmrpflash";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nW+VD2a0vmgODbJi4H8Esnq502bEkeCKjXQi23DfdqA=";
|
||||
sha256 = "sha256-gr/7tZYnuXFvfIUh2MmtgSbFoELTomQ4h05y/WFDhjo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
1471
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
1471
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, cargo
|
||||
, cmake
|
||||
, deltachat-repl
|
||||
, openssl
|
||||
, perl
|
||||
, pkg-config
|
||||
@ -17,30 +18,32 @@
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU=";
|
||||
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
|
||||
"iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo=";
|
||||
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
|
||||
};
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.121.0";
|
||||
version = "1.128.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA=";
|
||||
hash = "sha256-kujPkKKobn4/J0rCdZfnlNZzGM0SUVtOWOhyDawYiqw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./no-static-lib.patch
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
|
||||
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
|
||||
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
|
||||
"quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg=";
|
||||
};
|
||||
};
|
||||
cargoDeps = rustPlatform.importCargoLock cargoLock;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -67,8 +70,12 @@ stdenv.mkDerivation rec {
|
||||
cargoCheckHook
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
python = python3.pkgs.deltachat;
|
||||
passthru = {
|
||||
inherit cargoLock;
|
||||
tests = {
|
||||
inherit deltachat-repl;
|
||||
python = python3.pkgs.deltachat;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "podofo";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "podofo";
|
||||
repo = "podofo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Y5dpx0otX14Jig/O/oq+Sfdcia1a0bhT/6k8nwg+k5o=";
|
||||
hash = "sha256-BHTfidLn738f9kVIgzRTR4vY6fx5JPPtYNKvD7klyGw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
@ -329,7 +329,9 @@ let
|
||||
|
||||
qmake = callPackage ({ qtbase }: makeSetupHook {
|
||||
name = "qmake-hook";
|
||||
propagatedBuildInputs = [ qtbase.dev ];
|
||||
${if stdenv.buildPlatform == stdenv.hostPlatform
|
||||
then "propagatedBuildInputs"
|
||||
else "depsTargetTargetPropagated"} = [ qtbase.dev ];
|
||||
substitutions = {
|
||||
inherit debug;
|
||||
fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
|
||||
@ -354,6 +356,12 @@ let
|
||||
});
|
||||
|
||||
finalScope = baseScope.overrideScope(final: prev: {
|
||||
qttranslations = bootstrapScope.qttranslations;
|
||||
# qttranslations causes eval-time infinite recursion when
|
||||
# cross-compiling; disabled for now.
|
||||
qttranslations =
|
||||
if stdenv.buildPlatform == stdenv.hostPlatform
|
||||
then bootstrapScope.qttranslations
|
||||
else null;
|
||||
qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { };
|
||||
});
|
||||
in finalScope
|
||||
|
||||
@ -29,13 +29,18 @@
|
||||
, developerBuild ? false
|
||||
, decryptSslTraffic ? false
|
||||
, testers
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
let
|
||||
debugSymbols = debug || developerBuild;
|
||||
qtPlatformCross = plat: with plat;
|
||||
if isLinux
|
||||
then "linux-generic-g++"
|
||||
else throw "Please add a qtPlatformCross entry for ${plat.config}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation (finalAttrs: ({
|
||||
pname = "qtbase";
|
||||
inherit qtCompatVersion src version;
|
||||
debug = debugSymbols;
|
||||
@ -83,6 +88,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ]
|
||||
++ lib.optionals stdenv.isDarwin [ xcbuild ];
|
||||
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
|
||||
# `qtbase` expects to find `cc` (with no prefix) in the
|
||||
# `$PATH`, so the following is needed even if
|
||||
# `stdenv.buildPlatform.canExecute stdenv.hostPlatform`
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
} // {
|
||||
|
||||
propagatedNativeBuildInputs = [ lndir ];
|
||||
|
||||
# libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked
|
||||
@ -162,6 +174,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
|
||||
|
||||
./bin/syncqt.pl -version $version
|
||||
'' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
# QT's configure script will refuse to use pkg-config unless these two environment variables are set
|
||||
export PKG_CONFIG_SYSROOT_DIR=/
|
||||
export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib
|
||||
echo "QMAKE_LFLAGS=''${LDFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
|
||||
echo "QMAKE_CFLAGS=''${CFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
|
||||
echo "QMAKE_CXXFLAGS=''${CXXFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
@ -186,21 +205,34 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString ([
|
||||
"-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
|
||||
''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
|
||||
''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
|
||||
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
|
||||
] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString ([
|
||||
"-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Wno-warn=free-nonheap-object"
|
||||
"-Wno-free-nonheap-object"
|
||||
"-w"
|
||||
] ++ [
|
||||
''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
|
||||
''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
|
||||
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
|
||||
] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
|
||||
++ lib.optional stdenv.isLinux "-DUSE_X11"
|
||||
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
|
||||
# ignore "is only available on macOS 10.12.2 or newer" in obj-c code
|
||||
"-Wno-error=unguarded-availability"
|
||||
]
|
||||
++ lib.optionals withGtk3 [
|
||||
''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
|
||||
''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
|
||||
] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC");
|
||||
''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
|
||||
''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
|
||||
] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC");
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
|
||||
NIX_CFLAGS_COMPILE_FOR_BUILD = toString ([
|
||||
"-Wno-warn=free-nonheap-object"
|
||||
"-Wno-free-nonheap-object"
|
||||
"-w"
|
||||
]);
|
||||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
@ -209,6 +241,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# To prevent these failures, we need to override PostgreSQL detection.
|
||||
PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
|
||||
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
|
||||
configurePlatforms = [ ];
|
||||
} // {
|
||||
# TODO Remove obsolete and useless flags once the build will be totally mastered
|
||||
configureFlags = [
|
||||
"-plugindir $(out)/$(qtPluginPrefix)"
|
||||
@ -235,11 +270,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-L" "${icu.out}/lib"
|
||||
"-I" "${icu.dev}/include"
|
||||
"-pch"
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-device ${qtPlatformCross stdenv.hostPlatform}"
|
||||
"-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
||||
]
|
||||
++ lib.optional debugSymbols "-debug"
|
||||
++ lib.optionals developerBuild [
|
||||
"-developer-build"
|
||||
"-no-warnings-are-errors"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-no-warnings-are-errors"
|
||||
] ++ (if (!stdenv.hostPlatform.isx86_64) then [
|
||||
"-no-sse2"
|
||||
] else [
|
||||
@ -381,4 +421,4 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
})
|
||||
}))
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ qtModule, lib, python3, qtbase, qtsvg }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, qtModule, python3, qtbase, qtsvg }:
|
||||
|
||||
qtModule {
|
||||
pname = "qtdeclarative";
|
||||
@ -21,4 +23,10 @@ qtModule {
|
||||
"bin/qmlscene"
|
||||
"bin/qmltestrunner"
|
||||
];
|
||||
postFixup = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
mv $dev/bin/qmlformat $bin/bin/qmlformat
|
||||
mv $dev/bin/qmltyperegistrar $bin/bin/qmltyperegistrar
|
||||
ln -s $bin/bin/qmlformat $dev/bin/qmlformat
|
||||
ln -s $bin/bin/qmltyperegistrar $dev/bin/qmltyperegistrar
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ qtModule
|
||||
{ lib
|
||||
, stdenv
|
||||
, qtModule
|
||||
, qtbase
|
||||
, libwebp
|
||||
, jasper
|
||||
@ -8,5 +10,11 @@
|
||||
|
||||
qtModule {
|
||||
pname = "qtimageformats";
|
||||
propagatedBuildInputs = [ qtbase libwebp jasper libmng libtiff ];
|
||||
propagatedBuildInputs = [
|
||||
qtbase libwebp
|
||||
] ++ lib.optionals (!jasper.meta.broken) [
|
||||
jasper
|
||||
] ++ [
|
||||
libmng libtiff
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,7 +1,12 @@
|
||||
{ qtModule, qtbase, qtdeclarative }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, qtModule
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
pname = "qtwebchannel";
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "bin" ];
|
||||
}
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ qtModule
|
||||
, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
|
||||
|
||||
, bison, flex, git, gperf, ninja, pkg-config, python, which
|
||||
, bison, flex, git, gperf, ninja, pkg-config, python, which, python3
|
||||
, nodejs, qtbase, perl
|
||||
, buildPackages
|
||||
, pkgsBuildTarget
|
||||
, pkgsBuildBuild
|
||||
|
||||
, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
|
||||
, fontconfig, freetype, harfbuzz, icu, dbus, libdrm
|
||||
@ -27,12 +30,45 @@
|
||||
, pipewireSupport ? stdenv.isLinux
|
||||
, pipewire_0_2
|
||||
, postPatch ? ""
|
||||
, nspr
|
||||
, lndir
|
||||
, dbusSupport ? !stdenv.isDarwin, expat
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
let
|
||||
# qtwebengine expects to find an executable in $PATH which runs on
|
||||
# the build platform yet knows about the host `.pc` files. Most
|
||||
# configury allows setting $PKG_CONFIG to point to an
|
||||
# arbitrarily-named script which serves this purpose; however QT
|
||||
# insists that it is named `pkg-config` with no target prefix. So
|
||||
# we re-wrap the host platform's pkg-config.
|
||||
pkg-config-wrapped-without-prefix = stdenv.mkDerivation {
|
||||
name = "pkg-config-wrapper-without-target-prefix";
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
ln -s '${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' $out/bin/pkg-config
|
||||
'';
|
||||
};
|
||||
|
||||
qtPlatformCross = plat: with plat;
|
||||
if isLinux
|
||||
then "linux-generic-g++"
|
||||
else throw "Please add a qtPlatformCross entry for ${plat.config}";
|
||||
|
||||
in
|
||||
|
||||
qtModule ({
|
||||
pname = "qtwebengine";
|
||||
nativeBuildInputs = [
|
||||
bison flex git gperf ninja pkg-config python which gn nodejs
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
perl
|
||||
lndir (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase)
|
||||
pkgsBuildBuild.pkg-config
|
||||
(lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols)
|
||||
pkg-config-wrapped-without-prefix
|
||||
] ++ lib.optional stdenv.isDarwin xcbuild;
|
||||
doCheck = true;
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
@ -108,16 +144,25 @@ qtModule {
|
||||
--replace "-Wl,-fatal_warnings" ""
|
||||
'') + postPatch;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
|
||||
# with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
|
||||
"-Wno-class-memaccess"
|
||||
] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
|
||||
# it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
|
||||
# TODO: investigate and fix properly
|
||||
"-march=westmere"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-elaborated-enum-base"
|
||||
]);
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE =
|
||||
toString (
|
||||
lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-w "
|
||||
] ++ lib.optionals stdenv.cc.isGNU [
|
||||
# with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
|
||||
"-Wno-class-memaccess"
|
||||
] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
|
||||
# it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
|
||||
# TODO: investigate and fix properly
|
||||
"-march=westmere"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-elaborated-enum-base"
|
||||
]);
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
|
||||
NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch";
|
||||
"NIX_CFLAGS_LINK_${buildPackages.stdenv.cc.suffixSalt}" = "-Wl,--no-warn-search-mismatch";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
export NINJAFLAGS=-j$NIX_BUILD_CORES
|
||||
@ -125,10 +170,15 @@ qtModule {
|
||||
if [ -d "$PWD/tools/qmake" ]; then
|
||||
QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
|
||||
fi
|
||||
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
export QMAKE_CC=$CC
|
||||
export QMAKE_CXX=$CXX
|
||||
export QMAKE_LINK=$CXX
|
||||
export QMAKE_AR=$AR
|
||||
'';
|
||||
|
||||
qmakeFlags = [ "--" "-system-ffmpeg" ]
|
||||
++ lib.optional pipewireSupport "-webengine-webrtc-pipewire"
|
||||
++ lib.optional (pipewireSupport && stdenv.buildPlatform == stdenv.hostPlatform) "-webengine-webrtc-pipewire"
|
||||
++ lib.optional enableProprietaryCodecs "-proprietary-codecs";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -226,7 +276,9 @@ qtModule {
|
||||
dontUseNinjaBuild = true;
|
||||
dontUseNinjaInstall = true;
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
mkdir -p $out/libexec
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
cat > $out/libexec/qt.conf <<EOF
|
||||
[Paths]
|
||||
Prefix = ..
|
||||
@ -245,21 +297,32 @@ qtModule {
|
||||
|
||||
# qtwebengine-5.15.8: "QtWebEngine can only be built for x86,
|
||||
# x86-64, ARM, Aarch64, and MIPSel architectures."
|
||||
platforms =
|
||||
lib.trivial.pipe lib.systems.doubles.all [
|
||||
(map (double: lib.systems.elaborate { system = double; }))
|
||||
(lib.lists.filter (parsedPlatform: with parsedPlatform;
|
||||
isUnix &&
|
||||
(isx86_32 ||
|
||||
isx86_64 ||
|
||||
isAarch32 ||
|
||||
isAarch64 ||
|
||||
(isMips && isLittleEndian))))
|
||||
(map (plat: plat.system))
|
||||
];
|
||||
platforms = with lib.systems.inspect.patterns;
|
||||
let inherit (lib.systems.inspect) patternLogicalAnd;
|
||||
in concatMap (patternLogicalAnd isUnix) (lib.concatMap lib.toList [
|
||||
isx86_32
|
||||
isx86_64
|
||||
isAarch32
|
||||
isAarch64
|
||||
(patternLogicalAnd isMips isLittleEndian)
|
||||
]);
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
|
||||
# This build takes a long time; particularly on slow architectures
|
||||
timeout = 24 * 3600;
|
||||
};
|
||||
}
|
||||
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
|
||||
configurePlatforms = [ ];
|
||||
# to get progress output in `nix-build` and `nix build -L`
|
||||
preBuild = ''
|
||||
export TERM=dumb
|
||||
'';
|
||||
depsBuildBuild = [
|
||||
pkgsBuildBuild.stdenv
|
||||
zlib
|
||||
nss
|
||||
nspr
|
||||
];
|
||||
|
||||
})
|
||||
|
||||
@ -1,4 +1,13 @@
|
||||
{ lib, mkDerivation, perl, qmake, patches, srcs }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPackages
|
||||
, mkDerivation
|
||||
, perl
|
||||
, qmake
|
||||
, patches
|
||||
, srcs
|
||||
, pkgsHostTarget
|
||||
}:
|
||||
|
||||
let inherit (lib) licenses maintainers platforms; in
|
||||
|
||||
@ -14,10 +23,18 @@ mkDerivation (args // {
|
||||
inherit pname version src;
|
||||
patches = (args.patches or []) ++ (patches.${pname} or []);
|
||||
|
||||
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl qmake ];
|
||||
nativeBuildInputs =
|
||||
(args.nativeBuildInputs or []) ++ [
|
||||
perl qmake
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
pkgsHostTarget.qt5.qtbase.dev
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
(lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++
|
||||
(args.propagatedBuildInputs or []);
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ] ++ (args.depsBuildBuild or []);
|
||||
} // {
|
||||
|
||||
outputs = args.outputs or [ "out" "dev" ];
|
||||
setOutputFlags = args.setOutputFlags or false;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "accelerate";
|
||||
version = "0.23.0";
|
||||
version = "0.24.1";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pFkEgE1NGLPBW1CeGU0RJr+1Nj/y58ZcljyOnJuR47A=";
|
||||
hash = "sha256-DKyFb+4DUMhVUwr+sgF2IaJS9pEj2o2shGYwExfffWg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
, anywidget
|
||||
, ipython
|
||||
, pytestCheckHook
|
||||
, vega_datasets
|
||||
, vega-datasets
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
@ -51,7 +51,7 @@ buildPythonPackage rec {
|
||||
anywidget
|
||||
ipython
|
||||
sphinx
|
||||
vega_datasets
|
||||
vega-datasets
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -18,13 +18,13 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "argostranslate";
|
||||
version = "1.8.1";
|
||||
version = "1.9.1";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8eVmEHwsQ9/5NPmKJzZ4aX4nkh4+mna5K1BC+lXLXcE=";
|
||||
sha256 = "sha256-OlVrRfBhbJpIFjWdLQsn7zEteRP6UfkIpGT4Y933QKk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cleo";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-poetry";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-y9PYlGSPLpZl9Ad2AFuDKIopH0LRETLp35aiZtLcXzM=";
|
||||
hash = "sha256-reo/7aPFU5uvZ1YPRTJDRmcMSMFru8e5ss5YmjSe3QU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "formulaic";
|
||||
version = "0.6.4";
|
||||
version = "0.6.6";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "matthewwardrop";
|
||||
repo = "formulaic";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lpza5FDO/QOsiLYdxNT1o62lHfFeD6YahFz/zgH3K0I=";
|
||||
hash = "sha256-82+j3JAkjltXuzRhdvO4hoesSTWlNCY6w2mn6TsZqGM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
, torch
|
||||
, tqdm
|
||||
, transformers
|
||||
, vega_datasets
|
||||
, vega-datasets
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -118,7 +118,7 @@ buildPythonPackage rec {
|
||||
torch
|
||||
tqdm
|
||||
transformers
|
||||
vega_datasets
|
||||
vega-datasets
|
||||
];
|
||||
|
||||
# Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail).
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "2.2.10";
|
||||
version = "2.2.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AaEAI61MQCi1bUEc0xVNmDaVjXCPMvDIstIR/FuQ8aU=";
|
||||
hash = "sha256-8iR1OWFtgS15eezRacz6NjZTHXKCvn+4NpfnCfSHOV8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "optimum";
|
||||
version = "1.13.1";
|
||||
version = "1.13.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "optimum";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-heTyGgHC9tfS0hFv83sdxVApcXa63GQLG9Nwgi30GFo=";
|
||||
hash = "sha256-4bKQcltUr7q8wHfiRXQcK5dw0TrnMr9/bTNXeOyg7oA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peft";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FaD873ksim7ewOI6Wqcv+GuPmH45+yAvbJC1H/DSfI8=";
|
||||
hash = "sha256-XF7hjPuPoTioVIoiFhaMeyFYjHXmMwPVuJYDrCMUZwo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
, pyqt5_sip
|
||||
, pyqt-builder
|
||||
, libsForQt5
|
||||
, enableVerbose ? true
|
||||
, withConnectivity ? false
|
||||
, withMultimedia ? false
|
||||
, withWebKit ? false
|
||||
@ -19,6 +20,9 @@
|
||||
, withLocation ? false
|
||||
, withSerialPort ? false
|
||||
, withTools ? false
|
||||
, pkgsBuildTarget
|
||||
, buildPackages
|
||||
, dbusSupport ? !stdenv.isDarwin
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -45,6 +49,7 @@ buildPythonPackage rec {
|
||||
# be more verbose
|
||||
''
|
||||
cat >> pyproject.toml <<EOF
|
||||
'' + lib.optionalString enableVerbose ''
|
||||
[tool.sip.project]
|
||||
verbose = true
|
||||
''
|
||||
@ -55,6 +60,37 @@ buildPythonPackage rec {
|
||||
minimum-macos-version = "11.0"
|
||||
'' + ''
|
||||
EOF
|
||||
''
|
||||
|
||||
# pyqt-builder tries to compile *and run* these programs. This
|
||||
# is really sad because the only thing they do is print out a
|
||||
# flag based on whether or not some compile-time symbol was
|
||||
# defined. This could all be done without having to *execute*
|
||||
# cross-compiled programs!
|
||||
#
|
||||
# Here is the complete list of things checked:
|
||||
#
|
||||
# QT_NO_PRINTDIALOG => PyQt_PrintDialog
|
||||
# QT_NO_PRINTER => PyQt_Printer
|
||||
# QT_NO_PRINTPREVIEWDIALOG => PyQt_PrintPreviewDialog
|
||||
# QT_NO_PRINTPREVIEWWIDGET => PyQt_PrintPreviewWidget
|
||||
# QT_NO_SSL => PyQt_SSL
|
||||
# QT_SHARED || QT_DLL => shared (otherwise static)
|
||||
# QT_NO_PROCESS => PyQt_Process
|
||||
# QT_NO_FPU || Q_PROCESSOR_ARM || Q_OS_WINCE => PyQt_qreal_double
|
||||
# sizeof (qreal) != sizeof (double) => PyQt_qreal_double
|
||||
# !Q_COMPILER_CONSTEXPR !Q_COMPILER_UNIFORM_INIT => PyQt_CONSTEXPR
|
||||
# QT_NO_ACCESSIBILITY => PyQt_Accessibility
|
||||
# QT_NO_OPENGL => PyQt_OpenGL PyQt_Desktop_OpenGL
|
||||
# defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_ES_3) => PyQt_Desktop_OpenGL
|
||||
# QT_NO_RAWFONT => PyQt_RawFont
|
||||
# QT_NO_SESSIONMANAGER => PyQt_SessionManager
|
||||
#
|
||||
+ lib.optionalString (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) ''
|
||||
rm config-tests/cfgtest_QtCore.cpp
|
||||
rm config-tests/cfgtest_QtGui.cpp
|
||||
rm config-tests/cfgtest_QtNetwork.cpp
|
||||
rm config-tests/cfgtest_QtPrintSupport.cpp
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -68,16 +104,27 @@ buildPythonPackage rec {
|
||||
export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"
|
||||
'';
|
||||
|
||||
# tons of warnings from subpackages, no point in playing whack-a-mole
|
||||
env = lib.optionalAttrs (!enableVerbose) {
|
||||
NIX_CFLAGS_COMPILE = "-w";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
nativeBuildInputs = with libsForQt5; [
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qmake
|
||||
] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
libsForQt5.qmake
|
||||
] ++ [
|
||||
setuptools
|
||||
lndir
|
||||
sip
|
||||
] ++ (with pkgsBuildTarget.targetPackages.libsForQt5; [
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
qmake
|
||||
] ++ [
|
||||
qtbase
|
||||
qtsvg
|
||||
qtdeclarative
|
||||
@ -90,11 +137,13 @@ buildPythonPackage rec {
|
||||
++ lib.optional withLocation qtlocation
|
||||
++ lib.optional withSerialPort qtserialport
|
||||
++ lib.optional withTools qttools
|
||||
;
|
||||
);
|
||||
|
||||
buildInputs = with libsForQt5; [
|
||||
dbus
|
||||
] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
qtbase
|
||||
] ++ [
|
||||
qtsvg
|
||||
qtdeclarative
|
||||
pyqt-builder
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ lib, stdenv, pythonPackages, fetchPypi, pkg-config
|
||||
, qmake, qtbase, qtsvg, qtwebengine
|
||||
, qmake, qtbase, qtsvg, qtwebengine, qtwebchannel, qtdeclarative
|
||||
, wrapQtAppsHook
|
||||
, darwin
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 sip pyqt-builder;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
in buildPythonPackage rec {
|
||||
in buildPythonPackage (rec {
|
||||
pname = "PyQtWebEngine";
|
||||
version = "5.15.4";
|
||||
format = "pyproject";
|
||||
@ -29,12 +30,18 @@ in buildPythonPackage rec {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qmake
|
||||
] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
sip
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
buildPackages.python3Packages.sip
|
||||
] ++ [
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwebengine
|
||||
pyqt-builder
|
||||
pythonPackages.setuptools
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
qtdeclarative
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
autoSignDarwinBinariesHook
|
||||
];
|
||||
@ -44,6 +51,9 @@ in buildPythonPackage rec {
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwebengine
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
qtwebchannel
|
||||
qtdeclarative
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pyqt5 ];
|
||||
@ -71,6 +81,13 @@ in buildPythonPackage rec {
|
||||
description = "Python bindings for Qt5";
|
||||
homepage = "http://www.riverbankcomputing.co.uk";
|
||||
license = licenses.gpl3;
|
||||
platforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms;
|
||||
hydraPlatforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms;
|
||||
};
|
||||
}
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
|
||||
# TODO: figure out why the env hooks aren't adding these inclusions automatically
|
||||
env.NIX_CFLAGS_COMPILE =
|
||||
lib.concatStringsSep " " [
|
||||
"-I${lib.getDev qtbase}/include/QtPrintSupport/"
|
||||
"-I${lib.getDev qtwebchannel}/include/QtWebChannel/"
|
||||
];
|
||||
})
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, click-plugins
|
||||
, cligj
|
||||
, certifi
|
||||
, cython
|
||||
, cython_3
|
||||
, fetchFromGitHub
|
||||
, gdal
|
||||
, hypothesis
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rasterio";
|
||||
version = "1.3.8";
|
||||
version = "1.3.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -37,11 +37,11 @@ buildPythonPackage rec {
|
||||
owner = "rasterio";
|
||||
repo = "rasterio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8kPzUvTZ/jRDXlYMAZkG1xdLAQuzxnvHXBzwWizMOTo=";
|
||||
hash = "sha256-Tp6BSU33FaszrIXQgU0Asb7IMue0C939o/atAKz+3Q4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
cython_3
|
||||
gdal
|
||||
numpy
|
||||
oldest-supported-numpy
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, aplpy
|
||||
, astropy
|
||||
, astropy-helpers
|
||||
, buildPythonPackage
|
||||
, casa-formats-io
|
||||
, dask
|
||||
@ -17,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spectral-cube";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0Fr9PvUShi04z8SUsZE7zHuXZWg4rxt6gwSBb6lr2Pc=";
|
||||
hash = "sha256-7wfvsravSkAGkTtuPE01wPW7wEHKVWT8kYQn93Q2B4M=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@ -47,6 +46,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests must be run in the build directory.
|
||||
preCheck = ''
|
||||
cd build/lib
|
||||
'';
|
||||
|
||||
# On x86_darwin, this test fails with "Fatal Python error: Aborted"
|
||||
# when sandbox = true.
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
||||
@ -63,7 +67,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ smaret ];
|
||||
# Tests fail to start, according to Hydra
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "timm";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "pytorch-image-models";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mJzKDRc7husSpunlu12gnx9WErI6oEcEyCtrpkKbPBs=";
|
||||
hash = "sha256-PyrJhyJmuF7BZzlQ4f5fiJY5fYFC1JPRLto5ljPVbY4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
44
pkgs/development/python-modules/vega-datasets/default.nix
Normal file
44
pkgs/development/python-modules/vega-datasets/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vega-datasets";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "vega_datasets";
|
||||
inherit version;
|
||||
hash = "sha256-nb6YNCCOjsMqtElw3zFd6RAoYeTNoT2OFDqreoDZP8A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pandas ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--doctest-modules"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"vega_datasets"
|
||||
];
|
||||
|
||||
meta = with lib; let
|
||||
tag = removeSuffix ".0" "v${version}";
|
||||
in {
|
||||
description = "A Python package for offline access to vega datasets";
|
||||
homepage = "https://github.com/altair-viz/vega_datasets";
|
||||
changelog = "https://github.com/altair-viz/vega_datasets/blob/${tag}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pandas, pytest }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vega_datasets";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9dbe9834208e8ec32ab44970df315de9102861e4cda13d8e143aab7a80d93fc0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pandas ];
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test vega_datasets --doctest-modules -k 'not column_names'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python package for offline access to vega datasets";
|
||||
homepage = "https://github.com/altair-viz/vega_datasets";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "x-wr-timezone";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "niccokunzmann";
|
||||
repo = "x-wr-timezone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vUhAq6b5I0gYbXmbElxSSL6Mu9BSLs0uT5gb8zXdmpg=";
|
||||
hash = "sha256-9B1gXabpZsJSHYUHLu6bBGidO3C5m/I0oOc5U/mbX0I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "x_wr_timezone" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/niccokunzmann/x-wr-timezone/blob/${src.rev}/README.rst#changelog";
|
||||
description = "Convert calendars using X-WR-TIMEZONE to standard ones";
|
||||
homepage = "https://github.com/niccokunzmann/x-wr-timezone";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "test/test.py" ];
|
||||
@ -51,5 +51,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/kislyuk/yq";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ womfoo SuperSandro2000 ];
|
||||
mainProgram = "yq";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,26 +2,25 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.1.104";
|
||||
version = "0.1.117";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iTizgA3MtcG6YN7aHaZF4UXT6jBKodsMxXG61UgDNaQ=";
|
||||
hash = "sha256-cB1t7TKAqHuzbvrXkOMJPXtNXTqNB/TBDS3OHYX96ko=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5Nu9XpYjlZHGazWTK7LmfnEGgewKa017PLHtV9HycD0=";
|
||||
vendorHash = "sha256-+mCOSgRmvfAXHwtLup3vYhLY0zTtXIJeOtYD69B4/7o=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/superfly/flyctl/internal/buildinfo.commit=${src.rev}"
|
||||
"-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z"
|
||||
"-X github.com/superfly/flyctl/internal/buildinfo.environment=production"
|
||||
"-X github.com/superfly/flyctl/internal/buildinfo.version=${version}"
|
||||
"-X github.com/superfly/flyctl/internal/buildinfo.buildVersion=${version}"
|
||||
];
|
||||
tags = ["production"];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://linuxcontainers.org/lxcfs/news/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -785,6 +785,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# https://github.com/systemd/systemd/issues/20600#issuecomment-912338965
|
||||
broken = stdenv.hostPlatform.isStatic;
|
||||
priority = 10;
|
||||
maintainers = with maintainers; [ flokli kloenk mic92 ];
|
||||
maintainers = with maintainers; [ flokli kloenk ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dnsdist";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
|
||||
hash = "sha256-BfNW/M4pxOzgPC2N8Eat/zqqsLA21oAcGjEcbVuzwH8=";
|
||||
hash = "sha256-ZojwmyxS+b+TXwdp9O4o3Qdg5WItreez9Ob6N3bwerg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "riemann";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-MjTUrqdi9K71PhpLzR3lqdOiNM7Ilmh8HWf3BUOr+b0=";
|
||||
sha256 = "sha256-w3Uv+RMHhw1/G0wkygfLbazeinZqrbxVL4NFmy1/RgQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -152,6 +152,10 @@ let
|
||||
# lots of interesting corner cases. Only expected to work for
|
||||
# x86_64-linux buildPlatform.
|
||||
pkgs.pkgsMusl.pkgsCross.gnu64.hello
|
||||
|
||||
# Two web browsers -- exercises almost the entire packageset
|
||||
pkgs.pkgsCross.aarch64-multiplatform.qt5.qutebrowser
|
||||
pkgs.pkgsCross.aarch64-multiplatform.firefox
|
||||
];
|
||||
|
||||
in {
|
||||
|
||||
@ -1,19 +1,27 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, gh-ost }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "gh-ost";
|
||||
version = "1.1.5";
|
||||
version = "1.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "gh-ost";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FTWKbZ/32cr/BUI+jtV0HYlWDFz+R2YQd6ZSzilDj64=";
|
||||
hash = "sha256-dTz4w+OJXe2+ygsYsQ9tanDyaMXvdh8W3d8xpjQMapI=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/github/gh-ost";
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" "-X main.BuildDescribe=${src.rev}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.AppVersion=${version}"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = gh-ost;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Triggerless online schema migration solution for MySQL";
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
diff -Naur source-old/pyproject.toml source-new/pyproject.toml
|
||||
--- source-old/pyproject.toml 1980-01-02 00:00:00.000000000 -0300
|
||||
+++ source-new/pyproject.toml 2023-02-04 10:09:48.087418202 -0300
|
||||
@@ -29,11 +29,11 @@
|
||||
"Topic :: Security",
|
||||
]
|
||||
dependencies = [
|
||||
- "pydantic~=1.10.2",
|
||||
- "python-dotenv~=0.21.0",
|
||||
- "requests~=2.28.1",
|
||||
- "rich~=12.6.0",
|
||||
- "shodan~=1.28.0",
|
||||
+ "pydantic",
|
||||
+ "python-dotenv",
|
||||
+ "requests",
|
||||
+ "rich",
|
||||
+ "shodan",
|
||||
]
|
||||
dynamic = ["version"]
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
"mypy",
|
||||
"pytest",
|
||||
"pytest-cov",
|
||||
- "types-requests~=2.28.1",
|
||||
+ "types-requests",
|
||||
]
|
||||
[tool.hatch.envs.default.scripts]
|
||||
typecheck = "mypy -p {args:wtfis}"
|
||||
@ -2833,8 +2833,6 @@ with pkgs;
|
||||
|
||||
yapesdl = callPackage ../applications/emulators/yapesdl { };
|
||||
|
||||
zesarux = callPackage ../applications/emulators/zesarux { };
|
||||
|
||||
zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
|
||||
zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { };
|
||||
|
||||
@ -41756,8 +41754,6 @@ with pkgs;
|
||||
|
||||
undaemonize = callPackage ../tools/system/undaemonize { };
|
||||
|
||||
wtfis = callPackage ../tools/networking/wtfis { };
|
||||
|
||||
houdini = callPackage ../applications/misc/houdini { };
|
||||
|
||||
openfst = callPackage ../development/libraries/openfst { };
|
||||
|
||||
@ -424,6 +424,7 @@ mapAliases ({
|
||||
uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
|
||||
uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13
|
||||
validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07
|
||||
vega_datasets = vega-datasets; # added 2023-11-04
|
||||
ViennaRNA = viennarna; # added 2023-08-23
|
||||
virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07
|
||||
Wand = wand; # added 2022-11-13
|
||||
|
||||
@ -12904,9 +12904,7 @@ self: super: with self; {
|
||||
|
||||
skidl = callPackage ../development/python-modules/skidl { };
|
||||
|
||||
skl2onnx = callPackage ../development/python-modules/skl2onnx {
|
||||
protobuf = protobuf3;
|
||||
};
|
||||
skl2onnx = callPackage ../development/python-modules/skl2onnx { };
|
||||
|
||||
sklearn-deap = callPackage ../development/python-modules/sklearn-deap { };
|
||||
|
||||
@ -15373,7 +15371,7 @@ self: super: with self; {
|
||||
|
||||
vega = callPackage ../development/python-modules/vega { };
|
||||
|
||||
vega_datasets = callPackage ../development/python-modules/vega_datasets { };
|
||||
vega-datasets = callPackage ../development/python-modules/vega-datasets { };
|
||||
|
||||
venstarcolortouch = callPackage ../development/python-modules/venstarcolortouch { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user