3
0
Fork 0
forked from mirrors/nixpkgs

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-02-19 00:03:03 +00:00 committed by GitHub
commit 8c0220980d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 568 additions and 267 deletions

View file

@ -34,7 +34,7 @@ let
text = if (cfg.configFile != null) then ''
cp ${cfg.configFile} ${configPath}
# make config file readable by service
chown -R --reference=$HOME $(dirname ${configPath})
chown -R --reference="$HOME" "$(dirname ${configPath})"
'' else ''
export CONFIG_FILE=${configPath}

View file

@ -409,7 +409,7 @@ in
provision = {
enable = cfg.provision.grafana.datasource || cfg.provision.grafana.dashboard;
datasources =
datasources.settings.datasources =
let
esVersion = lib.getVersion config.services.elasticsearch.package;
in
@ -435,7 +435,7 @@ in
};
}
];
dashboards = lib.mkIf cfg.provision.grafana.dashboard [{
dashboards.settings.providers = lib.mkIf cfg.provision.grafana.dashboard [{
name = "parsedmarc";
options.path = "${pkgs.python3Packages.parsedmarc.dashboard}";
}];

View file

@ -7,8 +7,8 @@ let
in
stdenv.mkDerivation rec {
srcVersion = "oct22b";
version = "20221001_b";
srcVersion = "feb23a";
version = "20230201_a";
pname = "gildas";
src = fetchurl {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
sha256 = "sha256-MGfU2gzBbJ8ITpU7OiwCaHbi8s9Y6gvcAvSUuEZjfqk=";
sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE=";
};
nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ];
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";

View file

@ -1,13 +0,0 @@
diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py
--- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200
+++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200
@@ -32,7 +32,7 @@
libs.insert(0, '-L' + getvar('LIBDIR'))
# Framework (specific for Mac)
-if not getvar('PYTHONFRAMEWORK'):
- libs.extend(getvar('LINKFORSHARED').split())
+#if not getvar('PYTHONFRAMEWORK'):
+# libs.extend(getvar('LINKFORSHARED').split())
print(' '.join(libs))

View file

@ -0,0 +1,39 @@
Per https://bodhi.fedoraproject.org/updates/FEDORA-2022-dc47174c36:
This update fixes a failure to build with source with bash 5.2. Bash's
`patsub_replacement` feature makes ampersand a special character when doing
variable substitution, which was not previously the case. This update instructs
bash to turn off the new behavior.
The patch itself is adapted from
https://src.fedoraproject.org/rpms/cvc4/blob/f7c24c6ad72a8812d244313f13032fa23d393315/f/cvc4-bash-patsub-replacement.patch.
--- a/src/expr/mkexpr 2020-06-19 10:59:27.000000000 -0600
+++ b/src/expr/mkexpr 2022-10-11 14:28:31.120453409 -0600
@@ -16,6 +16,7 @@
#
copyright=2010-2014
+shopt -u patsub_replacement
filename=`basename "$1" | sed 's,_template,,'`
--- a/src/expr/mkkind 2020-06-19 10:59:27.000000000 -0600
+++ b/src/expr/mkkind 2022-10-11 14:34:17.008996126 -0600
@@ -15,6 +15,7 @@
#
copyright=2010-2014
+shopt -u patsub_replacement
filename=`basename "$1" | sed 's,_template,,'`
--- a/src/expr/mkmetakind 2020-06-19 10:59:27.000000000 -0600
+++ b/src/expr/mkmetakind 2022-10-11 14:34:32.248020036 -0600
@@ -18,6 +18,7 @@
#
copyright=2010-2014
+shopt -u patsub_replacement
cat <<EOF
/********************* */

View file

@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat
'';
patches = [
./cvc4-bash-patsub-replacement.patch
];
preConfigure = ''
patchShebangs ./src/
'';

View file

@ -19,7 +19,9 @@
, libwpd
, libxslt
, lyx
, makeWrapper
, perl
, perlPackages
, pkg-config
, poppler_utils
, python3Packages
@ -66,6 +68,7 @@ mkDerivation rec {
file
pkg-config
python3Packages.setuptools
makeWrapper
which
];
@ -73,6 +76,7 @@ mkDerivation rec {
bison
chmlib
python3Packages.python
python3Packages.mutagen
xapian
zlib
] ++ lib.optional withGui [
@ -111,6 +115,10 @@ mkDerivation rec {
substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl
fi
done
wrapProgram $out/share/recoll/filters/rclaudio.py \
--prefix PYTHONPATH : $PYTHONPATH
wrapProgram $out/share/recoll/filters/rclimg \
--prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}"
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
'' + lib.optionalString (stdenv.isDarwin && withGui) ''
@ -130,6 +138,6 @@ mkDerivation rec {
changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ jcumming ];
maintainers = with maintainers; [ jcumming ehmry ];
};
}

View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub
{ lib, stdenv, vdr, fetchFromGitHub
, graphicsmagick, pcre, xorgserver, ffmpeg
, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
, callPackage
}: let
mkPlugin = name: stdenv.mkDerivation {
name = "vdr-${vdr.version}-${name}";
name = "vdr-${name}-${vdr.version}";
inherit (vdr) src;
buildInputs = [ vdr ];
preConfigure = "cd PLUGINS/src/${name}";
@ -55,13 +55,13 @@ in {
markad = stdenv.mkDerivation rec {
pname = "vdr-markad";
version = "3.0.26";
version = "3.1.1";
src = fetchFromGitHub {
repo = "vdr-plugin-markad";
owner = "kfb77";
sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI=";
rev = "v${version}";
sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M=";
rev = "V${version}";
};
buildInputs = [ vdr ffmpeg ];
@ -101,12 +101,12 @@ in {
epgsearch = stdenv.mkDerivation rec {
pname = "vdr-epgsearch";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitHub {
repo = "vdr-plugin-epgsearch";
owner = "vdr-projects";
sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U=";
sha256 = "sha256-C+WSdGTnDBTWLvpjG5GBaK8pYbht431nL5iaL/a0H4Y=";
rev = "v${version}";
};
@ -150,7 +150,7 @@ in {
vnsiserver = stdenv.mkDerivation rec {
pname = "vdr-vnsiserver";
version = "1.8.1";
version = "1.8.3";
buildInputs = [ vdr ];
@ -160,7 +160,7 @@ in {
repo = "vdr-plugin-vnsiserver";
owner = "vdr-projects";
rev = version;
sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E=";
sha256 = "sha256-ivHdzX90ozMXSvIc5OrKC5qHeK5W3TK8zyrN8mY3IhE=";
};
meta = with lib; {
@ -173,14 +173,15 @@ in {
};
text2skin = stdenv.mkDerivation {
text2skin = stdenv.mkDerivation rec {
pname = "vdr-text2skin";
version = "1.3.4-20170702";
src = fetchgit {
url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git";
sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa";
src = fetchFromGitHub {
repo = "vdr-plugin-text2skin";
owner = "vdr-projects";
rev = "8f7954da2488ced734c30e7c2704b92a44e6e1ad";
sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa";
};
buildInputs = [ vdr graphicsmagick ];
@ -200,7 +201,7 @@ in {
dontInstall = true;
meta = with lib; {
homepage = "https://projects.vdr-developer.org/projects/plg-text2skin";
inherit (src.meta) homepage;
description = "VDR Text2Skin Plugin";
maintainers = [ maintainers.ck3d ];
license = licenses.gpl2;

View file

@ -12,12 +12,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-softhddevice";
version = "1.9.3";
version = "1.9.7";
src = fetchFromGitHub {
owner = "ua0lnj";
repo = "vdr-plugin-softhddevice";
sha256 = "sha256-0jtA64RVlh57zjrGDJAR/tt8V6sSksAx9kBDRW1m+WM=";
sha256 = "sha256-SviAuV+71pxnuEcmoLQkA1yti2jAAuG7yZZDlf3cODc=";
rev = "v${version}";
};

View file

@ -7,14 +7,14 @@
, pkg-config
}:
stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation (self: {
pname = "katriawm";
version = "21.09";
version = "22.12";
src = fetchzip {
name = finalAttrs.pname + "-" + finalAttrs.version;
url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz";
hash = "sha256-xt0sWEwTcCs5cwoB3wVbYcyAKL0jx7KyeCefEBVFhH8=";
name = self.pname + "-" + self.version;
url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${self.version}.tar.gz";
hash = "sha256-xFKr4PxqvnQEAWplhRsaL5rhmSJpnImpk1eXFX0N1tc=";
};
nativeBuildInputs = [
@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
installFlags = [ "prefix=$(out)" ];
meta = with lib; {
meta = {
homepage = "https://www.uninformativ.de/git/katriawm/file/README.html";
description = "A non-reparenting, dynamic window manager with decorations";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
license = lib.licenses.mit;
maintainers = [ lib.maintainers.AndersonTorres ];
inherit (libX11.meta) platforms;
};
})

View file

@ -167,6 +167,7 @@ let majorVersion = "12";
lib
libcCross
libmpc
libucontext
libxcrypt
mpfr
name

View file

@ -2,8 +2,8 @@
, pkg-config, alsa-lib, libjack2, libsndfile, fftw
, curl, gcc, libXt, qtbase, qttools, qtwebengine
, readline, qtwebsockets, useSCEL ? false, emacs
, supercollider-with-plugins, supercolliderPlugins
, writeText, runCommand
, gitUpdater, supercollider-with-plugins
, supercolliderPlugins, writeText, runCommand
}:
mkDerivation rec {
@ -26,6 +26,8 @@ mkDerivation rec {
})
];
strictDeps = true;
nativeBuildInputs = [ cmake pkg-config qttools ];
buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
@ -39,24 +41,32 @@ mkDerivation rec {
"-DSC_EL=${if useSCEL then "ON" else "OFF"}"
];
passthru.tests = {
# test to make sure sclang runs and included plugins are successfully found
sclang-sc3-plugins = let
supercollider-with-test-plugins = supercollider-with-plugins.override {
plugins = with supercolliderPlugins; [ sc3-plugins ];
};
testsc = writeText "test.sc" ''
var err = 0;
try {
MdaPiano.name.postln;
} {
err = 1;
passthru = {
updateScript = gitUpdater {
url = "https://github.com/supercollider/supercollider.git";
rev-prefix = "Version-";
ignoredVersions = "rc|beta";
};
tests = {
# test to make sure sclang runs and included plugins are successfully found
sclang-sc3-plugins = let
supercollider-with-test-plugins = supercollider-with-plugins.override {
plugins = with supercolliderPlugins; [ sc3-plugins ];
};
err.exit;
testsc = writeText "test.sc" ''
var err = 0;
try {
MdaPiano.name.postln;
} {
err = 1;
};
err.exit;
'';
in runCommand "sclang-sc3-plugins-test" { } ''
timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out
'';
in runCommand "sclang-sc3-plugins-test" {} ''
timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out
'';
};
};
meta = with lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, supercollider, fftw }:
{ stdenv, lib, fetchurl, cmake, supercollider, fftw, gitUpdater }:
stdenv.mkDerivation rec {
pname = "sc3-plugins";
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-JjUmu7PJ+x3yRibr+Av2gTREng51fPo7Rk+B4y2JvkQ=";
};
strictDeps = true;
nativeBuildInputs = [ cmake ];
buildInputs = [
@ -23,6 +25,12 @@ stdenv.mkDerivation rec {
stripDebugList = [ "lib" "share" ];
passthru.updateScript = gitUpdater {
url = "https://github.com/supercollider/sc3-plugins.git";
rev-prefix = "Version-";
ignoredVersions = "rc|beta";
};
meta = with lib; {
description = "Community plugins for SuperCollider";
homepage = "https://supercollider.github.io/sc3-plugins/";

View file

@ -0,0 +1,26 @@
From 4534f88f676d9a07a227aed7b56255dd84d2b906 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 3 Oct 2022 22:57:34 +0200
Subject: [PATCH] Use full path in pkgconfig
Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch>
---
PkgConfig.pc.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PkgConfig.pc.in b/PkgConfig.pc.in
index 381e2343..93860ff0 100644
--- a/PkgConfig.pc.in
+++ b/PkgConfig.pc.in
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Name: @PROJECT_NAME@
Description: Eclipse Cyclone DDS library
--
2.37.3

View file

@ -0,0 +1,30 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "cyclondds";
version = "0.10.2";
src = fetchFromGitHub {
owner = "eclipse-cyclonedds";
repo = "cyclonedds";
rev = version;
sha256 = "sha256-xr9H9n+gyFMgEMHn59T6ELYVZJ1m8laG0d99SE9k268=";
};
patches = [
./0001-Use-full-path-in-pkgconfig.patch
];
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "Eclipse Cyclone DDS project";
homepage = "https://cyclonedds.io/";
license = with licenses; [ epl20 ];
maintainers = with maintainers; [ bachp ];
};
}

View file

@ -1,18 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, async-timeout }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, async-timeout
}:
buildPythonPackage rec {
pname = "ha-ffmpeg";
version = "3.0.2";
version = "3.1.0";
format = "setuptools";
disabled = !isPy3k;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1";
hash = "sha256-sheNYtmp1panthglpEqJTdaCgGBTUJRswikl5hu9k7s=";
};
propagatedBuildInputs = [ async-timeout ];
propagatedBuildInputs = [
async-timeout
];
# only manual tests
doCheck = false;
@ -24,8 +31,9 @@ buildPythonPackage rec {
];
meta = with lib; {
homepage = "https://github.com/pvizeli/ha-ffmpeg";
description = "Library for home-assistant to handle ffmpeg";
description = "Library for Home Assistant to handle ffmpeg";
homepage = "https://github.com/home-assistant-libs/ha-ffmpeg/";
changelog = "https://github.com/home-assistant-libs/ha-ffmpeg/releases/tag/${version}";
license = licenses.bsd3;
maintainers = teams.home-assistant.members;
};

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "niaarm";
version = "0.2.4";
version = "0.3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "firefly-cpp";
repo = "NiaARM";
rev = version;
hash = "sha256-JPsBpVMeVZxUhCHoIBP47LhR8nrc8ZtJHREZLwL5Zxw=";
hash = "sha256-5XOE3c7amvhw1KrX1hcmTxneYNvAuiHz+OZLb/yhB+I=";
};
nativeBuildInputs = [

View file

@ -29,9 +29,15 @@ buildPythonPackage rec {
pexpect
];
nativeBuildInputs = [
# For cross compilation the doCheck is false and therefor the
# nativeCheckInputs not included. We have to include nose here, since
# setup.py requires nose unconditionally.
nose
];
nativeCheckInputs = [
mock
nose
pytestCheckHook
]
++ passthru.optional-dependencies.GATTTOOL;

View file

@ -27,6 +27,11 @@
, typer
, typing-extensions
, wasabi
, writeScript
, stdenv
, nix
, git
, nix-update
}:
buildPythonPackage rec {
@ -85,7 +90,19 @@ buildPythonPackage rec {
"spacy"
];
passthru.tests.annotation = callPackage ./annotation-test { };
passthru = {
updateScript = writeScript "update-spacy" ''
#!${stdenv.shell}
set -eou pipefail
PATH=${lib.makeBinPath [ nix git nix-update ]}
nix-update python3Packages.spacy
# update spacy models as well
echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm
'';
tests.annotation = callPackage ./annotation-test { };
};
meta = with lib; {
description = "Industrial-strength Natural Language Processing (NLP)";

View file

@ -1,374 +1,374 @@
[
{
"pname": "ca_core_news_lg",
"version": "3.3.0",
"sha256": "06dyd5h3c1q7vndg8j0vja24y49lvdqkb6cy6i25ldz306b6aa0l",
"version": "3.5.0",
"sha256": "01wssrmfjnx2lycqbpjpvzpfymwhiy1336s1123y747q7klzic08",
"license": "gpl3"
},
{
"pname": "ca_core_news_md",
"version": "3.3.0",
"sha256": "0ac8n8lg4x5mknplsfbzhsl1qxhkbi5plx4xd252zmr0kilxkykn",
"version": "3.5.0",
"sha256": "0z8p2wqp1jsv9ipiqkw7c144nla2xgfwzijkwbb6qf4k2gdizzmq",
"license": "gpl3"
},
{
"pname": "ca_core_news_sm",
"version": "3.3.0",
"sha256": "1gj4ni9mwksrwqxjipvn13lhbfk7wqh8k7hh9gfpsm2saa951yf6",
"version": "3.5.0",
"sha256": "0kwifrwf8iaxpry7v453hf8vawlwqpqm9df364k4ai6bhcpqad3k",
"license": "gpl3"
},
{
"pname": "ca_core_news_trf",
"version": "3.3.0",
"sha256": "0fhf71rj568akcwxvzjr2j5x5f5qz7g7i49bz5m9lbqs01bj0rjw",
"version": "3.5.0",
"sha256": "12vlgy6n2xmap1z8fsf44dbnrw69fbdipss88v9ivwffn6yy3mj8",
"license": "gpl3"
},
{
"pname": "da_core_news_lg",
"version": "3.3.0",
"sha256": "0wyw9lyxbs0jgy8qgxhpqpfhm8y4a9hanar0ggrvhsaxcfjs6qhr",
"version": "3.5.0",
"sha256": "1289r8qmzfzwyvsz3dvl6r6wrbr6s1jfw1nmb0bpybjzcp48nfnh",
"license": "cc-by-sa-40"
},
{
"pname": "da_core_news_md",
"version": "3.3.0",
"sha256": "0rj8l0v6m1ia5r4j0180gl0kh2srfw90bkvq21wr1gq142536f2d",
"version": "3.5.0",
"sha256": "1i3vamzxnv6xfa1ky2zf6cb9c0blvm5rkfmif15kvgfkjbmhi7id",
"license": "cc-by-sa-40"
},
{
"pname": "da_core_news_sm",
"version": "3.3.0",
"sha256": "0a8786jqlpjrvg27h9nww0v4p3p9f0rr7kilbpmb7w9466hjbkjy",
"version": "3.5.0",
"sha256": "0bmbk6vnad3xqhg0jg8dhfhh75vyahsm16mn8ddzchhl7wm8axcc",
"license": "cc-by-sa-40"
},
{
"pname": "de_core_news_lg",
"version": "3.3.0",
"sha256": "1k80mq5gfiw7m7z60by1qis2zhszwb9z9hg55r0qam71pnbsqb0f",
"version": "3.5.0",
"sha256": "0l3sg853xfkab7mj41n370x37iksp79nrjp7s60hhajpfbl546a0",
"license": "mit"
},
{
"pname": "de_core_news_md",
"version": "3.3.0",
"sha256": "0y13qwkfh7nzp2m8w3qna0qj3gaxrpsncmc1ramnn515565j62in",
"version": "3.5.0",
"sha256": "01z9bg59k4aw324dzwa3hlf8fg8yys70k6c3ih93if55svfc5xym",
"license": "mit"
},
{
"pname": "de_core_news_sm",
"version": "3.3.0",
"sha256": "0ln5p4dg5y4hzpx1738qlh6591j2ydrf8gyvhfvx5dr1pkwps83d",
"version": "3.5.0",
"sha256": "1qlqiqadv8r44a2y6iwpf28khmixsnwm8pss6miwdn0k5xh4kqbp",
"license": "mit"
},
{
"pname": "de_dep_news_trf",
"version": "3.3.0",
"sha256": "18clx5dck1wmk39miqlsqgwvzhhqd7xh8vmi6ilpjnwgx48yfjh7",
"version": "3.5.0",
"sha256": "0d5vkdz653yhqwykn39xm78vmxn9bcl5a9wh6hsvzhg9brffh2cn",
"license": "mit"
},
{
"pname": "el_core_news_lg",
"version": "3.3.0",
"sha256": "165vji0d4imylpgpywnmdjvylsi2l8kz8fpxbhwjdx5cv40ywcda",
"version": "3.5.0",
"sha256": "1y0na4fz3jfsjh43prc76rmkc508vk42mi9mgahz7n7nwfgyxspj",
"license": "cc-by-nc-sa-30"
},
{
"pname": "el_core_news_md",
"version": "3.3.0",
"sha256": "0jz32glmwj1a662ciz1ay6g2shil0ia8smmbj42ghnjl4dlf2n3b",
"version": "3.5.0",
"sha256": "10li1rklw2yjs5rhzm2cr2pa0x9wx504hamkyb2d9fkcq1vnj3ds",
"license": "cc-by-nc-sa-30"
},
{
"pname": "el_core_news_sm",
"version": "3.3.0",
"sha256": "179fqj781wfrh9nkizv7s5ia8abb73sgnnl3yim35nbkpwnps47v",
"version": "3.5.0",
"sha256": "1j728bmmavhhn22k6ppz29ck8ag5y4299jir4y0bjjhn1ghmxq4d",
"license": "cc-by-nc-sa-30"
},
{
"pname": "en_core_web_lg",
"version": "3.3.0",
"sha256": "0j1d9i2xqqbaiyzr1aghzm42nfjlxx3qv2mlfhav3yi69hmy8aj3",
"version": "3.5.0",
"sha256": "0ib93cn1nv5wv39dpxxs68nzmwr3j6qdc5l71mp6hi74cy0jqwr9",
"license": "mit"
},
{
"pname": "en_core_web_md",
"version": "3.3.0",
"sha256": "1anq8vlk3rwf7by1j7b9gvc5pjdvc9cz4mazqvrs4448xs3r0ndl",
"version": "3.5.0",
"sha256": "02w0kjsbzmnp17p7b7cs4lqzg37mbk0ygva7c4qfb312x4wyr9vg",
"license": "mit"
},
{
"pname": "en_core_web_sm",
"version": "3.3.0",
"sha256": "1bknji6j21pm9y0v48zhc0r4di5wm4lxxab35wmzakn0myhag2il",
"version": "3.5.0",
"sha256": "09j61i5nrdy2amml3kij2xndqawha3dgdm7lg9f67422vpn8zlv3",
"license": "mit"
},
{
"pname": "en_core_web_trf",
"version": "3.3.0",
"sha256": "1qfkif2dzs9gvkydca2mq1w9xb818zmz14rwramxpvq17bfraqdw",
"version": "3.5.0",
"sha256": "1rqb9p8khy1zy041gsc04b5v9l4v0pc6nqzn5lm5p85161k55c7c",
"license": "mit"
},
{
"pname": "es_core_news_lg",
"version": "3.3.0",
"sha256": "0jd9wq7nxw4iywr9v2m19kf84hhgnh1sy9j2zrz6w5vv16363cr9",
"version": "3.5.0",
"sha256": "0zw6z8aygh9pzdws88iclgnp277v0nlklykmdkkhqs75acpckzkx",
"license": "gpl3"
},
{
"pname": "es_core_news_md",
"version": "3.3.0",
"sha256": "0gk2rca1qmgy5bnv4r8h9kxpix19h3dgbgjwky60fagnbvch5pzc",
"version": "3.5.0",
"sha256": "1b5xsidys6jhq9rnv0q38q3hck11jx4z3yvmka83cbdwvzkncaq3",
"license": "gpl3"
},
{
"pname": "es_core_news_sm",
"version": "3.3.0",
"sha256": "0r3hvx5za3iydqfqz65p586c8g86b7pw8mjnipj43y0qnz2d0x14",
"version": "3.5.0",
"sha256": "169xg2xwn3rkhal9ygwrnkb9xzdgz4rz3419xr252zji34cr8d6a",
"license": "gpl3"
},
{
"pname": "es_dep_news_trf",
"version": "3.3.0",
"sha256": "1rmccrgddgbfagj2vasfr6bqc5kpziy4gln5bcmnxwhh6mh66rwd",
"version": "3.5.0",
"sha256": "1py98kc6dxx5a6v6pc7hpldd6jm5s2a8vwp7l7d2jxadh947ma12",
"license": "gpl3"
},
{
"pname": "fr_core_news_lg",
"version": "3.3.0",
"sha256": "15vxksw3g7g721cwrp9436w5wx43gicq6i2v6v1h63qifxjhkp3j",
"version": "3.5.0",
"sha256": "1zjf348c60xf35zaldgykrlskvrryxv9vdaz49xlwq9caw0yzyh4",
"license": "lgpllr"
},
{
"pname": "fr_core_news_md",
"version": "3.3.0",
"sha256": "1x3d6nlfmclq961b292aqvgz8ldijpsi330vja75ncrbyz9wygav",
"version": "3.5.0",
"sha256": "1ph768pv2brv94fzydw8d2daxypvy61zwbmi4hbalgaar62lglhl",
"license": "lgpllr"
},
{
"pname": "fr_core_news_sm",
"version": "3.3.0",
"sha256": "1gqzspi8y8b54ja7ikhlr5ip137kgv7x4flavgj456sdhfzkaqkz",
"version": "3.5.0",
"sha256": "1vhamgrv7adk85i9b3s5bh6j0aw21rma5xcb3ggy9ay51jfmkzzm",
"license": "lgpllr"
},
{
"pname": "fr_dep_news_trf",
"version": "3.3.0",
"sha256": "09n067v07233gr8sw6yma1s2bi2m6wf8ripn74npjjs28akmr5p3",
"version": "3.5.0",
"sha256": "0ciyilnc5gx0f1qakim57pizj1dknm8l8gd72avmrmzg3z52mgl2",
"license": "lgpllr"
},
{
"pname": "it_core_news_lg",
"version": "3.3.0",
"sha256": "1c5zqfpkmjwr21nmcnky6sgf7fr4lpiaai9hz2z14yrnnvby80y1",
"version": "3.5.0",
"sha256": "1z64s632wbjlqmnmppcnpf2pfrjbml30gbil7mk0qln2i2hrh0qq",
"license": "cc-by-nc-sa-30"
},
{
"pname": "it_core_news_md",
"version": "3.3.0",
"sha256": "1jpcivp0djfm975czn41k23y7ly6b54myrlj5fyjql1scwf0xzh1",
"version": "3.5.0",
"sha256": "055gj5ai4rda5yc8lkhmfcwpfm7yfzyl6v05xhziz8sh1x4z58kz",
"license": "cc-by-nc-sa-30"
},
{
"pname": "it_core_news_sm",
"version": "3.3.0",
"sha256": "0lkgs8sw02p7l5mrbrwkaiqs524hd9bkhfiiz7wzcc0p0zn4hn8h",
"version": "3.5.0",
"sha256": "1fw262m7bl3g31gz0jb6fxrd385p67q82wfrsff6z9daxi3pi6ip",
"license": "cc-by-nc-sa-30"
},
{
"pname": "lt_core_news_lg",
"version": "3.3.0",
"sha256": "08azxjqpsa66b5vm7gwllbjli36wv1n11m07andlkg3p2nmn6m85",
"version": "3.5.0",
"sha256": "002xalsrf85vg4c3gmj1zaka1zfy7smxv2xpqkl00idiixc5822y",
"license": "cc-by-sa-40"
},
{
"pname": "lt_core_news_md",
"version": "3.3.0",
"sha256": "05qj4bhjq4v31r05rza7kc52kmp954f4h4zs344pdddzdzzc8h4q",
"version": "3.5.0",
"sha256": "0rd3jmy7d42q5vwgx5kdf24kzd333i5l6v7pjmc5qnq4vwhqr96j",
"license": "cc-by-sa-40"
},
{
"pname": "lt_core_news_sm",
"version": "3.3.0",
"sha256": "0wmaxixrm08ikicgnbz5zw3iimmm9dl7j7yy78bqixzym0iv2hxy",
"version": "3.5.0",
"sha256": "039ldh4wvlnkq7cfxahk0m9hvb90hh2x0dqsqygglbdflxibmia0",
"license": "cc-by-sa-40"
},
{
"pname": "mk_core_news_lg",
"version": "3.3.0",
"sha256": "17q62v8nvyz73d5jsbd5nw1mzxkj1cn7g6f0cl0lrl6pqn2b2rgl",
"version": "3.5.0",
"sha256": "11daxcyapaqskwmfxl57s3hbjaajk79khnafg4k7zshlqpdyvc3p",
"license": "cc-by-sa-40"
},
{
"pname": "mk_core_news_md",
"version": "3.3.0",
"sha256": "103z7hkr5jbk6zmqihzsm9jlmr4mg32r6ph90j6xx71jdmnjz4ky",
"version": "3.5.0",
"sha256": "0iky995dql569vg1manz4gv65jgr01nlx0559fljmysiqhq8ax76",
"license": "cc-by-sa-40"
},
{
"pname": "mk_core_news_sm",
"version": "3.3.0",
"sha256": "09k56dds3mjc2qxa6mbcha1i2h4hqjvbavkhnijmdfhsk6azk3v5",
"version": "3.5.0",
"sha256": "1ghjpk6p5p19l4gichg361191i7xibp5zw0g1hqn87y0x12d20y3",
"license": "cc-by-sa-40"
},
{
"pname": "nb_core_news_lg",
"version": "3.3.0",
"sha256": "11iq62w96zc5z51i9kkxp5bqbfmhzm3jpivrs8arw9fs7xrscjn0",
"version": "3.5.0",
"sha256": "06pcfcy28r57n9dysjqx6py8r0awwfan4g5s97byl1486h77jkaz",
"license": "mit"
},
{
"pname": "nb_core_news_md",
"version": "3.3.0",
"sha256": "0891z1c867jyhg9jr0ais2vv6h3v5b98sc7c8hxy4apf7nwnkjss",
"version": "3.5.0",
"sha256": "05vsaqw4x8swi4yamwlwg4rw7nj3bsyxdq8g5qjhcj0mjdabz6kj",
"license": "mit"
},
{
"pname": "nb_core_news_sm",
"version": "3.3.0",
"sha256": "1v19jvzvhix6rfac4szggdcqi3qkljwqmrynl75qz28piff0sln5",
"version": "3.5.0",
"sha256": "030j0v1csn2q38sy7nfxkx60i8ga7mlkma2f99mlh739j1s4nxaz",
"license": "mit"
},
{
"pname": "nl_core_news_lg",
"version": "3.3.0",
"sha256": "0ai6pydmd2rabpl8fy98ild7n2wwk2z11qha20x4gn33d8k60ih0",
"version": "3.5.0",
"sha256": "0qcfka8ahcdv1y9lz4zsd1q6xlfxajf5qbymg9cabxxyqjzjqwys",
"license": "cc-by-sa-40"
},
{
"pname": "nl_core_news_md",
"version": "3.3.0",
"sha256": "1c95xcivn09dmfgrq21hh9i82v6wbnk0cwglcdgnx9kfidzgpgjc",
"version": "3.5.0",
"sha256": "1cl3vynhlgkby7cnda1sgxqi8vrcj5amplmm96xhq5nmb6z6b8jx",
"license": "cc-by-sa-40"
},
{
"pname": "nl_core_news_sm",
"version": "3.3.0",
"sha256": "1jp978ish3hvn48i1dard82czzx3vvh4lnlhhb50j0kk4b7xv5z1",
"version": "3.5.0",
"sha256": "16dkiklayp7irc5hwf7qv4pjww6kjg5pd0say25niclrgxfn3482",
"license": "cc-by-sa-40"
},
{
"pname": "pl_core_news_lg",
"version": "3.3.0",
"sha256": "0w5rpz43ix16sq8h6h5g3h1a64ww8r5z4fydz2vr7bphajkwrhlq",
"version": "3.5.0",
"sha256": "194mjgbph4xgf7xywwajb0p4l19ww2z2ln7jykhnn2gy3j5dm6pd",
"license": "gpl3"
},
{
"pname": "pl_core_news_md",
"version": "3.3.0",
"sha256": "1sllknhw689nbf9rmnc5604r0vig1yzkpg3s6yvgjyli7m04k6d1",
"version": "3.5.0",
"sha256": "0435glcxzw1axlq8dkqv0wn8nxgav0dpx3pzvx475avxfp4qm1rv",
"license": "gpl3"
},
{
"pname": "pl_core_news_sm",
"version": "3.3.0",
"sha256": "0gpa140y04kazr8imifgdjsdzj7m10s15vy8q0vbi8chc8m14i1s",
"version": "3.5.0",
"sha256": "1ifl01ncfdph32ij1kl8f74ksjw0xiyszabi6q6pskjmcwhfixp7",
"license": "gpl3"
},
{
"pname": "pt_core_news_lg",
"version": "3.3.0",
"sha256": "1pk0m03hyck3g6riq1x5n5k0jp70z2fqaw6pl7zrm0rcf2165rh0",
"version": "3.5.0",
"sha256": "182bl598x65akb368fy2nf4qnq89a8n1hcj2g92n3jwhn6d1xfpw",
"license": "cc-by-sa-40"
},
{
"pname": "pt_core_news_md",
"version": "3.3.0",
"sha256": "190d74ihga38kp68r8xs9rxnavxdzw2j917f7b75wmr04brbf824",
"version": "3.5.0",
"sha256": "19h8nzx5qfmfcv97sqrzwlv0n45i5yqcngf855djc360mfp2hv69",
"license": "cc-by-sa-40"
},
{
"pname": "pt_core_news_sm",
"version": "3.3.0",
"sha256": "1477yddal5cjn7a6adw1bvmal4pc4p8bcc4x7q016a22fgk9lcpl",
"version": "3.5.0",
"sha256": "19raq2b6q6a3ipxfzg4mdhq2wff9di5ip2mzf48blrj2xp2rjxyg",
"license": "cc-by-sa-40"
},
{
"pname": "ro_core_news_lg",
"version": "3.3.0",
"sha256": "1w8cwll2dp9a1k40b5njbypdrxwf7vacf9sdwc18kkiadkrihy4g",
"version": "3.5.0",
"sha256": "10dc7c94wm3mia3japcsplxsv708q30yrqjml68zrrm5awwk30a7",
"license": "cc-by-sa-40"
},
{
"pname": "ro_core_news_md",
"version": "3.3.0",
"sha256": "1mr3s0fm571idbgi0g3qg4x7hyy1kw9br98vn8g21f8h05qmlc72",
"version": "3.5.0",
"sha256": "1j8321nn8i13gy6n6rlcw7vsf2wnaf2ybiscwif3wrkzvb07113b",
"license": "cc-by-sa-40"
},
{
"pname": "ro_core_news_sm",
"version": "3.3.0",
"sha256": "1n6dwfx2l0wzb02r14z47r19v5dy7ld35s11w1kq40k5bbkbakhm",
"version": "3.5.0",
"sha256": "117dyvkdgfrymh8qvdcfrcc6s8pcbnyzg83sib4vjv0nxxfp2xl8",
"license": "cc-by-sa-40"
},
{
"pname": "ru_core_news_lg",
"version": "3.3.0",
"sha256": "1yv2r6b6n9ccvizi23q2xdrzbws1asa5mbiw4771irrmqzan9wiq",
"version": "3.5.0",
"sha256": "1zdlsvlhcfxg2nvcrqvjyx9qyzjl39xb482qqhn572bv89v35h76",
"license": "mit"
},
{
"pname": "ru_core_news_md",
"version": "3.3.0",
"sha256": "0s2yjlibg2r2pdf8cfn36nx6rp9ppk8jjjph91az0sp5lj0c38pp",
"version": "3.5.0",
"sha256": "0nqlr2kpbznksh5djc669kcqc61i0ljiazn4z81dblfhxxhv692x",
"license": "mit"
},
{
"pname": "ru_core_news_sm",
"version": "3.3.0",
"sha256": "0cnn8daf90hnl5mmgk3y6fc0f6x62j7rm9gkq16zbb0qmayb7ri0",
"version": "3.5.0",
"sha256": "0yb0gx8kl5w0f9pkii788vxv9alc0xb08gdfnim0g2givqa5p4fn",
"license": "mit"
},
{
"pname": "sv_core_news_lg",
"version": "3.3.0",
"sha256": "0503xnr8cdzb2ckj12b51hkayv2gzf2c2rv746w4y50pjk4cmfsx",
"version": "3.5.0",
"sha256": "100rf8wv4nf679fvvrnvd67wlx5w5d755ssvk9g76gzalzxywrmz",
"license": "cc-by-sa-40"
},
{
"pname": "sv_core_news_md",
"version": "3.3.0",
"sha256": "1hzfl92j13hxf8im4b4mjbgxawp8xqpi3ych6bi2x5pr7qjx6gab",
"version": "3.5.0",
"sha256": "0ll1i767xb63gqmarxqk7nwg1xn5wjjhrix17hjq03q7rms267mw",
"license": "cc-by-sa-40"
},
{
"pname": "sv_core_news_sm",
"version": "3.3.0",
"sha256": "0sjg1ab8r7m1g735amgakslchn1jba0ygyri59h6qsp8cmhvajw7",
"version": "3.5.0",
"sha256": "1c0w85xn8lnx394qmmnv3px68w0pha7fxx0qlqa74r2mfi3sv6s7",
"license": "cc-by-sa-40"
},
{
"pname": "xx_ent_wiki_sm",
"version": "3.3.0",
"sha256": "1925y6n90qwy703v410si8sq7vzvlwi6zaj9n19ggysr78kyrsqz",
"version": "3.5.0",
"sha256": "042aszgyzbp5n5bn6lgk1m38zxfl1irbryid5fslgh19b19l8v3x",
"license": "mit"
},
{
"pname": "xx_sent_ud_sm",
"version": "3.3.0",
"sha256": "0dgd2lwh269f8m7qsv8x3743b3mc5r2lw6kcvdh1cs8qk8hxlfnx",
"version": "3.5.0",
"sha256": "08hqldksllz387d6h3ch95g6rb6ls329hqh0cxyglg9njw9sc97z",
"license": "cc-by-sa-30"
},
{
"pname": "zh_core_web_lg",
"version": "3.3.0",
"sha256": "15yps28i86shnf313xbsmv1sgnr71aymxnx5s155hbn2fk8pdzwc",
"version": "3.5.0",
"sha256": "17z7g5my5lyp34prcdqzv6w3cgyb7h5gvq61iwbkzppv0n2kldz2",
"license": "mit"
},
{
"pname": "zh_core_web_md",
"version": "3.3.0",
"sha256": "0mvqgmm4y1ng6asxb2ic215ikk8lx0dm7c5cfwhx02vamllxv20q",
"version": "3.5.0",
"sha256": "03qxsxdvxn8l11drzicp53jma6j54gxgi8bw53xvbqr9cajxbqva",
"license": "mit"
},
{
"pname": "zh_core_web_sm",
"version": "3.3.0",
"sha256": "05qc50wxddfacf6x7i8q0r9dnrr6gsfnaldzmavry96nfngmqp6v",
"version": "3.5.0",
"sha256": "0n3ajnbiyr56vy0kplm53rb421cxlc12q5f9p5i7icyv14dy4kml",
"license": "mit"
},
{
"pname": "zh_core_web_trf",
"version": "3.3.0",
"sha256": "0pmb456q8b02qw5zmw735w9yv3clfaqcqm91ng8lphxbcxqkp9jc",
"version": "3.5.0",
"sha256": "0gc4nn7zsng80j2qn8f7y85akls87dng72jkxp9pldav7k8435nb",
"license": "mit"
}
]

View file

@ -6,42 +6,72 @@
, sentencepiece
, spacy
, spacy-pkuseg
, spacy-transformers }:
, spacy-transformers
, writeScript
, stdenv
, jq
, nix
, moreutils
}:
let
buildModelPackage = { pname, version, sha256, license }:
let
lang = builtins.substring 0 2 pname;
in buildPythonPackage {
inherit pname version;
let
lang = builtins.substring 0 2 pname;
in
buildPythonPackage {
inherit pname version;
src = fetchurl {
url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
inherit sha256;
src = fetchurl {
url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
inherit sha256;
};
propagatedBuildInputs = [ spacy ]
++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ]
++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ]
++ lib.optionals (lang == "ru") [ pymorphy2 ]
++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ];
postPatch = lib.optionalString (pname == "fr_dep_news_trf") ''
substituteInPlace meta.json \
--replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91"
'';
pythonImportsCheck = [ pname ];
passthru.updateScript = writeScript "update-spacy-models" ''
#!${stdenv.shell}
set -eou pipefail
PATH=${lib.makeBinPath [ jq nix moreutils ]}
IFS=. read -r major minor patch <<<"${spacy.version}"
spacyVersion="$(echo "$major.$minor.0")"
pushd pkgs/development/python-modules/spacy/ || exit
jq -r '.[] | .pname' models.json | while IFS= read -r pname; do
if [ "$(jq --arg pname "$pname" -r '.[] | select(.pname == $pname) | .version' models.json)" == "$spacyVersion" ]; then
continue
fi
newHash="$(nix-prefetch-url "https://github.com/explosion/spacy-models/releases/download/$pname-$spacyVersion/$pname-$spacyVersion.tar.gz")"
jq --arg newHash "$newHash" --arg pname "$pname" --arg spacyVersion "$spacyVersion" \
'[(.[] | select(.pname != $pname)), (.[] | select(.pname == $pname) | .sha256 = $newHash | .version = $spacyVersion)] | sort_by(.pname)' \
models.json | sponge models.json
done
popd || exit
'';
meta = with lib; {
description = "Models for the spaCy NLP library";
homepage = "https://github.com/explosion/spacy-models";
license = licenses.${license};
maintainers = with maintainers; [ rvl ];
};
};
propagatedBuildInputs = [ spacy ]
++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ]
++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ]
++ lib.optionals (lang == "ru") [ pymorphy2 ]
++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ];
postPatch = lib.optionalString (pname == "fr_dep_news_trf") ''
substituteInPlace meta.json \
--replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91"
'';
pythonImportsCheck = [ pname ];
meta = with lib; {
description = "Models for the spaCy NLP library";
homepage = "https://github.com/explosion/spacy-models";
license = licenses.${license};
maintainers = with maintainers; [ rvl ];
};
};
makeModelSet = models: with lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models);
in makeModelSet (lib.importJSON ./models.json)
# cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url
in
makeModelSet (lib.importJSON ./models.json)

View file

@ -2,20 +2,24 @@
, buildPythonPackage
, fetchPypi
, nose
, setuptools
, arrow
, requests
, units
, pint
, pydantic
, pytz
, six
}:
buildPythonPackage rec {
pname = "stravalib";
version = "1.1.0";
version = "1.2.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs=";
sha256 = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc=";
};
nativeCheckInputs = [
@ -26,7 +30,10 @@ buildPythonPackage rec {
arrow
requests
units
pint
pydantic
pytz
setuptools
six
];
@ -36,7 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for interacting with Strava v3 REST API";
homepage = "https://github.com/hozn/stravalib";
homepage = "https://github.com/stravalib/stravalib";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "winacl";
version = "0.1.6";
version = "0.1.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-GAw3Vgej9v8gSIpMaN2pbOptWsqTvC0Kph70yfj2LDQ=";
hash = "sha256-ymYsCRRxpsYp12xe7GPYob8a98BUNI8JwSQvM4hQsr0=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,31 @@
{ fetchCrate
, lib
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "paging-calculator";
version = "0.1.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-9DbpfJbarWXYGNzTqfHHSaKFqSJ59E/VhOhuMUWk8ho=";
};
cargoHash = "sha256-IfOhJwR5eRHeeAbEZ8zeUVojQXtrYHdzAeht/lvdlUQ=";
meta = {
description = "CLI utility that helps calculating page table indices from a virtual address";
longDescription = ''
paging-calculator is a CLI utility written in Rust that helps you find the indices that a virtual
address will have on different architectures or paging implementations.
It takes a (virtual) address in hexadecimal format and shows you which index will be used for
what page-table level. It can be installed with $ cargo install paging-calculator.
'';
homepage = "https://github.com/phip1611/paging-calculator";
changelog = "https://github.com/phip1611/paging-calculator/blob/v${version}/CHANGELOG.md";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ phip1611 ];
};
}

View file

@ -0,0 +1,30 @@
{ fetchCrate
, lib
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "wambo";
version = "0.3.1";
src = fetchCrate {
inherit pname version;
hash = "sha256-WZQgQmoFmsWLgPYRWonJmyKq9IIJ+a6J+O19XPppJG4=";
};
cargoHash = "sha256-ghUdhWW5gURWxj/OhbcKPNeLzeJvndqAxEZmwKBATUk=";
meta = {
description = "All-in-one tool to convert decimal/bin/oct/hex and interpret bits as integers";
longDescription = ''
wambo is a binary that can easily shows you a numeric value in all important numeral systems
(bin, hex, dec) + interprets the input as both signed and unsigned values (from i8 to i64,
including f32 and f64). It also easily calculates you mibibytes to bytes, kilobytes to gibibytes,
and so on.
'';
homepage = "https://github.com/phip1611/wambo";
changelog = "https://github.com/phip1611/wambo/blob/v${version}/CHANGELOG.md";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ phip1611 ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch
{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
, less
, buildPackages
, x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5
@ -19,23 +19,14 @@ let
binPath = lib.makeBinPath [ coreutils less ];
in stdenv.mkDerivation rec {
version = "3.6.6";
version = "3.6.7";
pname = if x11Mode then "nethack-x11"
else if qtMode then "nethack-qt"
else "nethack";
patches = [
# Don't unset `__warn_unused_result__`, breaks on glibc-2.34
(fetchpatch {
url = "https://github.com/NetHack/NetHack/commit/81d73ce417dda6a98e2e918e06922e68b67c53f7.patch";
sha256 = "sha256-PX9XtJTEE3K1yg/IwIzEIT+EZWi02gU+9msrsG9ZWQY=";
revert = true;
})
];
src = fetchurl {
url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz";
sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng";
sha256 = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI=";
};
buildInputs = [ ncurses ]

View file

@ -19,13 +19,13 @@
stdenv.mkDerivation {
pname = "ioquake3";
version = "unstable-2021-07-20";
version = "unstable-2022-11-24";
src = fetchFromGitHub {
owner = "ioquake";
repo = "ioq3";
rev = "bc8737d707595aebd7cc11d6d5a5d65ede750f59";
sha256 = "1icrkaw6c5c5ndy886bn65lycwnxzxwvz0ndz4p9i6r716k11add";
rev = "70d07d91d62dcdd2f2268d1ac401bfb697b4c991";
sha256 = "sha256-WDjR0ik+xAs6OA1DNbUGIF1MXSuEoy8nNkPiHaegfF0=";
};
nativeBuildInputs = [ which pkg-config ];
@ -50,10 +50,10 @@ stdenv.mkDerivation {
installTargets = [ "copyfiles" ];
installFlags = [ "COPYDIR=$(out)" ];
installFlags = [ "COPYDIR=$(out)" "COPYBINDIR=$(out)/bin" ];
preInstall = ''
mkdir -p $out/baseq3
mkdir -p $out/baseq3 $out/bin
'';
meta = with lib; {

View file

@ -0,0 +1,34 @@
{ fetchCrate
, lib
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "nflz";
version = "1.0.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-c9+79zrIU/M1Rh+DiaLJzbrNSa4IKrYk1gP0dsabUiw=";
};
cargoHash = "sha256-+SOoZFVJ6mASRKufQE4JmHGKR5rbBgg1PmCrI6dvvko=";
# Tests do not work in the package published on crates.io, since the folder
# with test resources is not packaged.
doCheck = false;
meta = {
description = "Numbered Files Leading Zeros helps you to manage ascending numbered file names";
longDescription = ''
CLI to add leading zeros to ascending numbered file names.
NFLZ stands for Numbered Files Leading Zeros.
This library helps you to manage files inside your file system that
belong to a set of ordered files. An example are photos from a camera.
'';
homepage = "https://github.com/phip1611/nflz";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ phip1611 ];
};
}

View file

@ -70,12 +70,22 @@ let
PM_ADVANCED_DEBUG = yes;
PM_WAKELOCKS = yes;
POWERCAP = yes;
# ACPI Firmware Performance Data Table Support
ACPI_FPDT = whenAtLeast "5.12" yes;
# ACPI Heterogeneous Memory Attribute Table Support
ACPI_HMAT = whenAtLeast "5.2" yes;
# ACPI Platform Error Interface
ACPI_APEI = yes;
# APEI Generic Hardware Error Source
ACPI_APEI_GHES = yes;
} // optionalAttrs (stdenv.hostPlatform.isx86) {
INTEL_IDLE = yes;
INTEL_RAPL = whenAtLeast "5.3" module;
X86_INTEL_LPSS = yes;
X86_INTEL_PSTATE = yes;
X86_AMD_PSTATE = whenAtLeast "5.17" yes;
# Intel DPTF (Dynamic Platform and Thermal Framework) Support
ACPI_DPTF = whenAtLeast "5.10" yes;
};
external-firmware = {

View file

@ -179,8 +179,6 @@ stdenv.mkDerivation rec {
export XDG_RUNTIME_DIR=/tmp
'';
checkTarget = "ptest";
outputs = [ "out" "dev" "doc" ];
passthru = {

View file

@ -7,14 +7,15 @@
, libjpeg
, gd
, freetype
, runCommand
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ploticus";
version = "2.42";
src = fetchurl {
url = "mirror://sourceforge/ploticus/ploticus/${version}/ploticus${lib.replaceStrings [ "." ] [ "" ] version}_src.tar.gz";
url = "mirror://sourceforge/ploticus/ploticus/${finalAttrs.version}/ploticus${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}_src.tar.gz";
sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA=";
};
@ -42,6 +43,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
postPatch = ''
substituteInPlace src/pl.h --subst-var out
'';
preBuild = ''
cd src
'';
@ -62,6 +67,16 @@ stdenv.mkDerivation rec {
ln -s "pl" "$out/bin/ploticus"
'';
passthru.tests = {
prefab = runCommand "ploticus-prefab-test" {
buildInputs = [ finalAttrs.finalPackage ];
} ''
# trivial test to see if the prefab path munging works
mkdir $out/
pl -prefab scat inlinedata="A 1 2" x=2 y=3 -png -o $out/out.png
'';
};
meta = with lib; {
description = "A non-interactive software package for producing plots and charts";
longDescription = ''
@ -77,4 +92,4 @@ stdenv.mkDerivation rec {
homepage = "https://ploticus.sourceforge.net/";
platforms = with platforms; linux ++ darwin;
};
}
})

View file

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "apx";
version = "1.4.2";
version = "1.7.0-1";
src = fetchFromGitHub {
owner = "Vanilla-OS";
repo = pname;
rev = version;
sha256 = "sha256-BswX4Jo/RReM/tXo29V9rIvKjN8ylECPe0oo0FCQcGY=";
rev = "v${version}";
hash = "sha256-tonI3S0a08MbR369qaKS2BoWc3QzXWzTuGx/zSgUz7s=";
};
vendorSha256 = null;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hologram";
version = "1.2.1";
version = "1.3";
src = fetchFromGitHub {
owner = "AdRoll";
repo = "hologram";
rev = version;
sha256 = "sha256-rdV/oVo+M5ALyU3a3XlA4kt+TLg0Rnr7/qDyZ9iuIb4=";
hash = "sha256-b65mplfDuwk8lEfJLKBY7BF0yGRksxHjwbEW6A7moo4=";
};
postPatch = ''
@ -17,14 +17,14 @@ buildGoModule rec {
rm -f agent/metadata_service_test.go server/persistent_ldap_test.go server/server_test.go
'';
vendorSha256 = "sha256-pEYMpBiNbq5eSDiFT+9gMjGHDeTzWIej802Zz6Xtays=";
vendorHash = "sha256-HI5+02qSQVLy6ZKaFjy1bWtvVk5bqMBg1umu2ic5HuY=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://github.com/AdRoll/hologram/";
description = "Easy, painless AWS credentials on developer laptops";
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ aaronjheng ];
license = licenses.asl20;
};
}

View file

@ -3097,6 +3097,8 @@ with pkgs;
cuelsp = callPackage ../development/tools/cuelsp {};
cyclondds = callPackage ../development/libraries/cyclondds { };
cyclone-scheme = callPackage ../development/interpreters/cyclone { };
cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { };
@ -10120,6 +10122,8 @@ with pkgs;
nfs-ganesha = callPackage ../servers/nfs-ganesha { };
nflz = callPackage ../misc/nflz { };
ngrep = callPackage ../tools/networking/ngrep { };
ngrok = callPackage ../tools/networking/ngrok { };
@ -10680,6 +10684,8 @@ with pkgs;
PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { };
paging-calculator = callPackage ../development/tools/paging-calculator { };
pagmo2 = callPackage ../development/libraries/pagmo2 { };
paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { };
@ -13132,6 +13138,8 @@ with pkgs;
wakatime = python2Packages.callPackage ../tools/misc/wakatime { };
wambo = callPackage ../development/tools/wambo { };
weather = callPackage ../applications/misc/weather { };
wego = callPackage ../applications/misc/wego { };

View file

@ -10808,7 +10808,9 @@ self: super: with self; {
spacy-loggers = callPackage ../development/python-modules/spacy-loggers { };
spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
spacy_models = callPackage ../development/python-modules/spacy/models.nix {
inherit (pkgs) jq;
};
spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { };