Merge staging-next into staging
This commit is contained in:
commit
435d3aef59
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, squashfsTools, closureInfo
|
||||
{ lib, stdenv, squashfsTools, closureInfo
|
||||
|
||||
, # The root directory of the squashfs filesystem is filled with the
|
||||
# closures of the Nix store paths listed here.
|
||||
|
@ -22,11 +22,13 @@ stdenv.mkDerivation {
|
|||
# for nix-store --load-db.
|
||||
cp $closureInfo/registration nix-path-registration
|
||||
|
||||
'' + lib.optionalString stdenv.buildPlatform.is32bit ''
|
||||
# 64 cores on i686 does not work
|
||||
# fails with FATAL ERROR: mangle2:: xz compress failed with error code 5
|
||||
if ((NIX_BUILD_CORES > 48)); then
|
||||
NIX_BUILD_CORES=48
|
||||
fi
|
||||
'' + ''
|
||||
|
||||
# Generate the squashfs image.
|
||||
mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
, alsa-lib
|
||||
, qtbase
|
||||
, writeText
|
||||
, makeWrapper
|
||||
, buildPackages
|
||||
}:
|
||||
let
|
||||
# Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
|
||||
wrapBinary = writeText "wrapBinary" ''
|
||||
source ${makeWrapper}/nix-support/setup-hook
|
||||
source ${buildPackages.makeWrapper}/nix-support/setup-hook
|
||||
for p in $FILES; do
|
||||
workpath=$PWD
|
||||
cd -- "$(dirname "$p")"
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
, libsndfile
|
||||
, alsa-lib
|
||||
, writeText
|
||||
, makeWrapper
|
||||
, buildPackages
|
||||
, which
|
||||
}:
|
||||
let
|
||||
# Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
|
||||
wrapBinary = writeText "wrapBinary" ''
|
||||
source ${makeWrapper}/nix-support/setup-hook
|
||||
source ${buildPackages.makeWrapper}/nix-support/setup-hook
|
||||
for p in $FILES; do
|
||||
workpath=$PWD
|
||||
cd -- "$(dirname "$p")"
|
||||
|
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "furnace";
|
||||
version = "0.6pre7";
|
||||
version = "0.6pre8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tildearrow";
|
||||
repo = "furnace";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-Gr4XDfYaRUFdtnCJ6i0oRDszwAZYVW6Mbj4Sp7El5+8=";
|
||||
sha256 = "sha256-kV3XlZAVkb+SfGqBi7I7Br58zjSAfh4kiUk2KCcXnFA=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
|
|
|
@ -31,12 +31,12 @@
|
|||
let
|
||||
gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb";
|
||||
in
|
||||
vscode-utils.buildVscodeMarketplaceExtension rec {
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "cpptools";
|
||||
publisher = "ms-vscode";
|
||||
version = "1.11.0";
|
||||
sha256 = "c0725d3914aeb2515627691727455cc27e7a75031fa02ca957be02cc210bd64d";
|
||||
version = "1.17.3";
|
||||
sha256 = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg=";
|
||||
arch = "linux-x64";
|
||||
};
|
||||
|
||||
|
|
70
pkgs/applications/graphics/trimage/default.nix
Normal file
70
pkgs/applications/graphics/trimage/default.nix
Normal file
|
@ -0,0 +1,70 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
|
||||
, python3
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, wrapQtAppsHook
|
||||
|
||||
, advancecomp
|
||||
, jpegoptim
|
||||
, optipng
|
||||
, pngcrush
|
||||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]);
|
||||
binPath = lib.makeBinPath [
|
||||
advancecomp
|
||||
jpegoptim
|
||||
optipng
|
||||
pngcrush
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "trimage";
|
||||
version = "1.0.7-dev";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kilian";
|
||||
repo = "Trimage";
|
||||
rev = "ad74684272a31eee6af289cc59fd90fd962d2806";
|
||||
hash = "sha256-jdcGGTqr3f3Xnp6thYmASQYiZh9nagLUTmlFnJ5Hqmc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -R trimage $out
|
||||
|
||||
installManPage doc/trimage.1
|
||||
install -Dm444 desktop/trimage.desktop -t $out/share/applications
|
||||
install -Dm444 desktop/trimage.svg -t $out/share/icons/hicolor/scalable/apps
|
||||
|
||||
makeWrapper ${pythonEnv}/bin/python $out/bin/trimage \
|
||||
--add-flags "$out/trimage/trimage.py" \
|
||||
--prefix PATH : ${binPath} \
|
||||
"''${qtWrapperArgs[@]}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A cross-platform tool for optimizing PNG and JPG files";
|
||||
homepage = "https://github.com/Kilian/Trimage";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "trimage";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
};
|
||||
}
|
|
@ -12,13 +12,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cartridges";
|
||||
version = "2.1.1";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kra-mo";
|
||||
repo = "cartridges";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-jycTLKTHKhxd4t+3NB23Tf1oAvqiDHHsNmS6uLikgGA=";
|
||||
sha256 = "sha256-LCO3GSRNi1alP9rRwBAfVAF49i4FmhsMOG9LW4PGB3s=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
{ buildGoModule, fetchFromSourcehut, lib }:
|
||||
buildGoModule rec {
|
||||
pname = "ratt";
|
||||
version = "unstable-2022-01-11";
|
||||
version = "unstable-2023-02-12";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ghost08";
|
||||
repo = "ratt";
|
||||
rev = "eac7e14b15ad4e916e7d072780397c414c740630";
|
||||
hash = "sha256-/WzPF98MovNg4t5NJhL2Z1bAFDG/3I56M9YgRJF7Wjk=";
|
||||
rev = "ed1a675685b9d86d6602e168199ba9b4260f5f06";
|
||||
hash = "sha256-HfS97Lxt6FAj/2/WAzLI06F/h6TP5m2lHHOTAs8XNFY=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-4TEdnJ7lCuBka6rtoKowf5X3VqCgfwvGHeJ5B5Q5C20=";
|
||||
vendorHash = "sha256-6cpHDwnxdc/9YPj77JVuT5ZDFjKkF6nBX4RgZr/9fFY=";
|
||||
|
||||
# tests try to access the internet to scrape websites
|
||||
doCheck = false;
|
||||
|
@ -21,6 +21,5 @@ buildGoModule rec {
|
|||
homepage = "https://git.sr.ht/~ghost08/ratt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kmein ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slweb";
|
||||
version = "0.6.1";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~strahinja";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TZxnJEBodRdZzL96Ichs+oiXVltF2HXVUKDETBQcIaI=";
|
||||
sha256 = "sha256-Y7w3yVqA8MNJJ3OcGaeziydZyzF0bap41Il6eE/Hu40=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ redo-apenwarr ];
|
||||
|
|
|
@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "Ekleog";
|
||||
repo = "todiff";
|
||||
rev = version;
|
||||
sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm";
|
||||
hash = "sha256-leXAmurYjsM/DLe44kLvLwWAs183K96DsRMtrKZFG/g=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0vrn1vc3rwabv6l2r1qb7mkcxbp75q79bfl3rxhyi51ra3ij507r";
|
||||
cargoHash = "sha256-+YAi41A5lOhhz4O6lQ4u567OZj0Lhyyo2UvxPNgONm8=";
|
||||
|
||||
checkFeatures = [ "integration_tests" ];
|
||||
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "waypaper";
|
||||
version = "1.2";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anufrievroman";
|
||||
repo = "waypaper";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wD3DtxP4aUwIn+EoM3s1Y9VNEcUGhtyugNBEFHI9eqw=";
|
||||
hash = "sha256-lK4TygR9cwEHcnrC0E5vE7Jor6afEiM9TmEgGXj+hNA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, fetchzip, fetchFromGitHub, python3
|
||||
{ stdenv, lib, fetchurl, fetchzip, python3
|
||||
, wrapQtAppsHook, glib-networking
|
||||
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
|
||||
, libxslt, gst_all_1 ? null
|
||||
|
@ -8,16 +8,14 @@
|
|||
, pipewireSupport ? stdenv.isLinux
|
||||
, pipewire
|
||||
, qtwayland
|
||||
, mkDerivationWith ? null
|
||||
, qtbase ? null
|
||||
, qtwebengine ? null
|
||||
, wrapGAppsHook ? null
|
||||
, qtbase
|
||||
, qtwebengine
|
||||
, wrapGAppsHook
|
||||
, enableWideVine ? false
|
||||
, widevine-cdm
|
||||
}: let
|
||||
isQt6 = mkDerivationWith == null;
|
||||
}:
|
||||
|
||||
python3Packages = python3.pkgs;
|
||||
let
|
||||
pdfjs = let
|
||||
version = "3.9.179";
|
||||
in
|
||||
|
@ -27,40 +25,21 @@
|
|||
stripRoot = false;
|
||||
};
|
||||
|
||||
backendPackage =
|
||||
if backend == "webengine" then if isQt6 then python3Packages.pyqt6-webengine else python3Packages.pyqtwebengine else
|
||||
if backend == "webkit" then python3Packages.pyqt5_with_qtwebkit else
|
||||
throw ''
|
||||
Unknown qutebrowser backend "${backend}".
|
||||
Valid choices are qtwebengine (recommended) or qtwebkit.
|
||||
'';
|
||||
|
||||
buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication;
|
||||
|
||||
pname = "qutebrowser";
|
||||
version = if isQt6 then "unstable-2023-04-18" else "2.5.4";
|
||||
version = "3.0.0";
|
||||
in
|
||||
|
||||
assert withMediaPlayback -> gst_all_1 != null;
|
||||
assert isQt6 -> backend != "webkit";
|
||||
assert lib.assertMsg (backend != "webkit") ''
|
||||
Support for the QtWebKit backend has been removed.
|
||||
Please remove the `backend = "webkit"` option from your qutebrowser override.
|
||||
'';
|
||||
|
||||
buildPythonApplication {
|
||||
python3.pkgs.buildPythonApplication {
|
||||
inherit pname version;
|
||||
|
||||
src = if isQt6 then
|
||||
# comes from the master branch of upstream
|
||||
# https://github.com/qutebrowser/qutebrowser/issues/7202
|
||||
# https://github.com/qutebrowser/qutebrowser/discussions/7628
|
||||
fetchFromGitHub {
|
||||
owner = "qutebrowser";
|
||||
repo = "qutebrowser";
|
||||
rev = "d4cafc0019a4a5574caa11966fc40ede89076d26";
|
||||
hash = "sha256-Ma79EPvnwmQkeXEG9aSnD/Vt1DGhK2JX9dib7uARH8M=";
|
||||
}
|
||||
# the release tarballs are different from the git checkout!
|
||||
else fetchurl {
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-pGCyICUn5CpnDCbSJdn6ZBfQkswfFvOpXnvJXdicGrE=";
|
||||
hash = "sha256-Oer0p/DwUfOejUCgSCSkMvLLAjNyJx51qgN7bcQQ2Pw=";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
@ -77,20 +56,18 @@ buildPythonApplication {
|
|||
nativeBuildInputs = [
|
||||
wrapQtAppsHook wrapGAppsHook asciidoc
|
||||
docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
|
||||
]
|
||||
++ lib.optional isQt6 python3Packages.pygments;
|
||||
python3.pkgs.pygments
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; ([
|
||||
pyyaml backendPackage jinja2 pygments
|
||||
propagatedBuildInputs = with python3.pkgs; ([
|
||||
pyyaml pyqtwebengine jinja2 pygments
|
||||
# scripts and userscripts libs
|
||||
tldextract beautifulsoup4
|
||||
readability-lxml pykeepass stem
|
||||
pynacl
|
||||
# extensive ad blocking
|
||||
adblock
|
||||
]
|
||||
++ lib.optional (pythonOlder "3.9") importlib-resources
|
||||
++ lib.optional stdenv.isLinux qtwayland
|
||||
] ++ lib.optional stdenv.isLinux qtwayland
|
||||
);
|
||||
|
||||
patches = [
|
||||
|
@ -100,10 +77,6 @@ buildPythonApplication {
|
|||
dontWrapGApps = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preConfigure = lib.optionalString isQt6 ''
|
||||
python scripts/asciidoc2html.py
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
|
||||
|
||||
|
@ -141,10 +114,7 @@ buildPythonApplication {
|
|||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
"''${qtWrapperArgs[@]}"
|
||||
--add-flags '--backend ${backend}'
|
||||
--set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}"
|
||||
${lib.optionalString isQt6 ''--set QUTE_QT_WRAPPER "PyQt6"''}
|
||||
${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''}
|
||||
${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''}
|
||||
${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''}
|
||||
)
|
||||
'';
|
||||
|
@ -153,7 +123,7 @@ buildPythonApplication {
|
|||
homepage = "https://github.com/qutebrowser/qutebrowser";
|
||||
description = "Keyboard-focused browser with a minimal GUI";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = if enableWideVine then [ "x86_64-linux" ] else backendPackage.meta.platforms;
|
||||
platforms = if enableWideVine then [ "x86_64-linux" ] else qtwebengine.meta.platforms;
|
||||
maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda nrdxp ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -25,23 +25,23 @@
|
|||
};
|
||||
"kicad-unstable" = {
|
||||
kicadVersion = {
|
||||
version = "2023-06-24";
|
||||
version = "2023-08-15";
|
||||
src = {
|
||||
rev = "1c1849ec1a6614247abe4c623c086def2b3192e0";
|
||||
sha256 = "0faf4fw7nrfwdrl4pjqdyfzqbvb9jd4nk4aq83v1w358yqyk7zg9";
|
||||
rev = "e0d4cf2d5b023a7e5b70d854452376aa3510acd8";
|
||||
sha256 = "0666j4q3vz24smcjw9m4ib3ca2dqiqgx2amhv7ys4rzqb6v2pvn2";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "2023-06-24";
|
||||
version = "2023-08-15";
|
||||
libSources = {
|
||||
symbols.rev = "43456780d309682f6da4a6f14710355b06fc4c5d";
|
||||
symbols.sha256 = "1ql2w3q3dv13ascw8s0hzwda486763qma7i2m877jw3p78gjhldr";
|
||||
symbols.rev = "06d20a4b9f7e5375329194d141b096dcdcb7518a";
|
||||
symbols.sha256 = "1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf";
|
||||
templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a";
|
||||
templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
|
||||
footprints.rev = "6a59a2d3940dbab7b3e8254a5b9bf06cc5330301";
|
||||
footprints.sha256 = "0jlz0ln9vzj1av1fmw8ma8kfqlb8w0r9vrfng19bkc3cgh9lvh9x";
|
||||
packages3d.rev = "8a2c5c4c85457832f3320902456d066d29561806";
|
||||
packages3d.sha256 = "0dmssyhqd94d9wj8w7g7xjan560b2rwcs540sgl0rc77cw2jify8";
|
||||
footprints.rev = "5d2ac73ae72bfe8b8ee9eeb081a7851b2ca84c24";
|
||||
footprints.sha256 = "1qg016ysf0ddm3bd5bkjawlrc0z4r3zhmdjkqkwaaaydnpwp23qz";
|
||||
packages3d.rev = "f1dae9f95e59216f3b974f585e5b420db853da9e";
|
||||
packages3d.sha256 = "0ciri6lhnh0w9i00z167snj5acnjndi1rgmyls08p45zj4rma8y2";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, makeWrapper
|
||||
, sage-env
|
||||
, blas
|
||||
, lapack
|
||||
|
@ -72,7 +71,7 @@ let
|
|||
[]
|
||||
);
|
||||
|
||||
allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]);
|
||||
allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs);
|
||||
transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs ));
|
||||
# fix differences between spkg and sage names
|
||||
# (could patch sage instead, but this is more lightweight and also works for packages depending on sage)
|
||||
|
|
|
@ -5,22 +5,21 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gitless";
|
||||
version = "0.8.8";
|
||||
version = "0.9.17";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitless-vcs";
|
||||
owner = "goldstar611";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE=";
|
||||
rev = version;
|
||||
hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
sh
|
||||
pygit2
|
||||
clint
|
||||
argcomplete
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "pygit2" ];
|
||||
|
|
56
pkgs/applications/video/deface/default.nix
Normal file
56
pkgs/applications/video/deface/default.nix
Normal file
|
@ -0,0 +1,56 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, pkgs
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "deface";
|
||||
version = "1.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ORB-HD";
|
||||
repo = "deface";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tLNTgdnKKmyYHVajz0dHIb7cvC1by5LQ5CFIbMvPEYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
imageio
|
||||
imageio-ffmpeg
|
||||
numpy
|
||||
onnx
|
||||
onnxruntime # Nixpkgs onnxruntime is missing CUDA support
|
||||
opencv4
|
||||
scikit-image
|
||||
tqdm
|
||||
];
|
||||
|
||||
# Native onnxruntime lib used by Python module onnxruntime can't find its other libs without this
|
||||
makeWrapperArgs = [
|
||||
''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ pkgs.onnxruntime ]}"''
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace pyproject.toml requirements.txt --replace "opencv-python" "opencv"
|
||||
'';
|
||||
|
||||
# Let setuptools know deface version
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
|
||||
|
||||
pythonImportsCheck = [ "deface" "onnx" "onnxruntime" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Video anonymization by face detection";
|
||||
homepage = "https://github.com/ORB-HD/deface";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lurkki ];
|
||||
};
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonApplication, fetchFromGitHub, python, mpv, requests, python-mpv-jsonipc, pystray, tkinter
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, fetchpatch, python, mpv, requests, python-mpv-jsonipc, pystray, tkinter
|
||||
, wrapGAppsHook, gobject-introspection, mpv-shim-default-shaders }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
|
@ -12,6 +12,14 @@ buildPythonApplication rec {
|
|||
sha256 = "sha256-hUGKOJEDZMK5uhHoevFt1ay6QQEcoN4F8cPxln5uMRo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# pull in upstream commit to fix python-mpv dependency name -- remove when version > 1.11.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/iwalton3/plex-mpv-shim/commit/d8643123a8ec79216e02850b08f63b06e4e0a2ea.diff";
|
||||
hash = "sha256-nc+vwYnAtMjVzL2fIQeTAqhf3HBseL+2pFEtv8zNUXo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamlink";
|
||||
version = "6.0.1";
|
||||
version = "6.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0Qpil/bh2F+WaG0zv4yxEzx6e1fv3t9xed+nhT+NC7U=";
|
||||
hash = "sha256-FwsgJ9TYBzCHxYlBwxrsOEy/mQH8tAH4JOkZrjh8Q4U=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
|
|
|
@ -2,20 +2,21 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "imgcrypt";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VGP63tGyYD/AtjEZD1uo8A2I/4Di7bfLeeaNat+coI4=";
|
||||
hash = "sha256-FLqFzEEfgsKcjAevhF6+8mR3zOUjfXyfWwWsxVOcdJU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/containerd/containerd/version.Version=${version}"
|
||||
];
|
||||
|
||||
vendorSha256 = null;
|
||||
subPackages = [ "cmd/ctd-decoder" "cmd/ctr" ];
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
version = "0.9.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0iI417mwmwph4wjuusaWY0kGtVsQy7i+eZvE1tYiINY=";
|
||||
hash = "sha256-XaZgvy8b/3XUjO/GAQV6fxfqlR+eSMeosC7ugoYsEJM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
|
||||
, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
|
||||
, yasm, glslang
|
||||
, linuxPackages
|
||||
# If open-watcom-bin is not passed, VirtualBox will fall back to use
|
||||
# the shipped alternative sources (assembly).
|
||||
, open-watcom-bin
|
||||
|
@ -215,6 +216,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
mkdir -p "$out/share/virtualbox"
|
||||
cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox"
|
||||
ln -s "${linuxPackages.virtualboxGuestAdditions.src}" "$out/share/virtualbox/VBoxGuestAdditions.iso"
|
||||
'';
|
||||
|
||||
preFixup = optionalString (!headless) ''
|
||||
|
|
|
@ -11,7 +11,7 @@ let
|
|||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "26.1.0";
|
||||
version = "26.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
|
|
@ -1,95 +1,95 @@
|
|||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "0698fzf03nss7wkaa0i3kp8f5f1gjbsknz18px616g7c3bgss582";
|
||||
iosevka-aile = "1vaiznxyil5a4gc2hy1k1164fn15rk3814lwf5av830323rc7and";
|
||||
iosevka-curly = "1rnyxbz62v34hbnaj3r74pl1ahk539b7bh0x175lv9j0fwrm73is";
|
||||
iosevka-curly-slab = "1gcmzsh35ayb3bmrkcdpxii3l8r7qg0yvxjy37y2hp544f2drnkp";
|
||||
iosevka-etoile = "0v3y8cr0w2q1xa4nmwmrh5rcxcfjj38rq6gwqsbvs2rlxls50yi4";
|
||||
iosevka-slab = "179fydcaf72z01i9d54m7biq6i472rl84nsxghbmgrzghyblxck6";
|
||||
iosevka-ss01 = "18b9cd95q2rnbm762mcfqqcqkffmw895khmsxqsd1dmkb9gj509w";
|
||||
iosevka-ss02 = "1gg06d76yl2lv6lpcd9vszqf2yb3rz2w032ih9rjid1wcxccnn62";
|
||||
iosevka-ss03 = "0hqwrqzvikb2xkgmn4zff8jw1czvm6zawf37hz2hnwnx0ffgzhz0";
|
||||
iosevka-ss04 = "1gq79pfhwrag686r8symivn54pwcnnp5rxwyfswfyq72x6xxq0ri";
|
||||
iosevka-ss05 = "1di9v2ka7v8l7gglv29zfrp3p7aznqnkwkzdn6pqz91p7y0kd1ck";
|
||||
iosevka-ss06 = "0m7gazz4cq544qyv37mg08j0b1jv7vf1af17snxypzg6gi3l9l79";
|
||||
iosevka-ss07 = "1nlxbraigk6wz46jr47zs3drsv87f4rviscfi6pa2x70fqfvxcvd";
|
||||
iosevka-ss08 = "1ch3c27nzhnnn87jsl5rpl8cpnqdn8zsh2hfch0nkh8y8s6hc6jk";
|
||||
iosevka-ss09 = "0gk0lm2212whr73ydjj0wdmjrvzp5mcawg7c035cyzfj4r35mh7l";
|
||||
iosevka-ss10 = "0d7988z1zsqavd5j2vphkcyy98cfc7bam2bbh62qr99k7321y9dh";
|
||||
iosevka-ss11 = "0a89wmn5f1a97rvl2fa7slqw95mx1a95i5jjrbdslwifycrbv0j8";
|
||||
iosevka-ss12 = "065l9bnhjcracyz73y57mv9bxhxlakvgy2xjwmrayg9a8mnqdl40";
|
||||
iosevka-ss13 = "15miz16fsrl21y2c63gvkngbm7v99s5w9wzcb6x2pl3whfwdm5hh";
|
||||
iosevka-ss14 = "1sbm3m61m4k1wz588axm1w94869fxh0y06gldwivnz460cads42j";
|
||||
iosevka-ss15 = "0w8xm6vv8k95rw5q81d2nw34hllbjlixfqwvrjyj0gpxxw8kkcgy";
|
||||
iosevka-ss16 = "1y64daxpbjwjsakkya9j1x9inn7kq1dpy0y1mldig2dd7i5f49rd";
|
||||
iosevka-ss17 = "1pads0rraq6dxgbra6ss5ilxil988ypcwgfiild9pzb8y5ljgvqr";
|
||||
iosevka-ss18 = "0vf7nvawm9yaip2nvsxc56br1v5q7dqk39i9c813ff5bakwkskiw";
|
||||
sgr-iosevka = "08wrm2ynkw95n7762ay2iak15bj15j0v60pw6p29s5q2fli3cdlj";
|
||||
sgr-iosevka-aile = "117fz5a2p9q1mw6221b04xq4x16lnp6p54vm53jz01pd5s0yg7zn";
|
||||
sgr-iosevka-curly = "1lmp69ppzc7vzi11zlk2y2wg74m19w0jwq482ax024bgm939fxvr";
|
||||
sgr-iosevka-curly-slab = "00gi8i7rq14s1yaz37x2vnxrg78rj1mxfxcii1q1bdmzpnxzvlsh";
|
||||
sgr-iosevka-etoile = "1hw7xfhb666k5n3ay17b33lg09cvsq9wibbgy2x1mmxv1dwxswi8";
|
||||
sgr-iosevka-fixed = "069j0q2g8qdg7akycxsclgxknifg26xd392wcfvm9hwj4j3yscw0";
|
||||
sgr-iosevka-fixed-curly = "1f3gfvkpng044s40pvhw8xmrbdayphav7jnbif3y87ipb2vkah02";
|
||||
sgr-iosevka-fixed-curly-slab = "1zpwqmhck2ym4nh2d4rixqyg7n1jq7xnrqndnjs24nkzk41kg793";
|
||||
sgr-iosevka-fixed-slab = "0bvnp6szadwwyn2l8hms6wfv2pvncb67y4gw9xnwz3xzfwin53bn";
|
||||
sgr-iosevka-fixed-ss01 = "1v8xnyfvq9gjk7xxk465iam2mjb13rj1yibiacp26cn7pz29rdqi";
|
||||
sgr-iosevka-fixed-ss02 = "0ygy6124896cacpqgnpckxw5h9qj8z61drmkcrwk55qjs2gnzgky";
|
||||
sgr-iosevka-fixed-ss03 = "07z7wqg9hgf47aqlb2rqbww9nvr8yhvsaibjmab4xp0c9spibgc9";
|
||||
sgr-iosevka-fixed-ss04 = "1chfswa79zbw1p47dqlh176aq7vrvyziflzm4w30ribk86p6z17d";
|
||||
sgr-iosevka-fixed-ss05 = "0nqqffadk65six8xa6gy3as7ir84lb2gs3bii75iwzy84xiw4ky3";
|
||||
sgr-iosevka-fixed-ss06 = "1996bmsvjs4x35wx98qb7qp998gj1w718kp7rpalls7460796lb8";
|
||||
sgr-iosevka-fixed-ss07 = "0bmrfw0kwdar7ah7pwdf5i7lzgrxfqjwzw8962n801znngccy90d";
|
||||
sgr-iosevka-fixed-ss08 = "03l0gzrivsy8jrdyvyhl5cv6ndk85p9lxfpzkjbhf29dxbd2wg5q";
|
||||
sgr-iosevka-fixed-ss09 = "0dmg5nr23kx3b8cqiha8a8hhq7dysk4s8zwg8c2xwymm39sh77bg";
|
||||
sgr-iosevka-fixed-ss10 = "0kg4bbn9r500fwirr9glwyd26hwyzlplhxmjbzbkqwa39zwl6h1a";
|
||||
sgr-iosevka-fixed-ss11 = "1my2kf7hvara3xv1x5qq8vvr6ywq7w17b0phy63mbn6qc4k179xl";
|
||||
sgr-iosevka-fixed-ss12 = "0g9xkp0l2wadxni5ax0ir2qh7cp4924xa57k33lk25i8pgc4bban";
|
||||
sgr-iosevka-fixed-ss13 = "0jhvfffh6i8g817z594dg7igawxfbwn3dv11xhh2rac9njxyiz3m";
|
||||
sgr-iosevka-fixed-ss14 = "1c1sxyzdipr025zkabxsy5m2aplnpj1sv62bp54w86xaddj3386i";
|
||||
sgr-iosevka-fixed-ss15 = "14a89q4gys44bng51nbnl6z5dhzddx8pnwl4l3l2qkjlqja1f4jr";
|
||||
sgr-iosevka-fixed-ss16 = "04r4aljb9ikd3i4pxniyrlybx29l6v52q80kcg59ymaa20gaqadr";
|
||||
sgr-iosevka-fixed-ss17 = "1ia45a47n5gxrfin48xyfgz0r7nkj66hz27vl4lkzvscv75igqmp";
|
||||
sgr-iosevka-fixed-ss18 = "0mbz6d8w9ija55nh7vdp24hi6i5fs0d5bfm3580yx1a2iphrkwbr";
|
||||
sgr-iosevka-slab = "1xnz4jhxap7lmvxqrngsvsmafdi026v3rzrmya28f3iwq37d6kf8";
|
||||
sgr-iosevka-ss01 = "1vwm199q642d90l52k3jvaz9acqq7i6wk8bpnfq94xl1d8z2jl4g";
|
||||
sgr-iosevka-ss02 = "0l6igwh9g0y9x8lwyvdn6x6qakv8gvlswi3148ghwp0d8hxwy79v";
|
||||
sgr-iosevka-ss03 = "1a8vfdzcq2dikv48ccl3smn0kw2w88ddgwi3hr68x8jp84rpjg6c";
|
||||
sgr-iosevka-ss04 = "19gj3wpqzhhnnmrmyz4jpnz0db397bx433agy0hmyjnk50vdbw5w";
|
||||
sgr-iosevka-ss05 = "0wg2fr10bwmmm1bhjrwadfrvzvbwcayjfg49791x9gzkdvxmc1y9";
|
||||
sgr-iosevka-ss06 = "1jkcl6ngkdkr9v2x6lsslxfqbn9kn9zmw504ihfl4dii84rk8l83";
|
||||
sgr-iosevka-ss07 = "093bhgh1lvabf3xmh8flsy1daabmq1hq4j1czhbqcairzjlk30i2";
|
||||
sgr-iosevka-ss08 = "1a9l4jlndsf6bdy7cy0c1x23cdms3aw0gq43k9nv2k19fn5mklmc";
|
||||
sgr-iosevka-ss09 = "0bcr8mrb958470ilbla9xpmlgf03g0x4rfzz72lr2aln8rja5sdi";
|
||||
sgr-iosevka-ss10 = "0lnj2v6hng13wmbf55kar8yzj6c11adkh2x1j6s3nfz18gbaa4yg";
|
||||
sgr-iosevka-ss11 = "111nbmwrvxd4yzjnbv0vp7hlgbif4zycbiw4ll8zqnibqf3zynb6";
|
||||
sgr-iosevka-ss12 = "1n8jy9haqd9xg14szl0k2fbxxydkkb2z5lighsh569qjcjh17vyw";
|
||||
sgr-iosevka-ss13 = "1kdq1xwwvcf8gi3122sg211dgijk0q72zxbpxk1cj3f2cimbi87h";
|
||||
sgr-iosevka-ss14 = "1i4f6k7gpzzxkia81qfkhx9rwzpg29n9k3i3lbqf0y9fj01kwgax";
|
||||
sgr-iosevka-ss15 = "0agzapx40qv0pixxijfa5m94w5p90adjyfh0qp4kx37hvidzcplq";
|
||||
sgr-iosevka-ss16 = "0lc4bs89g2840m0mkcxagc694mx5ydh2zvcrvh1316snz6gqmqbv";
|
||||
sgr-iosevka-ss17 = "0wsd2jck9pgrivr93d64krkdkqdwm21mgz52pijwr51bwci41xy3";
|
||||
sgr-iosevka-ss18 = "00ml8w11n9dc5ykraz3hcacwvhsjx1z100risi3aw81vfwq0z1xg";
|
||||
sgr-iosevka-term = "0zvpj73ddk36g9ggw2bngmhzpdixpnnjhvzzyw7ff4xbgaxlkrrs";
|
||||
sgr-iosevka-term-curly = "0b0a2ipjwj1mf2042658z6rsnn5jiva32aw9wrq7rs56p7drf33c";
|
||||
sgr-iosevka-term-curly-slab = "0dvh9kykb80p6g689wxcfsxya9n959j3l7a9q9bz92nddyny45wp";
|
||||
sgr-iosevka-term-slab = "06mbfcjcghd5dc3k2y1bf39xhdni7dvsasm3rgj0cjzylg7c9rkv";
|
||||
sgr-iosevka-term-ss01 = "0bpqbnp2njn8q1vqpy3iaqxzwm4zb50spyk1drdnk5v4j8rnxr86";
|
||||
sgr-iosevka-term-ss02 = "0g3kdwlaii8vja3p5y91pmawzj7hn59y35gixvgkqpnrkpp3y6bm";
|
||||
sgr-iosevka-term-ss03 = "139psybgajsyszpz811kxvgfi08ia54dk011dx359kk6gj72wmnz";
|
||||
sgr-iosevka-term-ss04 = "0aix3x98id9zc86qmbmbqh60a9s6928y26lcz1sms88p2nnnliqp";
|
||||
sgr-iosevka-term-ss05 = "10gbkay5fff1k91r1jhibh3gialif6m7fyqlw5sphjxn75qpkxm4";
|
||||
sgr-iosevka-term-ss06 = "0bxachp1qsnzgavap30nsbqpa75hd5pzk2gfj8l1b6q3cpmvnlyf";
|
||||
sgr-iosevka-term-ss07 = "028fkmz1yb1g30idszz0bdjhsn1iq845pxkf0iwq409y2qs8xh8s";
|
||||
sgr-iosevka-term-ss08 = "11yvq67lql3q249k1b9gdc3g1q48q6sihj62kgk7l9qh4cv3wmnh";
|
||||
sgr-iosevka-term-ss09 = "1r87wznw3nbry0ddl20k7gqxbmiz0pnmf5qb01jfdnhsnq9fdr4a";
|
||||
sgr-iosevka-term-ss10 = "0xivpfm736jp4326bwbcnc7gq2sik3f3r46sqka1r33vvlwmcq0m";
|
||||
sgr-iosevka-term-ss11 = "1j03vhbqgff59qi4sw11y49gkmzamv94vlwicg8idbnqbkxkhr8r";
|
||||
sgr-iosevka-term-ss12 = "0mcixkpb5680f9jrbk4hrzvf7nlh2hppb8ar1w8a1lvx7qyr3wxc";
|
||||
sgr-iosevka-term-ss13 = "19nzxs9r2br3n3ibi15b7acarlgd2mriyzi318dmis0dxfdqd27l";
|
||||
sgr-iosevka-term-ss14 = "18gqq1ysjw8fx9insy06wi7wbfzsha5vcq72j89iac67jlr3qdp0";
|
||||
sgr-iosevka-term-ss15 = "0l5hhq3kcrg7jhzlpsakx150gsn9l9018vydv5ln84lxfg16hc0m";
|
||||
sgr-iosevka-term-ss16 = "0lhq56r8anw2dqny3wgmw0jb8fcsk4idsb7li09m87rkikfd2igr";
|
||||
sgr-iosevka-term-ss17 = "0ylgk2bzxb65cb9rma0a17bz8n1w0r9pk16nlm01bglp79cin9a0";
|
||||
sgr-iosevka-term-ss18 = "0ld3f3a06r4kjbdppx5yml855af3cz2kia124jjzx6x5j5ybn87y";
|
||||
iosevka = "1hbh2s718c2abp404rginas3bqlddgw3bl4k3hv6yi76sdd5wmkw";
|
||||
iosevka-aile = "08l7hidkfc9xwavmcvwis7zma1shyqb9p6n2bcwnrs22826hgn0f";
|
||||
iosevka-curly = "0sm77rfhqjf5iwvn8fc7cqr8g7q6nyycal8bqx8h4wyin8mac6ss";
|
||||
iosevka-curly-slab = "1kvakcscpsfkwfgk8j1pk44xzq5lkhp1m6f6q75cpcrbakmfdw0y";
|
||||
iosevka-etoile = "0vgf3jigdysxhp24kzyhhxmi84sxmnvy99r4l4vjk9fhnpzkhv28";
|
||||
iosevka-slab = "127w2ysvv2cnc5zdyz5znwawfmnvpm4by35igkzlcyplgsygdi16";
|
||||
iosevka-ss01 = "0gl79saa0k1x9b01khxip7wmw2lvaf1glcpsj5733ywwiy381k7d";
|
||||
iosevka-ss02 = "0rc4lf7bx61zs17rd9chnszlbzjpdh867mxvv9gwcm5biyn56zxv";
|
||||
iosevka-ss03 = "0vpz5djxbjca1hq233bl78bbaw7wnky3mjgk5va4mbwvscszpq7d";
|
||||
iosevka-ss04 = "06zf1mccd5082a3cqga46g82dm14asv4x7ljnv21nxqwqb54xrar";
|
||||
iosevka-ss05 = "1r5pxm2gyj1s7qvdsnydczqlpwdqc4c27wfh70gj83s6sn0xaszr";
|
||||
iosevka-ss06 = "08cm7zb0ha16ldh7cy337c226s9vjkr14w9b6v025wq2f7l0axv4";
|
||||
iosevka-ss07 = "1qcc19i5m3hkgkp89a02g2xcyx3xbgwdav88fw3cn5cq9cd32nvg";
|
||||
iosevka-ss08 = "1cd2f3aagikdhh8zh54ijfy0qkmkadpxx9ikc65i0mdwqvrq66qs";
|
||||
iosevka-ss09 = "04gwpk1blrhlakg9253l69d2n5xp7bvy6s1va535z08yln6m2zzq";
|
||||
iosevka-ss10 = "1cxazjh94p4dqsfhs7xb0jfdxyg17w0fi6kvns62scprl11spbah";
|
||||
iosevka-ss11 = "1jgxc03vg45hj2y61kp0hplz4b3v13i9x98j3v5m07m5w4pvz92v";
|
||||
iosevka-ss12 = "0i2h2kdrhq610ca8clsmpfn4c71qvm23fpn389c0kxls8wg5z7h4";
|
||||
iosevka-ss13 = "0mxkxa68krhwlpxn00msir4za5zldhqilnzb2rhsbgwsla5vx0y4";
|
||||
iosevka-ss14 = "0fhg8jdkin4m9fj1d96n9521cx7ffz230abcrkgffas8404x4c6l";
|
||||
iosevka-ss15 = "17fxkh3vl9wb7ajyda6dhwzym71i5gn1qzarnaalabqrrg9vg8aq";
|
||||
iosevka-ss16 = "0w3j91963hh6nlnfy6igz5bj7k81gw4grcsvl58p81z3fb4n4wcc";
|
||||
iosevka-ss17 = "04fmk1wwhh9snmpz9k07acjyjibi7d2l7yjlpbzzc0kwy3i7x37z";
|
||||
iosevka-ss18 = "0k90yhz9a44h8r9kiknnxhm94f9s7xk0m074g4wh07ngc80npaqb";
|
||||
sgr-iosevka = "0hiz1a3gjl684m0wq0i328j0ryrpa5436j6g5agfvdsima60dknv";
|
||||
sgr-iosevka-aile = "18jbnig6shvqcvwmpjc9z14z9am9wsl8ybm7mrw7b237jkfy9839";
|
||||
sgr-iosevka-curly = "1ljs1k0xrd91n1n8chcb0jmcpgjjvgc9qwdxnk1i2zbds515hbsh";
|
||||
sgr-iosevka-curly-slab = "1iqngf3a0mkx52ljmxwsd0088x6zpac6dyz9502wfmp5wrp7y4wf";
|
||||
sgr-iosevka-etoile = "0w8zs73xl4arkksb9xd4g8nyf8n90ya0hb0yg35dqzqqdsf9b5mp";
|
||||
sgr-iosevka-fixed = "1j62gdc1d8rcakg1a46q2bhnnlyzvfnmiz0gp8ia91vz51j9s8vy";
|
||||
sgr-iosevka-fixed-curly = "1sdvbyi7h486drvqi1nccz05nn93wzhi6wwn889kgxawrimpbars";
|
||||
sgr-iosevka-fixed-curly-slab = "1q96b285kxih0lrqrmy16hiwniq7vx6f07l3h9xqhinln8g2mvi8";
|
||||
sgr-iosevka-fixed-slab = "14j718phwai25fwgva3xhz816h9gkds3lhnfmrdxmlj1z5rnsk5z";
|
||||
sgr-iosevka-fixed-ss01 = "1gi9hhzsfrjl5bykyswi882blndggb28b0isdhyhvv5rsjpl6vrq";
|
||||
sgr-iosevka-fixed-ss02 = "1l9k878199nclzmfhc52qcll7x7i4fq71mj495sr4024vm7dgns1";
|
||||
sgr-iosevka-fixed-ss03 = "1vpn6sfz8ps64ysxcviwziw2qhazjj94vx962pvahwd991lgdila";
|
||||
sgr-iosevka-fixed-ss04 = "11847shnrdzfgj4rryk22ba16bxmdsj2qf9vah6qnivsdaw9ymc1";
|
||||
sgr-iosevka-fixed-ss05 = "1n2whdxrlmxgvdqhxgq0qyxrnidgbaw2mmw8s3a06qpcpqi20d3v";
|
||||
sgr-iosevka-fixed-ss06 = "15lhkka5slax5c0vawprfdbdhbbiqapv4d2b02w7fp9g8p0s1ljc";
|
||||
sgr-iosevka-fixed-ss07 = "0ijhsmlp66a1la299w5jvrfnykasznybb22fhq7lkjzdn1blgim9";
|
||||
sgr-iosevka-fixed-ss08 = "1q8d54a7a1xq5a1jkc0c8qns6nq3gyldabjaplczq5p79s2j2fca";
|
||||
sgr-iosevka-fixed-ss09 = "1p86b22v8mn5xs9vxyary8jz1jfy0hy1g7yc4lwmslkvxndjvfld";
|
||||
sgr-iosevka-fixed-ss10 = "1y3rlr3b5bfx97mr7kpg2x2wgk88z7jhx0vh3b33d9q4sd626vcr";
|
||||
sgr-iosevka-fixed-ss11 = "0i6zajhdnfml9ja613jmy3gb6als2chrigkjyzxm0aih4wfm7lly";
|
||||
sgr-iosevka-fixed-ss12 = "0f4p7gmb2g991v1858y53wlxvsnd7fmrsp8d9jxj4nlzpl7giazj";
|
||||
sgr-iosevka-fixed-ss13 = "1230ss6fxk5py0fkn3mcdc1ky1jfp31hz8fqlvkwz3vf954yfqj1";
|
||||
sgr-iosevka-fixed-ss14 = "0hhpmby5jzb839yldzlaj90h1d0d53agxcdiphp9vbmrr3mp3ycd";
|
||||
sgr-iosevka-fixed-ss15 = "1dq7f72zi094hvgpdm912f5ijp8nrcxsd78wsk35nllv4cggswma";
|
||||
sgr-iosevka-fixed-ss16 = "0jlbc0xx3pf3bnlw5p7rpjw6a7hj75lhh78c9qldhdxpiyks2jwk";
|
||||
sgr-iosevka-fixed-ss17 = "0vbqwvn604njd09lc8g4nxq6isjpzv984345l76cpz3hhn22a986";
|
||||
sgr-iosevka-fixed-ss18 = "1xznqj1wwvk9rclgr0nx0p5wx1p3a9sbdbigirmifhjn77mrji9c";
|
||||
sgr-iosevka-slab = "0wmh2dg12gd05vsr8jsx4mflczpyw6prvlap173yll0rif80dwxd";
|
||||
sgr-iosevka-ss01 = "0h93n0v2xzph0j2xq289ssi69dvlbqqz0f9yb41khq6bfz2y6ra7";
|
||||
sgr-iosevka-ss02 = "0vk3h1wxdrgjhy999ikmpkakd8xwsad06q3bbk74q2m9ld3m48jl";
|
||||
sgr-iosevka-ss03 = "0bs4nrvzfmmbh7f8liyd94d47kqgz3iw3mbi5q0cavh4vylhlz6c";
|
||||
sgr-iosevka-ss04 = "0dhz9a2nl4ydj0gdxa9xhvbqf68h3d3yr81zh8gxkj2c84g3lyrn";
|
||||
sgr-iosevka-ss05 = "1q9fvi4kpgjxz03c2jlxbxcw8qvj7h20xdmkgk7kgbvkvvrgmyam";
|
||||
sgr-iosevka-ss06 = "09hf8g8hrw2q6lc60x5fdq0xvic0hx2g7y200p5jj2ghdw6jb7zr";
|
||||
sgr-iosevka-ss07 = "09pn58i1gprrvrq1b5i5sc83ly8gpcxds35kj1l4p8x0h5zz5ffr";
|
||||
sgr-iosevka-ss08 = "19lr6zp4j9wrn9xwffqyrrdy35gfl6fk27i03w07gx4hbl1x45nn";
|
||||
sgr-iosevka-ss09 = "06654zmjf406lzbn3q9f1212r5raw56npii5cc0mn6cfka8lhiyb";
|
||||
sgr-iosevka-ss10 = "0qi00x4vmxvzqyh1556f0fgc9cplapnri3vn10ky7pmmypwlzicf";
|
||||
sgr-iosevka-ss11 = "105l97zm4kmacacqdasac601r04cxj2w6vbciamb3id4yjkr5lqq";
|
||||
sgr-iosevka-ss12 = "1sd02jb4wpw0ax7yd0l2lzkdgl6sv7j64myfzmpgf79n38ik3x6c";
|
||||
sgr-iosevka-ss13 = "0jyizpqxbnkf8ac299brahacjxp0h0hzwhaz5bd11439gkwjpff4";
|
||||
sgr-iosevka-ss14 = "02p2fscj5zvypb1mcnhx7cr09dx4d0gmyhnyvlxw3d8l7r600x7k";
|
||||
sgr-iosevka-ss15 = "0ihmgn49i13xki0ikw1acj0p8vg8siyrgr48apq0vfj9d8yb1fnq";
|
||||
sgr-iosevka-ss16 = "0ggaqg0z63x9x1jp4dw4zi3nm44bfq5v3z22fi2fmkrd9w2l3sl8";
|
||||
sgr-iosevka-ss17 = "1bdk2rwqs68738acl1g5afz1vpaq11qfck54vdphidmppg6fflib";
|
||||
sgr-iosevka-ss18 = "0s336j7wi8rys4kc7zpz9xfq3fcvhajlmpjzkb1qhjxwrsxzk2g9";
|
||||
sgr-iosevka-term = "0329698yx6nagmc9pjil5g3bcd4chng4685bllgzwn6751y3w74p";
|
||||
sgr-iosevka-term-curly = "16p82qiqkimy1przl7hxyd9lh7qkff8q8k1y8339gf35drjs0yii";
|
||||
sgr-iosevka-term-curly-slab = "0vqbhaq107ka798jz84r2ipmf68j511dimkrzqwxcy223nmwh5wm";
|
||||
sgr-iosevka-term-slab = "0gb8vk3hf7fj1wj0n14ha01cxwg767xwhklraq8iz4hj71axj9n2";
|
||||
sgr-iosevka-term-ss01 = "1gnbza11zs4c4zalmpf7yz4wqhx322vd7gsaz1c97hszh11az9hl";
|
||||
sgr-iosevka-term-ss02 = "12hfn784lwz7ldw3siqxk47b2j9yrd4lx9xs56cd9p44wdvspiaq";
|
||||
sgr-iosevka-term-ss03 = "0h56ch2hhp70djbp13a9zr99imr6jincqqwkmpn3pm5z9kr82y9b";
|
||||
sgr-iosevka-term-ss04 = "1nnf8pzdra4xqvvwi487f83blpapyfmpjzm0mqpndws11chl6ndw";
|
||||
sgr-iosevka-term-ss05 = "0g3znbjjh1kjm02bmaf28gqdgk7b0l9sx3hcg0pfyfs9iv05fh8a";
|
||||
sgr-iosevka-term-ss06 = "1v7w15k7s0qrm307lkkrmzy3g09q20d6ws7jmbp7xswxvibfhxkl";
|
||||
sgr-iosevka-term-ss07 = "1i3cg20xz230chw3l3q4bzlp6m62563bgy599cfjjp1si2inx734";
|
||||
sgr-iosevka-term-ss08 = "1jspdgrkszgqzzm04q5l21583j6vfh01qv6f0jr2z9235877f2xw";
|
||||
sgr-iosevka-term-ss09 = "0gc201k5z4kfpsdbkn7kn163cpvxasg01gx9brwypkydsr5m8imz";
|
||||
sgr-iosevka-term-ss10 = "0k4q749vgyz1wpxdg2hg7np52h9b1nx50pw9s0k73fl2n45g7559";
|
||||
sgr-iosevka-term-ss11 = "1s2gqdac7ckw574vwbryfab8hgkjr72yf3s2pc4gr5gcyd97863a";
|
||||
sgr-iosevka-term-ss12 = "0js64ad31vi0zcr07qyamyv7my1cz1dym3jiw3dkcrm3lmi6b65d";
|
||||
sgr-iosevka-term-ss13 = "0kz3166n81h7fzif89mad2g2blvm8hd69ww76k3zivx3rzxvl6m6";
|
||||
sgr-iosevka-term-ss14 = "15nah0qmrp0z0x159yyh848yy2874yx9ijyfwy6cvs7ildzd0fkv";
|
||||
sgr-iosevka-term-ss15 = "05p8is5qwji723gxjffx6si1rcsfspizpn0gr6cvdkz9cwcv0sqv";
|
||||
sgr-iosevka-term-ss16 = "0dp22hbvxj4sjmz1hw4qiqf70fj95zr0mw6f38wvy79813101c14";
|
||||
sgr-iosevka-term-ss17 = "1nbv2p8ddajrymm8a5556xjcx5aia6f1zqrgpjsf6pq0qs06x3di";
|
||||
sgr-iosevka-term-ss18 = "115s4lvh3ml374815w3c2649js29ba5vpq375fd24vlysr147zxd";
|
||||
}
|
||||
|
|
41
pkgs/data/fonts/sarabun/default.nix
Normal file
41
pkgs/data/fonts/sarabun/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sarabun";
|
||||
version = "unstable-2018-08-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cadsondemak";
|
||||
repo = pname;
|
||||
rev = "854cdbc6afa002ff8c2ce6aa7b86f99c7f71c9eb";
|
||||
sha256 = "jcSQ72WK0GucZPgG7IQKrKzCOEbGgbQVl21RIKSF6A0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $doc/${pname} $out/share/fonts/truetype
|
||||
|
||||
cp -r $src/OFL.txt $src/docs/* $doc/${pname}
|
||||
cp $src/fonts/*.ttf $out/share/fonts/truetype
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://cadsondemak.github.io/${pname}/";
|
||||
description = "A slightly-condensed looped Thai and sans serif Latin typeface for communications";
|
||||
longDescription = ''
|
||||
The most popular typeface from the 13 fonts from SIPA Thailand’s National
|
||||
fonts project. Sarabun was designed by Suppakit Chalermlarp to be a
|
||||
serious text face. Great choice for a long reading formal text. This font
|
||||
was selected by the royal Thai government to be the official typeface for
|
||||
documentation purpose. It was also adopted by many private organizations
|
||||
to be used as a communication font. Sarabun has a slightly condensed
|
||||
proportion which fits perfectly with Thai legibility. It also carries a
|
||||
neutral Thai traditional loop design which can easily fit in with any
|
||||
occasion. Probably one of the most today’s familiar Thai loop typefaces.
|
||||
'';
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ toastal ];
|
||||
};
|
||||
}
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "23.07.21";
|
||||
version = "23.08.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-rHT4lD+RcwRmE63Dd7/oXVAltRTfpisptzyD1EQG4Aw=";
|
||||
sha256 = "sha256-zlh3Jh3ZrNo58ijGPwdaiHnTFoT6L3ZC0VTRY0Se3qs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "risor";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "risor-io";
|
||||
repo = "risor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lalT9kwq0+y3xaYAcl/DqcwGXE27lNuL1DCr1wEE8ZE=";
|
||||
hash = "sha256-QhXIwFrApSkWY2YYYGlojKsByNA2xpyVTm0SpYWB/Ds=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-diAbQwnlhMm43ZlLKq3llMl9mO3sIkc80aCI5UDn7F4=";
|
||||
|
|
|
@ -6,23 +6,24 @@
|
|||
, readline
|
||||
, valgrind
|
||||
, xxd
|
||||
, gitUpdater
|
||||
, checkLeaks ? false
|
||||
, enableFFI ? true
|
||||
, enableSSL ? true
|
||||
, enableThreads ? true
|
||||
, lineEditingLibrary ? "readline"
|
||||
, lineEditingLibrary ? "isocline"
|
||||
}:
|
||||
|
||||
assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trealla";
|
||||
version = "2.23.35";
|
||||
version = "2.24.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trealla-prolog";
|
||||
repo = "trealla";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yCVBjxO9tEKlyWo6RlK4EdyUxCkxp0z2EzJ2np0xOUU=";
|
||||
hash = "sha256-zpHdZiDtNcQko+gn92fiGWSvYT4aQ4t6nYFwf6zu0cA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -41,9 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optional enableSSL openssl
|
||||
++ lib.optional (lineEditingLibrary == "readline") readline;
|
||||
|
||||
checkInputs = lib.optionals finalAttrs.doCheck [ valgrind ];
|
||||
nativeCheckInputs = lib.optionals finalAttrs.doCheck [ valgrind ];
|
||||
|
||||
dontConfigure = true;
|
||||
strictDeps = true;
|
||||
|
||||
makeFlags = [
|
||||
"GIT_VERSION=\"v${finalAttrs.version}\""
|
||||
|
@ -67,7 +68,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"test"
|
||||
] ++ lib.optional checkLeaks "leaks";
|
||||
|
||||
meta = {
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://trealla-prolog.github.io/trealla/";
|
||||
description = "A compact, efficient Prolog interpreter written in ANSI C";
|
||||
longDescription = ''
|
||||
|
|
|
@ -66,16 +66,16 @@ let
|
|||
projectArch = "x86_64";
|
||||
};
|
||||
};
|
||||
platforms."aarch64-linux".sha256 = "06f7dm3k04ij2jczlvwkmfrb977x46lx0n0vyz8xl4kvf2x5psp8";
|
||||
platforms."x86_64-linux".sha256 = "09flbhddnl85m63rv70pmnfi2v8axjicad5blbrvdh2gj09g7y1r";
|
||||
platforms."aarch64-linux".sha256 = "0iqih0fbafzlcfq3kljjr3pkywamwvahgm6b7b0z0xdbzq0idxdx";
|
||||
platforms."x86_64-linux".sha256 = "1cc7lmp984653b9909pnk4brs96bmgq7hd6p9i6xgxy2y4n3887m";
|
||||
|
||||
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cef-binary";
|
||||
version = "115.3.13";
|
||||
gitRevision = "749b4d4";
|
||||
chromiumVersion = "115.0.5790.171";
|
||||
version = "116.0.14";
|
||||
gitRevision = "376a780";
|
||||
chromiumVersion = "116.0.5845.97";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
|
||||
|
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
branch = "4";
|
||||
homepage = "http://www.zeromq.org";
|
||||
description = "The Intelligent Transport Layer";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
|
|
|
@ -57,7 +57,10 @@ mapAliases {
|
|||
eslint_d = pkgs.eslint_d; # Added 2023-05-26
|
||||
flood = pkgs.flood; # Added 2023-07-25
|
||||
gtop = pkgs.gtop; # added 2023-07-31
|
||||
inherit (pkgs) htmlhint; # added 2023-08-19
|
||||
hueadm = pkgs.hueadm; # added 2023-07-31
|
||||
indium = throw "indium was removed because it was broken"; # added 2023-08-19
|
||||
inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
|
||||
karma = pkgs.karma-runner; # added 2023-07-29
|
||||
manta = pkgs.node-manta; # Added 2023-05-06
|
||||
markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
|
||||
|
|
|
@ -158,7 +158,6 @@
|
|||
, "gulp-cli"
|
||||
, "he"
|
||||
, "html-minifier"
|
||||
, "htmlhint"
|
||||
, "http-server"
|
||||
, "hsd"
|
||||
, "hs-airdrop"
|
||||
|
@ -168,12 +167,10 @@
|
|||
, "inliner"
|
||||
, "imapnotify"
|
||||
, "immich"
|
||||
, "indium"
|
||||
, "insect"
|
||||
, "intelephense"
|
||||
, "ionic"
|
||||
, "jake"
|
||||
, "javascript-typescript-langserver"
|
||||
, "joplin"
|
||||
, "js-beautify"
|
||||
, "js-yaml"
|
||||
|
|
170
pkgs/development/node-packages/node-packages.nix
generated
170
pkgs/development/node-packages/node-packages.nix
generated
|
@ -107882,56 +107882,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
htmlhint = nodeEnv.buildNodePackage {
|
||||
name = "htmlhint";
|
||||
packageName = "htmlhint";
|
||||
version = "1.1.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.4.tgz";
|
||||
sha512 = "tSKPefhIaaWDk/vKxAOQbN+QwZmDeJCq3bZZGbJMoMQAfTjepudC+MkuT9MOBbuQI3dLLzDWbmU7fLV3JASC7Q==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."async-3.2.3"
|
||||
sources."balanced-match-1.0.2"
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."chalk-4.1.2"
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
sources."commander-9.5.0"
|
||||
sources."concat-map-0.0.1"
|
||||
sources."encoding-0.1.13"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."glob-7.2.3"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."iconv-lite-0.6.3"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
sources."is-extglob-2.1.1"
|
||||
sources."is-glob-4.0.3"
|
||||
sources."minimatch-3.1.2"
|
||||
sources."node-fetch-2.6.12"
|
||||
sources."once-1.4.0"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."strip-json-comments-3.1.0"
|
||||
sources."supports-color-7.2.0"
|
||||
sources."tr46-0.0.3"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
sources."whatwg-url-5.0.0"
|
||||
sources."wrappy-1.0.2"
|
||||
sources."xml-1.0.1"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "The Static Code Analysis Tool for your HTML";
|
||||
homepage = "https://htmlhint.com";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
http-server = nodeEnv.buildNodePackage {
|
||||
name = "http-server";
|
||||
packageName = "http-server";
|
||||
|
@ -108697,39 +108647,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
indium = nodeEnv.buildNodePackage {
|
||||
name = "indium";
|
||||
packageName = "indium";
|
||||
version = "5.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/indium/-/indium-5.0.0.tgz";
|
||||
sha512 = "NGgQYdtKoh6zXoo1Sp3cvBur7SMud1JU6ghMQTBUxmPGlRmoB0esc3qVlLbK8f0d8j7OZgUUYkfGd0+xTYGvOw==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."async-limiter-1.0.1"
|
||||
sources."chrome-remote-interface-0.27.2"
|
||||
sources."commander-2.11.0"
|
||||
sources."encoding-0.1.13"
|
||||
sources."iconv-lite-0.6.3"
|
||||
sources."node-fetch-2.6.12"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."semver-5.7.2"
|
||||
sources."source-map-0.7.4"
|
||||
sources."tr46-0.0.3"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
sources."whatwg-url-5.0.0"
|
||||
sources."ws-6.2.2"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Indium server";
|
||||
homepage = "https://github.com/NicolasPetton/Indium#readme";
|
||||
license = "GPL-3.0";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
insect = nodeEnv.buildNodePackage {
|
||||
name = "insect";
|
||||
packageName = "insect";
|
||||
|
@ -109460,93 +109377,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
javascript-typescript-langserver = nodeEnv.buildNodePackage {
|
||||
name = "javascript-typescript-langserver";
|
||||
packageName = "javascript-typescript-langserver";
|
||||
version = "2.11.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.11.3.tgz";
|
||||
sha512 = "j2dKPq5tgSUyM2AOXWh2O7pNWzXzKI/3W02X1OrEZnV3B9yt9IM+snuGt/mk1Nryxyy7OZnhdL0XqHe4xx7Qzw==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."ansi-color-0.2.1"
|
||||
sources."ansi-styles-3.2.1"
|
||||
sources."any-promise-1.3.0"
|
||||
sources."assertion-error-1.1.0"
|
||||
sources."balanced-match-1.0.2"
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."bufrw-1.3.0"
|
||||
sources."chai-4.3.7"
|
||||
sources."chai-as-promised-7.1.1"
|
||||
sources."chalk-2.4.2"
|
||||
sources."check-error-1.0.2"
|
||||
sources."color-convert-1.9.3"
|
||||
sources."color-name-1.1.3"
|
||||
sources."commander-2.20.3"
|
||||
sources."concat-map-0.0.1"
|
||||
sources."deep-eql-4.1.3"
|
||||
sources."error-7.0.2"
|
||||
sources."escape-string-regexp-1.0.5"
|
||||
sources."fast-deep-equal-2.0.1"
|
||||
sources."fast-json-patch-2.2.1"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."get-func-name-2.0.0"
|
||||
sources."glob-7.2.3"
|
||||
sources."has-flag-3.0.0"
|
||||
sources."hexer-1.5.0"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
sources."iterare-1.2.1"
|
||||
sources."jaeger-client-3.19.0"
|
||||
sources."lodash-4.17.21"
|
||||
sources."long-2.4.0"
|
||||
sources."loupe-2.3.6"
|
||||
sources."minimatch-3.1.2"
|
||||
sources."minimist-1.2.8"
|
||||
sources."mz-2.7.0"
|
||||
sources."node-int64-0.4.0"
|
||||
sources."object-assign-4.1.1"
|
||||
sources."object-hash-1.3.1"
|
||||
sources."once-1.4.0"
|
||||
sources."opentracing-0.14.7"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."pathval-1.1.1"
|
||||
sources."process-0.10.1"
|
||||
sources."rxjs-5.5.12"
|
||||
sources."semaphore-async-await-1.5.1"
|
||||
sources."string-similarity-2.0.0"
|
||||
sources."string-template-0.2.1"
|
||||
sources."supports-color-5.5.0"
|
||||
sources."symbol-observable-1.0.1"
|
||||
sources."thenify-3.3.1"
|
||||
sources."thenify-all-1.6.0"
|
||||
sources."thriftrw-3.12.0"
|
||||
sources."type-detect-4.0.8"
|
||||
sources."typescript-3.0.3"
|
||||
sources."uuid-8.3.2"
|
||||
sources."vscode-jsonrpc-4.0.0"
|
||||
sources."vscode-languageserver-5.2.1"
|
||||
(sources."vscode-languageserver-protocol-3.14.1" // {
|
||||
dependencies = [
|
||||
sources."vscode-languageserver-types-3.14.0"
|
||||
];
|
||||
})
|
||||
sources."vscode-languageserver-types-3.17.3"
|
||||
sources."vscode-uri-1.0.8"
|
||||
sources."wrappy-1.0.2"
|
||||
sources."xorshift-1.2.0"
|
||||
sources."xtend-4.0.2"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Implementation of the Language Server Protocol for JavaScript and TypeScript";
|
||||
homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
|
||||
license = "Apache-2.0";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
joplin = nodeEnv.buildNodePackage {
|
||||
name = "joplin";
|
||||
packageName = "joplin";
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "chart-studio";
|
||||
version = "5.15.0";
|
||||
version = "5.16.1";
|
||||
|
||||
# chart-studio was split from plotly
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = "plotly.py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-H+p2fPBXn+VqrW63KkdmPn2xqxC9uAOzQUV1ruKEUSs=";
|
||||
hash = "sha256-R94fmkz9cydOHKQbXMBR47OCdHHsR25uGiGszcr7AQQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/python/chart-studio";
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "debugpy";
|
||||
version = "1.6.7";
|
||||
version = "1.6.7.post1";
|
||||
format = "setuptools";
|
||||
|
||||
# Currently doesn't support 3.11:
|
||||
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "microsoft";
|
||||
repo = "debugpy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-porQTFvcLaIkvhWPM4vWR0ohlcFRkRwSLpQJNg25Tj4=";
|
||||
hash = "sha256-zsF6XUSAAKhwmUZkroRWvOBWXjTWzWuRYOhnYuN3KrY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,25 +1,28 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, django
|
||||
, django-extensions
|
||||
, django-js-asset
|
||||
, fetchFromGitHub
|
||||
, python
|
||||
, setuptools-scm
|
||||
, django-extensions
|
||||
, selenium
|
||||
, pillow
|
||||
, python
|
||||
, pythonOlder
|
||||
, selenium
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-ckeditor";
|
||||
version = "6.5.1";
|
||||
version = "6.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-ckeditor";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Gk8mAG0WIMQZolaE1sRDmzSkfiNHi/BWiotEtIC4WLk=";
|
||||
hash = "sha256-mZQ5s3YbumYmT0zRWPFIvzt2TbtDLvVcJjZVAwn31E8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -54,6 +57,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = " Django admin CKEditor integration";
|
||||
homepage = "https://github.com/django-ckeditor/django-ckeditor";
|
||||
changelog = "https://github.com/django-ckeditor/django-ckeditor/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "2.14.0";
|
||||
version = "2.15.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tXUGQI3TwBEHW+wxNn14zUx6PhzAwe5NX+78JIdTI5c=";
|
||||
hash = "sha256-5Lu/YSLmqWXFQ6w6egALqdePWYwWrDIahVkQn3iQCnA=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.29.0";
|
||||
version = "2.30.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kBcdzhfr5k5MiSJu3tVyE09a5whQgj6m1AsUEwcQxS4=";
|
||||
hash = "sha256-iR6+A3ekRxl3zA1K7DMaw4dyMwjM/yxh/7tOH//mwXY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-pubsub";
|
||||
version = "2.18.2";
|
||||
version = "2.18.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-W50UJJopwOW8a5jI18FmZEzBragwxA8AnyvLWIL1sQU=";
|
||||
hash = "sha256-tAcSM55fgbegNbC+iyrpBmhKQWLhGaK5qzO8mUuhty8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphene-django";
|
||||
version = "3.1.3";
|
||||
version = "3.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
owner = "graphql-python";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-33Z6W2dAsj5VXt3E7XJtUFiq7yFlCixnFnhbAUv+xgU=";
|
||||
hash = "sha256-1vl1Yj9MVBej5aFND8A63JMIog8aIW9SdwiOLIUwXxI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
, rich
|
||||
, pysocks
|
||||
# CheckInputs
|
||||
, pip
|
||||
, pytest-httpbin
|
||||
, pytest-lazy-fixture
|
||||
, pytest-mock
|
||||
|
@ -52,8 +53,10 @@ buildPythonPackage rec {
|
|||
rich
|
||||
] ++ requests.optional-dependencies.socks;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pip
|
||||
pytest-httpbin
|
||||
pytest-lazy-fixture
|
||||
pytest-mock
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, jupyter-core
|
||||
, notebook
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -21,6 +22,13 @@ buildPythonPackage rec {
|
|||
notebook
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# This test fails upstream too
|
||||
"tests/test_application.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jupyter_contrib_core" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -6,6 +6,9 @@
|
|||
, jupyter-highlight-selected-word
|
||||
, jupyter-nbextensions-configurator
|
||||
, lxml
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, notebook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -27,6 +30,20 @@ buildPythonPackage rec {
|
|||
lxml
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Thoses tests fail upstream because of nbconvert being too recent
|
||||
# https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1606
|
||||
"tests/test_exporters.py"
|
||||
|
||||
# Requires to run jupyter which is not feasible here
|
||||
"tests/test_application.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jupyter_contrib_nbextensions" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -34,5 +51,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/ipython-contrib/jupyter_contrib_nbextensions";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
# https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1647
|
||||
broken = versionAtLeast notebook.version "7";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14,6 +14,9 @@ buildPythonPackage rec {
|
|||
hash = "sha256-KgM//SIfES46uZySwNR4ZOcolnJORltvThsmEvxXoIs=";
|
||||
};
|
||||
|
||||
# This package does not have tests
|
||||
doChecks = false;
|
||||
|
||||
pythonImportsCheck = [ "jupyter_highlight_selected_word" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -8,6 +8,9 @@
|
|||
, notebook
|
||||
, pyyaml
|
||||
, tornado
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, selenium
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -39,6 +42,19 @@ buildPythonPackage rec {
|
|||
tornado
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
nose
|
||||
pytestCheckHook
|
||||
selenium
|
||||
];
|
||||
|
||||
# Those tests fails upstream
|
||||
disabledTestPaths = [
|
||||
"tests/test_application.py"
|
||||
"tests/test_jupyterhub.py"
|
||||
"tests/test_nbextensions_configurator.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jupyter_nbextensions_configurator" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,9 +2,12 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, jaxtyping
|
||||
, scipy
|
||||
, torch
|
||||
, pytestCheckHook
|
||||
, scipy
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, torch
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -19,10 +22,13 @@ buildPythonPackage rec {
|
|||
hash = "sha256-7NkcvVDwFaLHBZZhq7aKY3cWxe90qeKmodP6cVsdrPM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'find_version("linear_operator", "version.py")' \"$version\"
|
||||
'';
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jaxtyping
|
||||
|
@ -30,10 +36,12 @@ buildPythonPackage rec {
|
|||
torch
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pythonImportsCheck = [ "linear_operator" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
pythonImportsCheck = [ "linear_operator" ];
|
||||
|
||||
disabledTests = [
|
||||
# flaky numerical tests
|
||||
"test_svd"
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "minio";
|
||||
version = "7.1.15";
|
||||
version = "7.1.16";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "minio";
|
||||
repo = "minio-py";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eqQPOMEJOTdvYHaQ+ty+bDJn4/S5KnUOtF42O1wc+mw=";
|
||||
hash = "sha256-avGCAaqP2gLlrLDFzUJZW/KaT2lrueVjgsAJSk1eyX0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,28 +1,28 @@
|
|||
{ beautifulsoup4
|
||||
, bleach
|
||||
, buildPythonPackage
|
||||
, defusedxml
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
{ lib
|
||||
, fetchurl
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, hatchling
|
||||
, importlib-metadata
|
||||
, ipywidgets
|
||||
, beautifulsoup4
|
||||
, bleach
|
||||
, defusedxml
|
||||
, jinja2
|
||||
, jupyter-core
|
||||
, jupyterlab-pygments
|
||||
, lib
|
||||
, markupsafe
|
||||
, mistune
|
||||
, nbclient
|
||||
, packaging
|
||||
, pandocfilters
|
||||
, pygments
|
||||
, pyppeteer
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tinycss2
|
||||
, traitlets
|
||||
, importlib-metadata
|
||||
, flaky
|
||||
, ipywidgets
|
||||
, pyppeteer
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -33,15 +33,15 @@ let
|
|||
};
|
||||
in buildPythonPackage rec {
|
||||
pname = "nbconvert";
|
||||
version = "7.2.5";
|
||||
version = "7.7.3";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-j9xE/X2UJNt/3G4eg0oC9rhiD/tlN2c4i+L56xb4QYQ=";
|
||||
hash = "sha256-SlmWv1880WqgQxiXuhqkxkhCwgefQ0s9xrjEslLvM1U=";
|
||||
};
|
||||
|
||||
# Add $out/share/jupyter to the list of paths that are used to search for
|
||||
|
@ -85,6 +85,7 @@ in buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
flaky
|
||||
ipywidgets
|
||||
pyppeteer
|
||||
pytestCheckHook
|
||||
|
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "notebook";
|
||||
version = "7.0.1";
|
||||
version = "7.0.2";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LhatTmPqiffvviEu58FpP8+lq1X/73UEdTD3SvS9kmw=";
|
||||
hash = "sha256-1w1qB0GMgpvV9UM3zpk7cQUmHZAm+dP+aOm4qhog2po=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pipdeptree";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "tox-dev";
|
||||
repo = "pipdeptree";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4qRMET04JLVuDRfQtv/uQquf76iU00rnsWNaUXj1Gfw=";
|
||||
hash = "sha256-mblj6SQK/az2al81wMiWXHuyn1+30jfAxrWGv9Nw/gw=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py3exiv2";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZgDaa4lxmdTaZhkblgRfPMxfVwENp2s6xdKSuD/MqEQ=";
|
||||
hash = "sha256-crI+X3YMRzPPmpGNsI2U+9bZgwcR0qTowJuPNFY/Ooo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybase64";
|
||||
version = "1.2.3";
|
||||
version = "1.3.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dtB035p7mJs1iZJqsZRmd7uzmez+IwcUsTFX4mM2Ee0=";
|
||||
hash = "sha256-1MZHKrAITr1O4AW7mFFym9xk2PYsb65b2wdrICn0iO4=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
|
|
@ -3,8 +3,11 @@
|
|||
, pythonOlder
|
||||
, fetchPypi
|
||||
, cython
|
||||
, oldest-supported-numpy
|
||||
, packaging
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, wheel
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
@ -24,8 +27,12 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
numpy
|
||||
oldest-supported-numpy
|
||||
packaging
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,27 +1,41 @@
|
|||
{ lib, buildPythonPackage, unittestCheckHook, fetchPypi, isPy3k, glibcLocales }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, unittestCheckHook
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pystache";
|
||||
version = "0.6.0";
|
||||
version = "0.6.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "93bf92b2149a4c4b58d12142e2c4c6dd5c08d89e4c95afccd4b6efe2ee1d470d";
|
||||
hash = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
buildInputs = [ glibcLocales ];
|
||||
buildInputs = [
|
||||
glibcLocales
|
||||
];
|
||||
|
||||
# SyntaxError Python 3
|
||||
# https://github.com/defunkt/pystache/issues/181
|
||||
doCheck = !isPy3k;
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
pythonImportsCheck = [
|
||||
"pystache"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
|
||||
homepage = "https://github.com/defunkt/pystache";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "radish-bdd";
|
||||
version = "0.15.0";
|
||||
version = "0.16.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "radish";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SEW10ka0aQAXtW2UNCVJHMVhhZ9JTTj4IbskL87/Dn4=";
|
||||
hash = "sha256-fzxjDMmz5NMFRTQchlCOx2igqmhS6Zg0IU5HFO5a/0k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,22 +1,26 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, sphinx
|
||||
, beautifulsoup4
|
||||
, python-slugify
|
||||
, unidecode
|
||||
, buildPythonPackage
|
||||
, css-html-js-minify
|
||||
, fetchPypi
|
||||
, lxml
|
||||
, python-slugify
|
||||
, pythonOlder
|
||||
, sphinx
|
||||
, unidecode
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-material";
|
||||
version = "0.0.35";
|
||||
version = "0.0.36";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "sphinx_material";
|
||||
inherit version;
|
||||
sha256 = "27f0f1084aa0201b43879aef24a0521b78dc8df4942b003a4e7d79ab11515852";
|
||||
hash = "sha256-7v9ffT3AFq8yuv33DGbmcdFch1Tb4GE9+9Yp++2RKGk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -30,7 +34,9 @@ buildPythonPackage rec {
|
|||
|
||||
doCheck = false; # no tests
|
||||
|
||||
pythonImportsCheck = [ "sphinx_material" ];
|
||||
pythonImportsCheck = [
|
||||
"sphinx_material"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A material-based, responsive theme inspired by mkdocs-material";
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.23.1";
|
||||
version = "3.23.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2MQJJaTzpDeuk9BPLbzwWtbLC3jzd7ht2oGrVMCXRoc=";
|
||||
hash = "sha256-61nMytrqc7w7IbO7TX7H4O4DYoVL9MTBasN3UDx492w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
@ -128,9 +128,9 @@ rec {
|
|||
# https://docs.gradle.org/current/userguide/compatibility.html
|
||||
|
||||
gradle_8 = gen {
|
||||
version = "8.2.1";
|
||||
version = "8.3";
|
||||
nativeVersion = "0.22-milestone-24";
|
||||
sha256 = "1lasx96qgh1pjmjjk8a5a772ppgqmp33mp6axyfsjalg71nigv03";
|
||||
sha256 = "09cjyss4bcnig1wzhxpwyn4kznkawzaha7fy0jg5nqzw2ysma62r";
|
||||
defaultJava = jdk17;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,13 +1,9 @@
|
|||
{ lib, sbt, makeWrapper, boehmgc, libunwind, re2, llvmPackages, zlib }:
|
||||
|
||||
sbt.overrideDerivation(old: {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
sbt.overrideAttrs(previousAttrs: {
|
||||
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ makeWrapper ];
|
||||
|
||||
version = "0.13.16";
|
||||
|
||||
sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2";
|
||||
|
||||
postFixup = ''
|
||||
postFixup = (previousAttrs.postFixup or "") + ''
|
||||
wrapProgram $out/bin/sbt \
|
||||
--set CLANG_PATH "${llvmPackages.clang}/bin/clang" \
|
||||
--set CLANGPP_PATH "${llvmPackages.clang}/bin/clang" \
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "changie";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "miniscruff";
|
||||
repo = pname;
|
||||
sha256 = "sha256-lc9G5qZHjO2TxBKYP3fVr8Ui+hskhVon3xG7RznGhaw=";
|
||||
repo = "changie";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ck86zgAtDm/hlz2kDvTRVcH4NS1LaxtseChOdcYE48g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sak9MMqMXBO3j5uMouuiVnT8aCw04pyikgqzvdygB7U=";
|
||||
vendorHash = "sha256-kSV4ruvPcDyqt+LgKkcAGMUJy8CGG6xpFneK+vKdI0Q=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
27
pkgs/development/tools/htmlhint/default.nix
Normal file
27
pkgs/development/tools/htmlhint/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "htmlhint";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "htmlhint";
|
||||
repo = "HTMLHint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6R+/uwqWpuTjUnFeUFMzZBzhlFBxYceYZfLLuaYhc6k=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-m5hHxA2YTk7qNpc1Z6TXxNTfIMY5LCM9Il9JHJxQJlI=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Static code analysis tool for HTML";
|
||||
homepage = "https://github.com/htmlhint/HTMLHint";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "htmlhint";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "javascript-typescript-langserver";
|
||||
version = "2.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "javascript-typescript-langserver";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vd7Hj0jPFgK0u3CBlMfOFERmW+w9CnKIY9nvs48KqsI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-nHGTi1aH9YY01dzBeNyUEUEswrdjZPWaoycDVZZmIAA=";
|
||||
|
||||
meta = {
|
||||
description = "JavaScript and TypeScript code intelligence through the Language Server Protocol";
|
||||
homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dywedir ];
|
||||
};
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lightningcss";
|
||||
version = "1.21.5";
|
||||
version = "1.21.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parcel-bundler";
|
||||
repo = "lightningcss";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "PEYrXykSdmLKhbhDgQNCQvp9wWos86WjWGZk3V84pew=";
|
||||
sha256 = "esLPAKdqYdpB3/ffsV/NAmfjGU9G8y13f/59bWD0yR0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iCMG5Vfewotb5C0Gwtz/Py9B1hD28ssSy7C5ZiicFbU=";
|
||||
cargoHash = "sha256-8k6BhhBQ8X08vW0a8x8v1YNwiXFrzvWxcL47XdaqWJs=";
|
||||
|
||||
buildFeatures = [
|
||||
"cli"
|
||||
|
|
|
@ -3,11 +3,11 @@ GEM
|
|||
specs:
|
||||
childprocess (4.1.0)
|
||||
iniparse (1.5.0)
|
||||
overcommit (0.59.1)
|
||||
overcommit (0.60.0)
|
||||
childprocess (>= 0.6.3, < 5)
|
||||
iniparse (~> 1.4)
|
||||
rexml (~> 3.2)
|
||||
rexml (3.2.5)
|
||||
rexml (3.2.6)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
@ -16,4 +16,4 @@ DEPENDENCIES
|
|||
overcommit
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.22
|
||||
2.4.17
|
||||
|
|
|
@ -25,19 +25,19 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dbz2y98r351r218m9d871ris1zfb6bcwr1gdhb39g2r9pail79n";
|
||||
sha256 = "0slqmsycbqx746liwq0qw0c81xrp4051iff8s574a4fmj941gkia";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.59.1";
|
||||
version = "0.60.0";
|
||||
};
|
||||
rexml = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
|
||||
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
};
|
||||
}
|
||||
|
|
45
pkgs/games/cutechess/default.nix
Normal file
45
pkgs/games/cutechess/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cutechess";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cutechess";
|
||||
repo = "cutechess";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-P44Twbw2MGz+oTzPwMFCe73zPxAex6uYjSTtaUypfHw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm555 cutechess{,-cli} -t $out/bin/
|
||||
install -Dm444 libcutechess.a -t $out/lib/
|
||||
install -Dm444 $src/docs/cutechess-cli.6 -t $out/share/man/man6/
|
||||
install -Dm444 $src/docs/cutechess-engines.json.5 -t $out/share/man/man5/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI, CLI, and library for playing chess";
|
||||
homepage = "https://cutechess.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ eclairevoyant ];
|
||||
platforms = with platforms; (linux ++ windows);
|
||||
mainProgram = "cutechess";
|
||||
};
|
||||
})
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, fetchpatch
|
||||
, writeScript
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
|
@ -10,14 +11,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "gogdl";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "heroic-gogdl";
|
||||
rev = "d7f29dfef5818e8b323d04761e18a9abb750f93e";
|
||||
hash = "sha256-9dAenawt9h/sz5paVYoqk+nmzPrInlqyh1EgshI25CE=";
|
||||
rev = "d2fa34bfba7beb2ecc0e3fc70a657f2c612c8a10";
|
||||
hash = "sha256-YCqtfY49lDg6sLrF/INOZVD9cMCwvejhySzUWrxHKAw=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -27,6 +28,13 @@ buildPythonApplication rec {
|
|||
requests
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/Heroic-Games-Launcher/heroic-gogdl/pull/37.patch";
|
||||
hash = "sha256-oZLetPoWzsEDrL0Bh89HB4hTn70FTh8aXj9mKGr4Dqw=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gogdl" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -10,23 +10,24 @@
|
|||
, electron
|
||||
, gogdl
|
||||
, legendary-gl
|
||||
, nile
|
||||
}:
|
||||
|
||||
let appName = "heroic";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "heroic-unwrapped";
|
||||
version = "2.8.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "HeroicGamesLauncher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AZwJRBkWuzBPT+ADVHabiK2KRXe6clZFa0IO99BO2Wk=";
|
||||
hash = "sha256-1FtAcp6cG2qRfWrAgCOQ87DzMvszqqhObfSzepezBGc=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-xiLK0D9+oL2UMD7b/9htOQJEpYCNayKW+KJ/vNVCgsw=";
|
||||
hash = "sha256-KEzTjtoBcHNJxC/7W/Bft75JZuZUSHieOOAwhbr5d3s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -37,6 +38,14 @@ in stdenv.mkDerivation rec {
|
|||
makeWrapper
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Reverts part of upstream PR 2761 so that we don't have to use a non-free Electron fork.
|
||||
# https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/2761
|
||||
./remove-drm-support.patch
|
||||
# Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic.
|
||||
./fix-non-steam-shortcuts.patch
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
|
@ -74,7 +83,11 @@ in stdenv.mkDerivation rec {
|
|||
chmod -R u+w "$out/share/${appName}/public/bin" "$out/share/${appName}/build/bin"
|
||||
rm -rf "$out/share/${appName}/public/bin" "$out/share/${appName}/build/bin"
|
||||
mkdir -p "$out/share/${appName}/build/bin/${binPlatform}"
|
||||
ln -s "${gogdl}/bin/gogdl" "${legendary-gl}/bin/legendary" "$out/share/${appName}/build/bin/${binPlatform}"
|
||||
ln -s \
|
||||
"${gogdl}/bin/gogdl" \
|
||||
"${legendary-gl}/bin/legendary" \
|
||||
"${nile}"/bin/nile \
|
||||
"$out/share/${appName}/build/bin/${binPlatform}"
|
||||
|
||||
makeWrapper "${electron}/bin/electron" "$out/bin/heroic" \
|
||||
--inherit-argv0 \
|
||||
|
@ -92,7 +105,7 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Native GOG and Epic Games Launcher for Linux, Windows and Mac";
|
||||
description = "A Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac";
|
||||
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
|
||||
changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases";
|
||||
license = licenses.gpl3Only;
|
||||
|
|
13
pkgs/games/heroic/fix-non-steam-shortcuts.patch
Normal file
13
pkgs/games/heroic/fix-non-steam-shortcuts.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
|
||||
index ebef6aa4..c8bd853d 100644
|
||||
--- a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
|
||||
+++ b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
|
||||
@@ -252,7 +252,7 @@ async function addNonSteamGame(props: {
|
||||
// add new Entry
|
||||
const newEntry = {} as ShortcutEntry
|
||||
newEntry.AppName = props.gameInfo.title
|
||||
- newEntry.Exe = `"${app.getPath('exe')}"`
|
||||
+ newEntry.Exe = `"heroic"`
|
||||
newEntry.StartDir = `"${process.cwd()}"`
|
||||
|
||||
if (isFlatpak) {
|
24
pkgs/games/heroic/remove-drm-support.patch
Normal file
24
pkgs/games/heroic/remove-drm-support.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
diff --git a/src/backend/main.ts b/src/backend/main.ts
|
||||
index 2cd1a28f..a60e04d0 100644
|
||||
--- a/src/backend/main.ts
|
||||
+++ b/src/backend/main.ts
|
||||
@@ -19,8 +19,7 @@ import {
|
||||
powerSaveBlocker,
|
||||
protocol,
|
||||
screen,
|
||||
- clipboard,
|
||||
- components
|
||||
+ clipboard
|
||||
} from 'electron'
|
||||
import 'backend/updater'
|
||||
import { autoUpdater } from 'electron-updater'
|
||||
@@ -286,8 +285,7 @@ if (!gotTheLock) {
|
||||
initImagesCache()
|
||||
|
||||
if (!process.env.CI) {
|
||||
- await components.whenReady()
|
||||
- logInfo(['DRM module staus', components.status()])
|
||||
+ logInfo('DRM modules disabled for nixpkgs')
|
||||
}
|
||||
|
||||
// try to fix notification app name on windows
|
|
@ -4,20 +4,24 @@
|
|||
, buildPythonApplication
|
||||
, pythonOlder
|
||||
, requests
|
||||
, filelock
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "legendary-gl"; # Name in pypi
|
||||
version = "0.20.32";
|
||||
version = "0.20.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derrod";
|
||||
repo = "legendary";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-MsvhVS3lqhgBJ+S/cjXFP70I3rM5WBYT7TyVlRWhNWw=";
|
||||
sha256 = "sha256-fEQUChkxrKV2IkFGORUolZE2qTzA10Xxogjl5Va4TcE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
filelock
|
||||
];
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
84
pkgs/games/nile/default.nix
Normal file
84
pkgs/games/nile/default.nix
Normal file
|
@ -0,0 +1,84 @@
|
|||
{ lib
|
||||
, writeScript
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, requests
|
||||
, protobuf
|
||||
, pycryptodome
|
||||
, zstandard
|
||||
, json5
|
||||
, platformdirs
|
||||
, cacert
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "nile";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imLinguin";
|
||||
repo = "nile";
|
||||
rev = "f5f3b96f6483c59cfc646afbda6e97cb0bd94778";
|
||||
hash = "sha256-HibY3U9/MibEDwHY+YiErW/pz6qwtps8wwjhznTISgA=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
requests
|
||||
protobuf
|
||||
pycryptodome
|
||||
zstandard
|
||||
json5
|
||||
platformdirs
|
||||
];
|
||||
|
||||
pyprojectAppendix = ''
|
||||
[tool.setuptools.packages.find]
|
||||
include = ["nile*"]
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
echo "$pyprojectAppendix" >> pyproject.toml
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "nile" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial Amazon Games client";
|
||||
homepage = "https://github.com/imLinguin/nile";
|
||||
license = with licenses; [ gpl3 ];
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
};
|
||||
|
||||
# Upstream does not create git tags when bumping the version, so we have to
|
||||
# extract it from the source code on the main branch.
|
||||
passthru.updateScript = writeScript "gogdl-update-script" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused jq common-updater-scripts
|
||||
set -eou pipefail;
|
||||
|
||||
owner=imLinguin
|
||||
repo=nile
|
||||
path='nile/__init__.py'
|
||||
|
||||
version=$(
|
||||
curl --cacert "${cacert}/etc/ssl/certs/ca-bundle.crt" \
|
||||
https://raw.githubusercontent.com/$owner/$repo/main/$path |
|
||||
sed -n 's/^\s*version\s*=\s*"\([0-9]\.[0-9]\.[0-9]\)"\s*$/\1/p')
|
||||
|
||||
commit=$(curl --cacert "${cacert}/etc/ssl/certs/ca-bundle.crt" \
|
||||
https://api.github.com/repos/$owner/$repo/commits?path=$path |
|
||||
jq -r '.[0].sha')
|
||||
|
||||
update-source-version \
|
||||
${pname} \
|
||||
"$version" \
|
||||
--file=./pkgs/games/nile/default.nix \
|
||||
--rev=$commit
|
||||
'';
|
||||
}
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "10.2.4";
|
||||
version = "10.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4N2Eo6InqdK5CFhHp8X3+1xKA99Wtnj2Q0/GDglWoBc=";
|
||||
hash = "sha256-UkhcSRVABgZs9/G5r6ZMLfFPZMeXE8atR5+HNG5y3tk=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "6.1.33-rt11"; # updated by ./update-rt.sh
|
||||
version = "6.1.46-rt13"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
@ -18,14 +18,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1kfj7mi3n2lfaw4spz5cbvcl1md038figabyg80fha3kxal6nzdq";
|
||||
sha256 = "15m228bllks2p8gpsmvplx08yxzp7bij9fnmnafqszylrk7ppxpm";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0swzp6brk01r7pb73yada18vf6fhdqq4c78abq3abj6y8ay0awhh";
|
||||
sha256 = "00pj02mvamxvlkwrca1j3baaa18rg6dra7al1xsvgw3ypckwyafz";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
@ -58,11 +58,15 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do
|
|||
echo "Updated $OLDVER -> $V"
|
||||
done
|
||||
|
||||
# Update linux-rt
|
||||
COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh
|
||||
# Allowing errors again: one broken update script shouldn't inhibit the
|
||||
# update of other kernel variants.
|
||||
set +e
|
||||
|
||||
# Update linux-libre
|
||||
COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh
|
||||
echo Update linux-rt
|
||||
COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh || echo "update-rt failed with exit code $?"
|
||||
|
||||
# Update linux-hardened
|
||||
COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/hardened/update.py
|
||||
echo Update linux-libre
|
||||
COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh || echo "update-libre failed with exit code $?"
|
||||
|
||||
echo Update linux-hardened
|
||||
COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/hardened/update.py || echo "update-hardened failed with exit code $?"
|
||||
|
|
|
@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.unfreeRedistributable;
|
||||
platforms = nvidia_x11.meta.platforms;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
mainProgram = pname;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -16,14 +16,22 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/heftig/rtkit/commit/7d62095b94f8df3891c984a1535026d2658bb177.patch";
|
||||
name = "meson-actual-use-systemd_systemunitdir.patch";
|
||||
url = "https://github.com/heftig/rtkit/pull/19/commits/7d62095b94f8df3891c984a1535026d2658bb177.patch";
|
||||
sha256 = "17acv549zqcgh7sgprfagbf6drqsr0zdwvf1dsqda7wlqc2h9zn7";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://github.com/heftig/rtkit/commit/98f70edd8f534c371cb4308b9720739c5178918d.patch";
|
||||
name = "meson-fix-librt-find_library-check.patch";
|
||||
url = "https://github.com/heftig/rtkit/pull/18/commits/98f70edd8f534c371cb4308b9720739c5178918d.patch";
|
||||
sha256 = "18mnjjsdjfr184nkzi01xyphpdngi31ry4bmkv9ysjxf9wilv4nl";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "rtkit-daemon-dont-log-debug-messages-by-default.patch";
|
||||
url = "https://github.com/heftig/rtkit/pull/33/commits/ad649ee491ed1a41537774ad11564a208e598a09.patch";
|
||||
sha256 = "sha256-p+MdJVMv58rFd1uc1UFKtq83RquDSFZ3M6YfaBU12UU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config unixtools.xxd ];
|
||||
|
|
|
@ -9,13 +9,11 @@ let
|
|||
owner = "superseriousbusiness";
|
||||
repo = "gotosocial";
|
||||
|
||||
version = "0.10.0";
|
||||
source-hash = "sha256-SE+u89xAV6jJulU8XETlzTrqtwBYeMdNGyjk648b7h8=";
|
||||
web-assets-hash = "sha256-tYqnGqII8gf+aVd/J5lvhurhCrH8ihWYn7noBJbEgqA=";
|
||||
version = "0.11.0";
|
||||
|
||||
web-assets = fetchurl {
|
||||
url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
|
||||
hash = web-assets-hash;
|
||||
hash = "sha256-NK5m+ERZQtl5Stq2+bWw0LS2SbmlhEJDZjTTxYciemE=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
@ -25,7 +23,7 @@ buildGoModule rec {
|
|||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = source-hash;
|
||||
hash = "sha256-qbq5pDvG2L1s6BG+sh7eagcFNH/DWyANMQaAl2WcQzE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
99
pkgs/servers/sqlpage/default.nix
Normal file
99
pkgs/servers/sqlpage/default.nix
Normal file
|
@ -0,0 +1,99 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, zstd
|
||||
, stdenv
|
||||
, darwin
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
let
|
||||
apexcharts = fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js";
|
||||
sha256 = "sha256-JvfrbG0Jkj1XzwMu28wweq4DTzHgRAQHmC5f0stdU5Q=";
|
||||
};
|
||||
tablerCss = fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css";
|
||||
sha256 = "sha256-vvqPe3OoUsri+/z6/s3a9LZ/u0tM07VNmVWopaXS3Uk=";
|
||||
};
|
||||
tablerVendorsCss = fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css";
|
||||
sha256 = "sha256-Pxz9YzwGJIUlHDNZMU9h7Lz/7qA/t0ehlRfC1P8wzxE=";
|
||||
};
|
||||
tablerJs = fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js";
|
||||
sha256 = "sha256-xnY4FSLoAEy0TVjo/xv488tAXOrI+hvXGvEVVQdMDk8=";
|
||||
};
|
||||
listJsFixed = fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js";
|
||||
sha256 = "sha256-mwE8YX5fgYlI9M7zCNDlPxT7pb7NJPkOyo1Y+4At85s=";
|
||||
};
|
||||
tablerIcons = fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg";
|
||||
sha256 = "sha256-xRHWlHNQraZpiRlgVswkfgN1qMrjQOtRYAq1N/DccgQ=";
|
||||
};
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sqlpage";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lovasoa";
|
||||
repo = "SQLpage";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6KJ3phhOf10S0EMdolUw3sdXm1G7yuF+Ii/AjdgBE+s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace sqlpage/apexcharts.js \
|
||||
--replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js */' \
|
||||
"$(cat ${apexcharts})"
|
||||
substituteInPlace sqlpage/sqlpage.css \
|
||||
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css */' \
|
||||
"$(cat ${tablerCss})"
|
||||
substituteInPlace sqlpage/sqlpage.css \
|
||||
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css */' \
|
||||
"$(cat ${tablerVendorsCss})"
|
||||
substituteInPlace sqlpage/sqlpage.js \
|
||||
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js */' \
|
||||
"$(cat ${tablerJs})"
|
||||
substituteInPlace sqlpage/sqlpage.js \
|
||||
--replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js */' \
|
||||
"$(cat ${listJsFixed})"
|
||||
substituteInPlace sqlpage/tabler-icons.svg \
|
||||
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg */' \
|
||||
"$(cat ${tablerIcons})"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-kJzBvZSh6jkSJ4um+KYp7fKklDPlvOgz5NQb7j99brw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
sqlite
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "SQL-only webapp builder, empowering data analysts to build websites and applications quickly";
|
||||
homepage = "https://github.com/lovasoa/SQLpage";
|
||||
changelog = "https://github.com/lovasoa/SQLpage/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
|
@ -6,15 +6,15 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "aws-sso-cli";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "synfinatic";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Vem0RMKkCwgqs06Ly3Awz4EcCWLd0H4xjWGRbnAlqbE=";
|
||||
hash = "sha256-RshR1GA3BvvPwwkVxrM98FfgW3kNaMM0Vqr7iEuoFek=";
|
||||
};
|
||||
vendorHash = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI=";
|
||||
vendorHash = "sha256-skFENAr5XjdKoAyVwXYJVZH+IviqfyZmMIdgHq+7IPs=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.24.2";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SdQOoixfSQdSS9SOc/U0Ay9VIRfsrgALhLT4cESgSLo=";
|
||||
hash = "sha256-TLphJr1DhJ30Mu3x3/9pNe1IiI9prafFMg1dDtbgqlE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MZyNSgsz1pngEuYxmG/GUqQeTmA5D6Y0tcToafFu1F8=";
|
||||
cargoHash = "sha256-dtNy3rWz6hMkatiV4z2gB4Z00gjtzREqjy7E48tmcdk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rtx";
|
||||
version = "1.35.8";
|
||||
version = "2023.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdxcode";
|
||||
repo = "rtx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oofbnZAB1a/Het5fqwDVx8Fl2aZcOhtb2/sKIF3KDFA=";
|
||||
hash = "sha256-I5S9HR+syvj5H7xJKhtM7Ja+8wlKL6A01SDb9TjeoS8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hcDHFA20jQgUnrdvqKSNCE17yVsH7B/WUKAVZN4Ck2o=";
|
||||
cargoHash = "sha256-zbJ+U3PZIGp+BYQbc50+Kgh1KFF7svela3DsyogO/r8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
# package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606
|
||||
, pkgs
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, zlib
|
||||
, openssl
|
||||
, libedit
|
||||
|
@ -42,6 +44,14 @@ stdenv.mkDerivation {
|
|||
|
||||
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966
|
||||
./dont_create_privsep_path.patch
|
||||
|
||||
# Pull upstream zlib-1.3 support.
|
||||
# The patch changes configure.ac, uses autoreconfHook.
|
||||
(fetchpatch {
|
||||
name = "zlib-1.3.patch";
|
||||
url = "https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch";
|
||||
hash = "sha256-3Gx0/I2n9/XaWCIefVYtvk5f+VgH6MlhMBse+PMyf34=";
|
||||
})
|
||||
] ++ extraPatches;
|
||||
|
||||
postPatch =
|
||||
|
@ -52,7 +62,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ]
|
||||
# This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is
|
||||
# needed here to access krb5-config in order to cross compile. See:
|
||||
# https://github.com/NixOS/nixpkgs/pull/107606
|
||||
|
|
1028
pkgs/tools/networking/veilid/Cargo.lock
generated
1028
pkgs/tools/networking/veilid/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -10,14 +10,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "veilid";
|
||||
version = "0.1.7";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "veilid";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-wG8uxmohIOb8V+5gqhjM4hHG/6uHg0ehAtP2z5eoflU=";
|
||||
sha256 = "sha256-mkb10JishprTyHV5lsFp/P57E2xTX+baHkJM4K2p4x4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
31
pkgs/tools/security/xcrawl3r/default.nix
Normal file
31
pkgs/tools/security/xcrawl3r/default.nix
Normal file
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "xcrawl3r";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hueristiq";
|
||||
repo = "xcrawl3r";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-K7UuWsteI8mEAGOF/g/EbT/Ch6sbmKhiiYB3npdDmFk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/yBSrZdlVMZgcKcONBSq7C5IFC30TJL0z6FZRXm+HUs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI utility to recursively crawl webpages";
|
||||
homepage = "https://github.com/hueristiq/xcrawl3r";
|
||||
changelog = "https://github.com/hueristiq/xcrawl3r/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ianwookim makefu veprbl dtzWill ];
|
||||
mainProgram = "proot";
|
||||
};
|
||||
}
|
||||
|
|
69
pkgs/tools/virtualization/mkosi/default.nix
Normal file
69
pkgs/tools/virtualization/mkosi/default.nix
Normal file
|
@ -0,0 +1,69 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, buildPythonApplication
|
||||
, pytestCheckHook
|
||||
, bubblewrap
|
||||
, systemd
|
||||
, stdenv
|
||||
}:
|
||||
let
|
||||
# For systemd features used by mkosi, see
|
||||
# https://github.com/systemd/mkosi/blob/19bb5e274d9a9c23891905c4bcbb8f68955a701d/action.yaml#L64-L72
|
||||
systemdForMkosi = systemd.override {
|
||||
# Will be added in #243242
|
||||
# withRepart = true;
|
||||
# withBootloader = true;
|
||||
withEfi = true;
|
||||
withUkify = true;
|
||||
};
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "mkosi";
|
||||
version = "15.2-pre"; # 15.1 is the latest release, but we require a newer commit
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "systemd";
|
||||
repo = "mkosi";
|
||||
# Fix from the commit is needed to run on NixOS,
|
||||
# see https://github.com/systemd/mkosi/issues/1792
|
||||
rev = "ca9673cbcbd9f293e5566cec4a1ba14bbcd075b8";
|
||||
hash = "sha256-y5gG/g33HBpH1pTXfjHae25bc5p/BvlCm9QxOIYtcA8=";
|
||||
};
|
||||
|
||||
# Fix ctypes finding library
|
||||
# https://github.com/NixOS/nixpkgs/issues/7307
|
||||
patchPhase = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace mkosi/run.py --replace \
|
||||
'ctypes.util.find_library("c")' "'${stdenv.cc.libc}/lib/libc.so.6'"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
|
||||
propagatedBuildInputs = [
|
||||
systemdForMkosi
|
||||
bubblewrap
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/mkosi \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Build legacy-free OS images";
|
||||
homepage = "https://github.com/systemd/mkosi";
|
||||
license = licenses.lgpl21Only;
|
||||
mainProgram = "mkosi";
|
||||
maintainers = with maintainers; [ malt3 katexochen ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -1488,6 +1488,7 @@ mapAliases ({
|
|||
quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22
|
||||
quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09
|
||||
quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-03
|
||||
qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19
|
||||
qvim = throw "qvim has been removed"; # Added 2020-08-31
|
||||
qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08
|
||||
qwt6 = throw "'qwt6' has been renamed to/replaced by 'libsForQt5.qwt'"; # Converted to throw 2022-02-22
|
||||
|
|
|
@ -1850,6 +1850,8 @@ with pkgs;
|
|||
|
||||
mgmt = callPackage ../applications/system/mgmt { };
|
||||
|
||||
mkosi = python3Packages.callPackage ../tools/virtualization/mkosi { inherit systemd; };
|
||||
|
||||
monica = callPackage ../servers/web-apps/monica { };
|
||||
|
||||
mpremote = python3Packages.callPackage ../tools/misc/mpremote { };
|
||||
|
@ -1972,6 +1974,8 @@ with pkgs;
|
|||
|
||||
trigger-control = callPackage ../tools/games/trigger-control { };
|
||||
|
||||
trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; };
|
||||
|
||||
ttchat = callPackage ../tools/misc/ttchat { };
|
||||
|
||||
ukmm = callPackage ../tools/games/ukmm { };
|
||||
|
@ -13766,7 +13770,9 @@ with pkgs;
|
|||
|
||||
tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { };
|
||||
|
||||
tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
|
||||
tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins {
|
||||
pkgs = pkgs.__splicedPackages;
|
||||
});
|
||||
|
||||
tmsu = callPackage ../tools/filesystems/tmsu { };
|
||||
|
||||
|
@ -14622,6 +14628,8 @@ with pkgs;
|
|||
|
||||
xspim = callPackage ../development/tools/misc/xspim { };
|
||||
|
||||
xcrawl3r = callPackage ../tools/security/xcrawl3r { };
|
||||
|
||||
xcruiser = callPackage ../applications/misc/xcruiser { };
|
||||
|
||||
xwallpaper = callPackage ../tools/X11/xwallpaper { };
|
||||
|
@ -16226,6 +16234,7 @@ with pkgs;
|
|||
|
||||
idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {
|
||||
idris-no-deps = haskellPackages.idris;
|
||||
pkgs = pkgs.__splicedPackages;
|
||||
});
|
||||
|
||||
idris = idrisPackages.with-packages [ idrisPackages.base ] ;
|
||||
|
@ -18378,6 +18387,8 @@ with pkgs;
|
|||
|
||||
helm-ls = callPackage ../development/tools/language-servers/helm-ls { };
|
||||
|
||||
javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { };
|
||||
|
||||
jdt-language-server = callPackage ../development/tools/language-servers/jdt-language-server { };
|
||||
|
||||
jsonnet-language-server = callPackage ../development/tools/language-servers/jsonnet-language-server { };
|
||||
|
@ -19385,6 +19396,8 @@ with pkgs;
|
|||
|
||||
confluent-cli = callPackage ../development/tools/confluent-cli { };
|
||||
|
||||
htmlhint = callPackage ../development/tools/htmlhint { };
|
||||
|
||||
htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };
|
||||
|
||||
hyenae = callPackage ../tools/networking/hyenae { };
|
||||
|
@ -20129,6 +20142,8 @@ with pkgs;
|
|||
|
||||
sqlmap = with python3Packages; toPythonApplication sqlmap;
|
||||
|
||||
sqlpage = callPackage ../servers/sqlpage { };
|
||||
|
||||
src-cli = callPackage ../development/tools/misc/src-cli { };
|
||||
|
||||
sselp = callPackage ../tools/X11/sselp{ };
|
||||
|
@ -29859,6 +29874,8 @@ with pkgs;
|
|||
|
||||
sampradaya = callPackage ../data/fonts/sampradaya { };
|
||||
|
||||
sarabun-font = callPackage ../data/fonts/sarabun { };
|
||||
|
||||
sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { };
|
||||
|
||||
savepagenow = callPackage ../tools/misc/savepagenow { };
|
||||
|
@ -34976,8 +34993,7 @@ with pkgs;
|
|||
withXineBackend = true;
|
||||
};
|
||||
|
||||
qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { };
|
||||
qutebrowser-qt6 = callPackage ../applications/networking/browsers/qutebrowser {
|
||||
qutebrowser = callPackage ../applications/networking/browsers/qutebrowser {
|
||||
inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland;
|
||||
};
|
||||
|
||||
|
@ -37560,6 +37576,8 @@ with pkgs;
|
|||
curseofwar = callPackage ../games/curseofwar { SDL = null; };
|
||||
curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
|
||||
|
||||
cutechess = qt5.callPackage ../games/cutechess { };
|
||||
|
||||
cutemaze = qt6Packages.callPackage ../games/cutemaze { };
|
||||
|
||||
cuyo = callPackage ../games/cuyo { };
|
||||
|
@ -37995,6 +38013,8 @@ with pkgs;
|
|||
|
||||
nexuiz = callPackage ../games/nexuiz { };
|
||||
|
||||
nile = python3Packages.callPackage ../games/nile { };
|
||||
|
||||
ninvaders = callPackage ../games/ninvaders { };
|
||||
|
||||
njam = callPackage ../games/njam { };
|
||||
|
@ -41941,6 +41961,8 @@ with pkgs;
|
|||
|
||||
ov = callPackage ../tools/text/ov { };
|
||||
|
||||
deface = callPackage ../applications/video/deface { };
|
||||
|
||||
tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { };
|
||||
|
||||
tubekit-unwrapped = callPackage ../applications/networking/cluster/tubekit { };
|
||||
|
|
Loading…
Reference in a new issue