mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 13:29:00 +02:00
Merge staging-next into staging
This commit is contained in:
commit
31e936ab93
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mympd";
|
||||
version = "14.0.1";
|
||||
version = "14.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-wgrTkUpWx7YG8V9nyr+RHDBOz1TFA0p2OWDXG64BVjs=";
|
||||
sha256 = "sha256-tyNX/bPKg4aWDnSrzymdcz5ZbTlyowuoizm6kQngHj8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchFromSourcehut
|
||||
, fetchpatch
|
||||
, SDL2
|
||||
, alsa-lib
|
||||
, appstream
|
||||
|
@ -170,6 +171,15 @@ stdenv.mkDerivation rec {
|
|||
zstd
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix gcc-13 build failure
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://gitlab.zrythm.org/zrythm/zrythm/-/commit/cbc2b3715b939718479631841f2d9703fb28e6da.diff";
|
||||
hash = "sha256-2ZTSaCtSO3yynJVFe5B1AEjWhjRa5YyA26ergAfdL5Y=";
|
||||
})
|
||||
];
|
||||
|
||||
# Zrythm uses meson to build, but requires cmake for dependency detection.
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
|
|
@ -757,7 +757,7 @@ let
|
|||
name = "ruff";
|
||||
publisher = "charliermarsh";
|
||||
version = "2023.60.0";
|
||||
sha256 = "sha256-zxE4QcWt8M6djTbdIf0YNSpeF1w7vMK4/BW5ArCOYbE=";
|
||||
sha256 = "sha256-qgwud2gzHLHID45VxDlngFMoks5O3pTHQe+Q7bdf8+I=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
@ -6,20 +6,19 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "browsr";
|
||||
version = "1.17.1";
|
||||
format = "pyproject";
|
||||
version = "1.18.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juftin";
|
||||
repo = "browsr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FExDKugFP94C3zMnR1V4QDPWeM2OtRH2ei0LNs3h06c=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ygqoz1rNQwhU1/8NsHwQsSCqQ8gYwHEaAuIaVMCtKKA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
hatchling
|
||||
pythonRelaxDepsHook
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -48,18 +47,31 @@ python3.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest-textual-snapshot
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"art"
|
||||
"pandas"
|
||||
"pymupdf"
|
||||
"rich-click"
|
||||
"rich-pixels"
|
||||
"rich"
|
||||
"textual"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "browsr" ];
|
||||
pythonImportsCheck = [
|
||||
"browsr"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--snapshot-update"
|
||||
];
|
||||
|
||||
# requires internet access
|
||||
disabledTests = [
|
||||
# Tests require internet access
|
||||
"test_github_screenshot"
|
||||
"test_github_screenshot_license"
|
||||
"test_textual_app_context_path_github"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waylock";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
repo = "waylock";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-RSAUSlsBB9IphvdSiFqJIvyhhJoAKKb+KyGhdoTa3vs=";
|
||||
hash = "sha256-wvZrRPZobDh+rB3RSaRrz0xDHuYwT2eoQEu3AbYKn8Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -38,8 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
zigBuildFlags = [ "-Dman-pages" ];
|
||||
|
||||
passthru.updateScript = ./update.nu;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ifreund/waylock";
|
||||
homepage = "https://codeberg.org/ifreund/waylock";
|
||||
changelog = "https://codeberg.org/ifreund/waylock/releases/tag/v${finalAttrs.version}";
|
||||
description = "A small screenlocker for Wayland compositors";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ adamcstephens jordanisaacs ];
|
||||
|
|
5
pkgs/applications/misc/waylock/update.nu
Executable file
5
pkgs/applications/misc/waylock/update.nu
Executable file
|
@ -0,0 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i nu -p nushell common-updater-scripts
|
||||
|
||||
let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last
|
||||
update-source-version waylock $latest_tag
|
|
@ -1,23 +1,23 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, gpm, openssl, pkg-config, libev # Misc.
|
||||
, libpng, libjpeg, libtiff, librsvg # graphic formats
|
||||
, libpng, libjpeg, libtiff, librsvg, libavif # graphic formats
|
||||
, bzip2, zlib, xz # Transfer encodings
|
||||
, enableFB ? true
|
||||
, enableFB ? (!stdenv.isDarwin)
|
||||
, enableDirectFB ? false, directfb
|
||||
, enableX11 ? true, libX11, libXt, libXau # GUI support
|
||||
, enableX11 ? (!stdenv.isDarwin), libX11, libXt, libXau # GUI support
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.29";
|
||||
pname = "links2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/download/links-${version}.tar.bz2";
|
||||
sha256 = "sha256-IqqWwLOOGm+PftnXpBZ6R/w3JGCXdZ72BZ7Pj56teZg=";
|
||||
url = "${finalAttrs.meta.homepage}/download/links-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-IqqWwLOOGm+PftnXpBZ6R/w3JGCXdZ72BZ7Pj56teZg=";
|
||||
};
|
||||
|
||||
buildInputs = with lib;
|
||||
[ libev librsvg libpng libjpeg libtiff openssl xz bzip2 zlib ]
|
||||
[ libev librsvg libpng libjpeg libtiff libavif openssl xz bzip2 zlib ]
|
||||
++ optionals stdenv.isLinux [ gpm ]
|
||||
++ optionals enableX11 [ libX11 libXau libXt ]
|
||||
++ optionals enableDirectFB [ directfb ];
|
||||
|
@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional enableFB "--with-fb"
|
||||
++ lib.optional enableDirectFB "--with-directfb";
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://links.twibright.com/";
|
||||
description = "A small browser with some graphics support";
|
||||
|
@ -38,4 +42,4 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -2,22 +2,22 @@
|
|||
let
|
||||
versions =
|
||||
if stdenv.isLinux then {
|
||||
stable = "0.0.42";
|
||||
stable = "0.0.43";
|
||||
ptb = "0.0.67";
|
||||
canary = "0.0.267";
|
||||
canary = "0.0.277";
|
||||
development = "0.0.13";
|
||||
} else {
|
||||
stable = "0.0.292";
|
||||
ptb = "0.0.96";
|
||||
canary = "0.0.401";
|
||||
development = "0.0.27";
|
||||
stable = "0.0.294";
|
||||
ptb = "0.0.97";
|
||||
canary = "0.0.416";
|
||||
development = "0.0.30";
|
||||
};
|
||||
version = versions.${branch};
|
||||
srcs = rec {
|
||||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-7can15JhBc6OJAWZMk8uEdt/D1orCKG1MN1WBdTZrI0=";
|
||||
hash = "sha256-DO8bS5luSKhKW6sJZhz4xVeIPexQVoaD4xYugHCN3uk=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
|
@ -25,7 +25,7 @@ let
|
|||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-Hq78SDer7Gb+ju8wk9DrMLisHnoYoSwTzrs8PKhbS3s=";
|
||||
hash = "sha256-AOhwBr/bOKAQtQ41oaYxU/2708Rt5arBzjpGdWUnHZU=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
|
@ -35,19 +35,19 @@ let
|
|||
x86_64-darwin = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
|
||||
hash = "sha256-1BKMIWSb7+oQ+B80GUCslKn5VNdM0hPTNyZkI/RsxhM=";
|
||||
hash = "sha256-OzaAHCGusctuQk2uzJhCQCTI6SNRGQZXbQ0FgPZLV8w=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
|
||||
hash = "sha256-dG0Wcx8X2+kzrpacFZmMCXfLsuLOLbDK4qVLAMzd4RA=";
|
||||
hash = "sha256-nONU9TZAWtxqh5PpvgsvaEHESOKhMYGTe184EgCNxHQ=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
|
||||
hash = "sha256-fz/LDQJ/B8luN6Ffobp82hnycBOLg9Kdi0kXLGltCDc=";
|
||||
hash = "sha256-3Vl5qQihUqyQdHnM/968xaCPIM6P6ImLQAiWKXwYnps=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
|
||||
hash = "sha256-MRCBPe98Czm1OG2l3c1GAW4a27fV8XMtQ9pPIJMgqzA=";
|
||||
hash = "sha256-ffTIfurfYprKAJbOOGzzxCfGQofiVy+Q0NmEJ59ENk4=";
|
||||
};
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megahit";
|
||||
|
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1r5d9nkdmgjsbrpj43q9hy3s8jwsabaz3ji561v18hy47v58923c";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gcc-13 build failure:
|
||||
# https://github.com/voutcn/megahit/pull/366
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/voutcn/megahit/commit/4cb2f793503087163bda8592222f105f27e33e66.patch";
|
||||
hash = "sha256-b5mhzif+OPcMjmg+BnaUc5CB6Acn/KTBOJEw+WYEhbs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
|
|
|
@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ zlib bzip2 xz ];
|
||||
|
||||
postPatch = ''
|
||||
# Fix gcc-13 build failure due to missing includes
|
||||
sed -e '1i #include <cstdint>' -i \
|
||||
SeqLib/src/non_api/Histogram.h \
|
||||
src/svaba/Histogram.h
|
||||
'';
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: ./libfml.a(rle.o):/build/source/SeqLib/fermi-lite/rle.h:33: multiple definition of
|
||||
|
|
|
@ -11,24 +11,24 @@ with lib;
|
|||
|
||||
let
|
||||
pname = "gitkraken";
|
||||
version = "9.11.1";
|
||||
version = "9.12.0";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
hash = "sha256-DTnVsVWOPAcG2O87dS6PwAB+VU0ijulELHe9CnOLYPU=";
|
||||
hash = "sha256-g2YcNFKt1/YBmEOH3Z5b0MPMMOWBIvXh+V2fzaGgCgQ=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
|
||||
hash = "sha256-JkmQYk+t4ACkK3V0IxrrIcheBWJEkxQzf9ZYRWs769c=";
|
||||
hash = "sha256-yy7BbtguQj/LVM7ivNTcG97XIImQUMQPKwTVDWGvvnQ=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
|
||||
hash = "sha256-jWXvDSyM7A3+cer/yPvom9f0w2nGJmwOJ22qoQzRWGQ=";
|
||||
hash = "sha256-ihnTzQC7B0TdHZzXmrwcVSfxKvGoBBTdRq8ZJicaVDI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "got";
|
||||
version = "0.95";
|
||||
version = "0.96";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-5on9ff76OAFmoaKTwVM0hUCGLiAZGJzt6+jCx2Nygg4=";
|
||||
hash = "sha256-/R7r6IJtgkuNQwoLxys/1HcXW+l3PVkjnPXphFpAFTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config bison ]
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
|
@ -37,6 +38,23 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-dgScbfyulZPlrngqSw7xwipldoRd8uFO8VP9mlJyhQ8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gcc-13 build:
|
||||
# https://github.com/NatronGitHub/Natron/pull/929
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/NatronGitHub/Natron/commit/4b44fb18293035873b35c3a2d2aa29da78cb8740.patch";
|
||||
includes = ["Global/GlobalDefines.h"];
|
||||
hash = "sha256-9E1tJCvO7zA1iQAhrlL3GaBFIGpkjxNOr31behQXdhQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/NatronGitHub/Natron/commit/f21f58622e32c1684567c82e2ab361f33030bda7.patch";
|
||||
includes = ["Engine/Noise.cpp"];
|
||||
hash = "sha256-t2mzTsRuXVs8d1BB/5uAY1OPxWRa3JTK1iAWLAMsrgs=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DNATRON_SYSTEM_LIBS=ON" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, rustPlatform
|
||||
, libiconv
|
||||
|
@ -11,29 +10,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atuin";
|
||||
version = "18.0.0";
|
||||
version = "18.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "atuin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2nBaGoaTd1TGm8aZnrNA66HkW7+OrD6gOmj+uSFz020=";
|
||||
hash = "sha256-fuVSn1vhKn2+Tw5f6zBYHFW3QSL4eisZ6d5pxsj5hh4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/atuinsh/atuin/pull/1694
|
||||
(fetchpatch {
|
||||
name = "0001-atuin_src_command_client_search_interactive.rs.patch";
|
||||
url = "https://github.com/atuinsh/atuin/commit/6bc38f4cf3c8d2b6fbd135998a4e64e6abfb2566.patch";
|
||||
hash = "sha256-pUiuECiAmq7nmKO/cOHZ1V5Iy3zDzZyBNNCH7Czo/NA=";
|
||||
})
|
||||
];
|
||||
|
||||
# TODO: unify this to one hash because updater do not support this
|
||||
cargoHash =
|
||||
if stdenv.isLinux
|
||||
then "sha256-Y+49R/foid+V83tY3bqf644OkMPukJxg2/ZVfJxDaFg="
|
||||
else "sha256-gT2JRzBAF4IsXVv1Hvo6kr9qrNE/3bojtULCx6YawhA=";
|
||||
then "sha256-lHWgsVnjSeBmd7O4Fn0pUtTn4XbkBOAouaRHRozil50="
|
||||
else "sha256-LxfpllzvgUu7ZuD97n3W+el3bdOt5QGXzJbDQ0w8seo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -60,7 +50,7 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip=registration"
|
||||
# No such file or directory (os error 2)
|
||||
"--skip=sync"
|
||||
# further failing tests
|
||||
# PermissionDenied (Operation not permitted)
|
||||
"--skip=change_password"
|
||||
"--skip=multi_user_test"
|
||||
];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "invidtui";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkhz";
|
||||
repo = "invidtui";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3F/JWdYjb3Wtd2eBkEmId3SCVapu2gCgLFowK59RXRc=";
|
||||
hash = "sha256-/HsoV8HdMffD7dzRblSSBMv7kBPRpxUarM5WZoYVxvQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rwKx3h0X7RfIZ9lE/4TJoK0BR6f/lPcLNFbQjUtq/Tk=";
|
||||
vendorHash = "sha256-T/muFaQQp/joOCehNZQc5CWmyGakoRaGAsO2mTOODJA=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
}:
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "srm-cuarzo";
|
||||
version = "0.5.1-1";
|
||||
version = "0.5.2-1";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-+Qn/obgYHWceQN0T3mbGjs/psj+lg43gm/cCBoMnRUk=";
|
||||
hash = "sha256-FMd1v0K+H7DlSD0osmWrnuSKqQZxw3RUZq8JwZFm/f4=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit (self) rev hash;
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
{ darwin }:
|
||||
{
|
||||
buildInputs ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
postPatch = ''
|
||||
if [ "$pname" == "flutter-tools" ]; then
|
||||
# Remove impure references to `arch` and use arm64 instead of arm64e.
|
||||
substituteInPlace lib/src/ios/xcodeproj.dart \
|
||||
--replace-fail /usr/bin/arch '${darwin.adv_cmds}/bin/arch' \
|
||||
--replace-fail arm64e arm64
|
||||
fi
|
||||
'';
|
||||
}
|
|
@ -1,4 +1,6 @@
|
|||
{ systemPlatform
|
||||
{ lib
|
||||
, stdenv
|
||||
, systemPlatform
|
||||
, buildDartApplication
|
||||
, git
|
||||
, which
|
||||
|
@ -7,6 +9,7 @@
|
|||
, flutterSrc
|
||||
, patches ? [ ]
|
||||
, pubspecLock
|
||||
, darwin
|
||||
}:
|
||||
|
||||
buildDartApplication.override { inherit dart; } rec {
|
||||
|
@ -21,7 +24,15 @@ buildDartApplication.override { inherit dart; } rec {
|
|||
inherit patches;
|
||||
# The given patches are made for the entire SDK source tree.
|
||||
prePatch = ''pushd "$NIX_BUILD_TOP/source"'';
|
||||
postPatch = ''popd'';
|
||||
postPatch = ''
|
||||
popd
|
||||
''
|
||||
# Remove impure references to `arch` and use arm64 instead of arm64e.
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace lib/src/ios/xcodeproj.dart \
|
||||
--replace-fail /usr/bin/arch '${darwin.adv_cmds}/bin/arch' \
|
||||
--replace-fail arm64e arm64
|
||||
'';
|
||||
|
||||
# When the JIT snapshot is being built, the application needs to run.
|
||||
# It attempts to generate configuration files, and relies on a few external
|
||||
|
|
|
@ -136,7 +136,7 @@ let
|
|||
'';
|
||||
homepage = "https://flutter.dev";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
maintainers = with maintainers; [ babariviere ericdallo FlafyDev hacker1024 ];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -13,7 +13,7 @@ index 1ce1951cef..1bd7602318 100644
|
|||
+ 'x86_64-linux' => HostPlatform.linux_x64,
|
||||
+ 'aarch64-linux' => HostPlatform.linux_arm64,
|
||||
+ 'x86_64-darwin' => HostPlatform.darwin_x64,
|
||||
+ 'arm64-darwin' => HostPlatform.darwin_arm64,
|
||||
+ 'aarch64-darwin' => HostPlatform.darwin_arm64,
|
||||
+ String value => throw ArgumentError.value(value, 'NIX_FLUTTER_HOST_PLATFORM', 'Unknown Nix host platform!'),
|
||||
+ };
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ let
|
|||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
|
||||
derivations =
|
||||
|
|
|
@ -13,42 +13,50 @@
|
|||
"android": {
|
||||
"x86_64-linux": "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y=",
|
||||
"aarch64-linux": "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y=",
|
||||
"x86_64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ="
|
||||
"x86_64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ=",
|
||||
"aarch64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ="
|
||||
},
|
||||
"fuchsia": {
|
||||
"x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
|
||||
"aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
|
||||
"x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
|
||||
"x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
|
||||
"aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
|
||||
},
|
||||
"ios": {
|
||||
"x86_64-linux": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=",
|
||||
"aarch64-linux": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=",
|
||||
"x86_64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao="
|
||||
"x86_64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=",
|
||||
"aarch64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao="
|
||||
},
|
||||
"linux": {
|
||||
"x86_64-linux": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs=",
|
||||
"aarch64-linux": "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M=",
|
||||
"x86_64-darwin": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs="
|
||||
"x86_64-darwin": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs=",
|
||||
"aarch64-darwin": "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M="
|
||||
},
|
||||
"macos": {
|
||||
"x86_64-linux": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=",
|
||||
"aarch64-linux": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=",
|
||||
"x86_64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc="
|
||||
"x86_64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=",
|
||||
"aarch64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc="
|
||||
},
|
||||
"universal": {
|
||||
"x86_64-linux": "sha256-wATt1UPjo/fh7RFO1vvcUAdo0dMAaaOUIuzYodsM0v0=",
|
||||
"aarch64-linux": "sha256-Z9bszNaIpCccG7OfvE5WFsw36dITiyCQAZ6p29+Yq68=",
|
||||
"x86_64-darwin": "sha256-qN5bAXRfQ78TWF3FLBIxWzUB5y5OrZVQTEilY5J/+2k="
|
||||
"x86_64-darwin": "sha256-qN5bAXRfQ78TWF3FLBIxWzUB5y5OrZVQTEilY5J/+2k=",
|
||||
"aarch64-darwin": "sha256-mSpAPKyP9v0dbkXqYkzGOnD5OEjRZigiRElXXcHZ5TE="
|
||||
},
|
||||
"web": {
|
||||
"x86_64-linux": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=",
|
||||
"aarch64-linux": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=",
|
||||
"x86_64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0="
|
||||
"x86_64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=",
|
||||
"aarch64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0="
|
||||
},
|
||||
"windows": {
|
||||
"x86_64-linux": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=",
|
||||
"aarch64-linux": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=",
|
||||
"x86_64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI="
|
||||
"x86_64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=",
|
||||
"aarch64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI="
|
||||
}
|
||||
},
|
||||
"pubspecLock": {
|
||||
|
|
|
@ -13,41 +13,49 @@
|
|||
"android": {
|
||||
"aarch64-linux": "sha256-j8jstEE1RsTVHJbq6f6We0An+CyJz9JH/YClyNA4mwg=",
|
||||
"x86_64-darwin": "sha256-0FBI0CGMcxyttkzrdyjJlkGAjFd/yMuAQS3pDrNXZZw=",
|
||||
"aarch64-darwin": "sha256-0FBI0CGMcxyttkzrdyjJlkGAjFd/yMuAQS3pDrNXZZw=",
|
||||
"x86_64-linux": "sha256-j8jstEE1RsTVHJbq6f6We0An+CyJz9JH/YClyNA4mwg="
|
||||
},
|
||||
"fuchsia": {
|
||||
"aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
|
||||
"x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
|
||||
"aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
|
||||
"x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
|
||||
},
|
||||
"ios": {
|
||||
"aarch64-linux": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=",
|
||||
"x86_64-darwin": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=",
|
||||
"aarch64-darwin": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=",
|
||||
"x86_64-linux": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw="
|
||||
},
|
||||
"linux": {
|
||||
"aarch64-linux": "sha256-LWpou3L7bAWGn8i4nDT/BZez2Uhf/LbqC2C4Z98hCHQ=",
|
||||
"x86_64-darwin": "sha256-BzjmO4F8B9GagYPbdvoT55r+YgZcP4BUaKgJPGZDXOU=",
|
||||
"aarch64-darwin": "sha256-LWpou3L7bAWGn8i4nDT/BZez2Uhf/LbqC2C4Z98hCHQ=",
|
||||
"x86_64-linux": "sha256-BzjmO4F8B9GagYPbdvoT55r+YgZcP4BUaKgJPGZDXOU="
|
||||
},
|
||||
"macos": {
|
||||
"aarch64-linux": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=",
|
||||
"x86_64-darwin": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=",
|
||||
"aarch64-darwin": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=",
|
||||
"x86_64-linux": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk="
|
||||
},
|
||||
"universal": {
|
||||
"aarch64-linux": "sha256-uB2YZRjioP/koMbPvaBHsezjPO0w5a+BpxZaDuiINIY=",
|
||||
"x86_64-darwin": "sha256-Qwf12gMqrW5nDC9Is08oxWTbKMptRQRAIb58JETq3xA=",
|
||||
"aarch64-darwin": "sha256-Emus5J3mqPv47PD6xqNUD1KpXhVkX4JpURWuYG6KC14=",
|
||||
"x86_64-linux": "sha256-quSFKx7TZRJpK+4YDt5f9jwr7rZsSsaXMxhJ8vIcczQ="
|
||||
},
|
||||
"web": {
|
||||
"aarch64-linux": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=",
|
||||
"x86_64-darwin": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=",
|
||||
"aarch64-darwin": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=",
|
||||
"x86_64-linux": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw="
|
||||
},
|
||||
"windows": {
|
||||
"aarch64-linux": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=",
|
||||
"x86_64-darwin": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=",
|
||||
"aarch64-darwin": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=",
|
||||
"x86_64-linux": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU="
|
||||
}
|
||||
},
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, nix-update-script }:
|
||||
|
||||
let
|
||||
basis_universal = fetchFromGitHub {
|
||||
|
@ -7,14 +7,14 @@ let
|
|||
rev = "8903f6d69849fd782b72a551a4dd04a264434e20";
|
||||
hash = "sha256-o3dCxAAkpMoNkvkM7qD75cPn/obDc/fJ8u7KLPm1G6g=";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "meshoptimizer";
|
||||
version = "unstable-2023-03-22";
|
||||
version = "0.20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeux";
|
||||
repo = "meshoptimizer";
|
||||
hash = "sha256-OWeptdnKFvTyfkz0sFCpiTI7323GfVE8vb8bNUBnslA=";
|
||||
rev = "49d9222385daf61a9ce75bb4699472408eb3df3e";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QCxpM2g8WtYSZHkBzLTJNQ/oHb5j/n9rjaVmZJcCZIA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -27,6 +27,8 @@ in stdenv.mkDerivation {
|
|||
] ++ lib.optional (!stdenv.hostPlatform.isStatic)
|
||||
"-DMESHOPT_BUILD_SHARED_LIBS:BOOL=ON";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mesh optimization library that makes meshes smaller and faster to render";
|
||||
homepage = "https://github.com/zeux/meshoptimizer";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost, asio, openssl, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, asio, openssl, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nuraft";
|
||||
|
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-puO8E7tSLqB0oq/NlzEZqQgIZKm7ZUb4HhR0XuI9dco=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gcc-13 build failure:
|
||||
# https://github.com/eBay/NuRaft/pull/435
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/eBay/NuRaft/commit/fddf33a4d8cd7fcd0306cc838a30893a4df3d58f.patch";
|
||||
hash = "sha256-JOtR3llE4QwQM7PBx+ILR87zsPB0GZ/aIKbSdHIrePA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ boost asio openssl zlib ];
|
||||
|
||||
|
|
|
@ -211,8 +211,14 @@ let
|
|||
url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch";
|
||||
sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "qtwebkit-libxml2-api-change.patch";
|
||||
url = "https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch";
|
||||
sha256 = "WZEj+UuKhgJBM7auhND3uddk1wWdTY728jtiWVe7CSI=";
|
||||
})
|
||||
./qtwebkit.patch
|
||||
./qtwebkit-icu68.patch
|
||||
./qtwebkit-cstdint.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
|
|
11
pkgs/development/libraries/qt-5/5.15/qtwebkit-cstdint.patch
Normal file
11
pkgs/development/libraries/qt-5/5.15/qtwebkit-cstdint.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
diff -up qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h
|
||||
--- qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me 2023-02-20 15:40:04.045911245 +0100
|
||||
+++ qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h 2023-02-20 15:40:39.038549787 +0100
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <algorithm>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
+#include <cstdint>
|
||||
|
||||
namespace gl
|
||||
{
|
|
@ -8,8 +8,9 @@
|
|||
, dot-merlin-reader
|
||||
, spawn
|
||||
, ocamlc-loc
|
||||
, odoc-parser
|
||||
, merlin-lib
|
||||
, astring
|
||||
, camlp-streams
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
@ -21,7 +22,7 @@ buildDunePackage rec {
|
|||
++ lib.optional (lib.versionAtLeast version "1.9") spawn
|
||||
++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ]
|
||||
++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc
|
||||
++ lib.optional (lib.versionAtLeast version "1.16.2") [ odoc-parser merlin-lib ];
|
||||
++ lib.optionals (lib.versionAtLeast version "1.17.0") [ astring camlp-streams merlin-lib ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
, ocaml
|
||||
, version ?
|
||||
if lib.versionAtLeast ocaml.version "4.14" then
|
||||
"1.16.2"
|
||||
"1.17.0"
|
||||
else if lib.versionAtLeast ocaml.version "4.13" then
|
||||
"1.10.5"
|
||||
else if lib.versionAtLeast ocaml.version "4.12" then
|
||||
|
@ -19,10 +19,10 @@
|
|||
}:
|
||||
|
||||
let params = {
|
||||
"1.16.2" = {
|
||||
"1.17.0" = {
|
||||
name = "lsp";
|
||||
minimalOCamlVersion = "4.14";
|
||||
sha256 = "sha256-FIfVpOLy1PAjNBBYVRvbi6hsIzZ7fFtP3aOqfcAqrsQ=";
|
||||
sha256 = "sha256-j7i71xfu/SYItNg0WBBbZg4N46ETTcj8IWrmWdTRlgA=";
|
||||
};
|
||||
"1.14.2" = {
|
||||
name = "lsp";
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
, ocaml
|
||||
, version ?
|
||||
if lib.versionAtLeast ocaml.version "4.14" then
|
||||
"1.16.2"
|
||||
"1.17.0"
|
||||
else if lib.versionAtLeast ocaml.version "4.13" then
|
||||
"1.10.5"
|
||||
else if lib.versionAtLeast ocaml.version "4.12" then
|
||||
|
|
|
@ -26,9 +26,7 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "mirumee";
|
||||
repo = "ariadne";
|
||||
# https://github.com/mirumee/ariadne/issues/1157
|
||||
#rev = "refs/tags/${version}";
|
||||
rev = "refs/tags/022.0";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GMBtW2gZbF1m0BrKhYEkSaZYt5tIGmP/ipy6WC1H1pg=";
|
||||
};
|
||||
|
||||
|
|
42
pkgs/development/python-modules/myuplink/default.nix
Normal file
42
pkgs/development/python-modules/myuplink/default.nix
Normal file
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "myuplink";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pajzo";
|
||||
repo = "myuplink";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wFtFRoT8JKBik5rmdZfz5CQlK4loseOovHfa08uVBo4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"myuplink"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to interact with the myUplink API";
|
||||
homepage = "https://github.com/pajzo/myuplink";
|
||||
changelog = "https://github.com/pajzo/myuplink/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -14,7 +14,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "posthog";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
@ -24,7 +24,7 @@ buildPythonPackage {
|
|||
owner = "PostHog";
|
||||
repo = "posthog-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ziqUXQdmzKdrwbk7iYwCbNg+jiXiB9l3QaosY5VA3YA=";
|
||||
hash = "sha256-vqq8yCfIDaCWcWwpr8ogdDpmZY4lPcDwoNV33W664pc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -0,0 +1,56 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, jinja2
|
||||
, pytest
|
||||
, rich
|
||||
, pythonOlder
|
||||
, syrupy
|
||||
, textual
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-textual-snapshot";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Textualize";
|
||||
repo = "pytest-textual-snapshot";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XkXeyodRdwWqCP63Onx82Z3IbNLDDR/Lvaw8xUY7fAg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
rich
|
||||
syrupy
|
||||
textual
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytest_textual_snapshot"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Snapshot testing for Textual applications";
|
||||
homepage = "https://github.com/Textualize/pytest-textual-snapshot";
|
||||
changelog = "https://github.com/Textualize/pytest-textual-snapshot/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stem";
|
||||
version = "1.8.3-unstable-2024-02-11";
|
||||
version = "1.8.3-unstable-2024-02-13";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "torproject";
|
||||
repo = "stem";
|
||||
rev = "9f1fa4ac53cf83a4cdd7155cc487212bf8bc08af";
|
||||
hash = "sha256-AMyF4ir9Utb91dp1Swheyw1zQH6ZvgyW9kFp1g9JoQQ=";
|
||||
rev = "9a9c7d43a7fdcde6d4a9cf95b831fb5e5923a160";
|
||||
hash = "sha256-Oc73Jx31SLzuhT9Iym5HHszKfflKZ+3aky5flXudvmI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -5,7 +5,7 @@ set -eu -o pipefail
|
|||
|
||||
source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix
|
||||
|
||||
version="2.11.0"
|
||||
version="2.11.2"
|
||||
|
||||
nix-update python311Packages.types-aiobotocore --commit --build
|
||||
|
||||
|
|
|
@ -20,6 +20,14 @@ in buildDunePackage rec {
|
|||
hash = "sha256-u8TgaoeDaDLenu3s1Km/Kh85WHMtvUy7C7Q+OY588Ss=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Update tests for dune 3.14 https://github.com/tarides/dune-release/pull/486
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tarides/dune-release/commit/fd0e11cb6d9db2acd772f5cadfb94c72bbcf67a8.patch";
|
||||
hash = "sha256-At24bduds6UwGKGs8cqOn1qaZKElP9TPMSNPimMd1zQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs;
|
||||
buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core
|
||||
rresult logs odoc bos yojson astring fpath ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, ocaml, findlib, darwin, ocaml-lsp }:
|
||||
{ lib, stdenv, fetchurl, ocaml, findlib, darwin, ocaml-lsp, dune-release }:
|
||||
|
||||
if lib.versionOlder ocaml.version "4.08"
|
||||
then throw "dune 3 is not available for OCaml ${ocaml.version}"
|
||||
|
@ -6,11 +6,11 @@ else
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dune";
|
||||
version = "3.13.1";
|
||||
version = "3.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
|
||||
hash = "sha256-L+CvG0z5hknHVVtVXZ9PgdXe2HcYqJ30mI4hSlbIqRY=";
|
||||
hash = "sha256-9NCdiRYmIf3/QkwlP6UMSSDSF5+1s9Heure76Xxosvw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit ocaml-lsp;
|
||||
inherit ocaml-lsp dune-release;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -27,6 +27,16 @@ let
|
|||
sha256 = "WIaJkSQnoOm9T7GoAwmWl7fNg79coIo/ILUsWcbH+lA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# gcc-13 build fix:
|
||||
# https://github.com/TES3MP/CrabNet/pull/18
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/TES3MP/CrabNet/commit/3ec9a338a7cefd5cc751c9d29095cafa4c73be20.patch";
|
||||
hash = "sha256-zE87icjX9GSnApgKQXj0K4IjlrReV/upFLjVgNYkNfM=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCRABNET_ENABLE_DLL=OFF"
|
||||
];
|
||||
|
@ -88,9 +98,18 @@ let
|
|||
'';
|
||||
|
||||
patches = [
|
||||
# glibc-2.34 support
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch";
|
||||
sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw=";
|
||||
hash = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw=";
|
||||
})
|
||||
|
||||
# gcc-13 build fix:
|
||||
# https://github.com/TES3MP/TES3MP/pull/674
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/TES3MP/TES3MP/commit/7921f71a79e96f817a2009100e5105a7948b3fe2.patch";
|
||||
hash = "sha256-mpxuOSPA2xixgBeYXsxutEUI7VJL5PxAeZgaNU7YkJQ=";
|
||||
})
|
||||
|
||||
# https://github.com/TES3MP/openmw-tes3mp/issues/552
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
openrct2-version = "0.4.7";
|
||||
openrct2-version = "0.4.8";
|
||||
|
||||
# Those versions MUST match the pinned versions within the CMakeLists.txt
|
||||
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
|
||||
|
@ -43,7 +43,7 @@ let
|
|||
owner = "OpenRCT2";
|
||||
repo = "OpenRCT2";
|
||||
rev = "v${openrct2-version}";
|
||||
hash = "sha256-2nSzXbZH1o+BEaxhdQTCM/u4Qbun4tqBKjQ4z7owHeg=";
|
||||
hash = "sha256-jSKAgohNMHuyOu4gUHyyZf1I7UrsXGDV5XwwK1DQPyM=";
|
||||
};
|
||||
|
||||
objects-src = fetchFromGitHub {
|
||||
|
|
|
@ -3269,9 +3269,10 @@
|
|||
aiohttp-fast-url-dispatcher
|
||||
aiohttp-zlib-ng
|
||||
fnv-hash-fast
|
||||
myuplink
|
||||
psutil-home-assistant
|
||||
sqlalchemy
|
||||
]; # missing inputs: myuplink
|
||||
];
|
||||
"nad" = ps: with ps; [
|
||||
nad-receiver
|
||||
];
|
||||
|
@ -6250,6 +6251,7 @@
|
|||
"mysensors"
|
||||
"mystrom"
|
||||
"mythicbeastsdns"
|
||||
"myuplink"
|
||||
"nam"
|
||||
"namecheapdns"
|
||||
"nanoleaf"
|
||||
|
|
|
@ -21,15 +21,15 @@ let
|
|||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
hash = {
|
||||
aarch64-darwin = "sha256-l2HS1/HoKYf93qKxfMU80J3QOXjMRtX2A9hJm8E2Kh4=";
|
||||
aarch64-linux = "sha256-ab5xavO2TVL1j9vqNv97bgAmQLZQJxnbam08DzdgDVE=";
|
||||
x86_64-darwin = "sha256-nXas2i2eq7qdTFV0S+F5sPuqzSwE4qeJ+ms4fcJgZmQ=";
|
||||
x86_64-linux = "sha256-HltmiQSJSwoW5+iEiXlJiCWwKRmuxDBcPbvOkJwLQXA=";
|
||||
aarch64-darwin = "sha256-fYIHpO36nnWZlhS5ExOeLIBTUV7RSQlImdQjiRIzpGU=";
|
||||
aarch64-linux = "sha256-vnJiC5lUVMEl0SLLiKrY1nrZf9Lc89x7+GgqdeuXUFs=";
|
||||
x86_64-darwin = "sha256-aba1OR7I5fDr1WmgK5gxwtt/5c8FCuR/U0XOD3I4oEM=";
|
||||
x86_64-linux = "sha256-8yESqqILrYZXhOPXLrlEVkQca0MYRfzKO+GtFqyLeGs=";
|
||||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "1.10.5.4116";
|
||||
version = "1.13.3.4273";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snac2";
|
||||
version = "2.46";
|
||||
version = "2.47";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "grunfink";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-t2o1aNgVl5dKmwOO9W7mn2uIf/rrbag476y3H3ugCfc=";
|
||||
hash = "sha256-zK8Ypdp8kP4E3p04BAkTjcMiKtCQTtdDWArK/f1QhJw=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl openssl ];
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }:
|
||||
|
||||
let
|
||||
version = "4.3.2";
|
||||
version = "4.3.3";
|
||||
|
||||
versionParts = lib.take 2 (lib.splitVersion version);
|
||||
# 4.2 -> 402, 3.11 -> 311
|
||||
|
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz";
|
||||
hash = "sha256-CR+UVIPknk4yGqemx6V7qdCRW5uWdp2VnnxJS+I35N0=";
|
||||
hash = "sha256-yFrD277bO25O5GeXVG4VhKO/oH9dsgqoTsrlMZoXHbI=";
|
||||
};
|
||||
|
||||
phpConfig = writeText "config.php" ''
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wit-bindgen";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wit-bindgen";
|
||||
rev = "wit-bindgen-cli-${version}";
|
||||
hash = "sha256-QqLTXvzBobDsdwo30yUFK2bHedawiYPni2zhKk6I7j8=";
|
||||
hash = "sha256-eFJkr/RqQdULPquCVbjhR8843aGjeEnUCF/Ws2U5fQk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-R2F/6f9BRN9omLFBQbP5Vi3szWifEyLMHMILFzLN0cU=";
|
||||
cargoHash = "sha256-934lHOXzE2cLW6LMM0AQl/GJt4wSIKZlY1C7gmjGVrc=";
|
||||
|
||||
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
|
||||
# However, GitHub Actions ensures a proper build.
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
# Don't forget to update go.d.plugin.nix as well
|
||||
version = "1.44.0";
|
||||
version = "1.44.3";
|
||||
pname = "netdata";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
|
|||
repo = "netdata";
|
||||
rev = "v${version}";
|
||||
hash = if withCloudUi
|
||||
then "sha256-8kkOpMfcYPcHI3GuevZ2NYjJjlZvrvBgIs883Zsztgw="
|
||||
else "sha256-Kui3sV8OzBri4h47qD10snQgdvdi6yi/2z4cXWREcxE=";
|
||||
then "sha256-ahWaq6geEoc6NZ2oU/Dqnb0bjRXd+q1zaRGOSIYVYok="
|
||||
else "sha256-2Kvh2WuoJjJxsFKueMjCAbazqZdzoOTxakbPVsj9PBo=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
# Remove v2 dashboard distributed under NCUL1. Make sure an empty
|
||||
|
|
|
@ -8189,6 +8189,8 @@ self: super: with self; {
|
|||
|
||||
myst-parser = callPackage ../development/python-modules/myst-parser { };
|
||||
|
||||
myuplink = callPackage ../development/python-modules/myuplink { };
|
||||
|
||||
n3fit = callPackage ../development/python-modules/n3fit { };
|
||||
|
||||
nad-receiver = callPackage ../development/python-modules/nad-receiver { };
|
||||
|
@ -11721,6 +11723,8 @@ self: super: with self; {
|
|||
|
||||
pytest-testmon = callPackage ../development/python-modules/pytest-testmon { };
|
||||
|
||||
pytest-textual-snapshot = callPackage ../development/python-modules/pytest-textual-snapshot { };
|
||||
|
||||
pytest-timeout = callPackage ../development/python-modules/pytest-timeout { };
|
||||
|
||||
pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
|
||||
|
|
Loading…
Reference in a new issue