Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
56736d0fbc
40 changed files with 417 additions and 155 deletions
|
|
@ -4550,6 +4550,13 @@
|
|||
githubId = 2405974;
|
||||
name = "Sébastian Méric de Bellefon";
|
||||
};
|
||||
henkkalkwater = {
|
||||
email = "chris+nixpkgs@netsoj.nl";
|
||||
github = "HenkKalkwater";
|
||||
githubId = 4262067;
|
||||
matrix = "@chris:netsoj.nl";
|
||||
name = "Chris Josten";
|
||||
};
|
||||
henrikolsson = {
|
||||
email = "henrik@fixme.se";
|
||||
github = "henrikolsson";
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ in {
|
|||
(mkRemovedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")
|
||||
(mkRemovedOptionModule [ "services" "matomo" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools.<name>.settings")
|
||||
(mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ])
|
||||
(mkRenamedOptionModule [ "services" "matomo" "periodicArchiveProcessingUrl" ] [ "services" "matomo" "hostname" ])
|
||||
];
|
||||
|
||||
options = {
|
||||
|
|
@ -77,7 +78,7 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
periodicArchiveProcessingUrl = mkOption {
|
||||
hostname = mkOption {
|
||||
type = types.str;
|
||||
default = "${user}.${fqdn}";
|
||||
example = "matomo.yourdomain.org";
|
||||
|
|
@ -170,6 +171,19 @@ in {
|
|||
fi
|
||||
chown -R ${user}:${user} ${dataDir}
|
||||
chmod -R ug+rwX,o-rwx ${dataDir}
|
||||
|
||||
if [ -e ${dataDir}/current-package ]; then
|
||||
CURRENT_PACKAGE=$(readlink ${dataDir}/current-package)
|
||||
NEW_PACKAGE=${cfg.package}
|
||||
if [ "$CURRENT_PACKAGE" != "$NEW_PACKAGE" ]; then
|
||||
# keeping tmp arround between upgrades seems to bork stuff, so delete it
|
||||
rm -rf ${dataDir}/tmp
|
||||
fi
|
||||
elif [ -e ${dataDir}/tmp ]; then
|
||||
# upgrade from 4.4.1
|
||||
rm -rf ${dataDir}/tmp
|
||||
fi
|
||||
ln -sfT ${cfg.package} ${dataDir}/current-package
|
||||
'';
|
||||
script = ''
|
||||
# Use User-Private Group scheme to protect Matomo data, but allow administration / backup via 'matomo' group
|
||||
|
|
@ -202,7 +216,7 @@ in {
|
|||
UMask = "0007";
|
||||
CPUSchedulingPolicy = "idle";
|
||||
IOSchedulingClass = "idle";
|
||||
ExecStart = "${cfg.package}/bin/matomo-console core:archive --url=https://${cfg.periodicArchiveProcessingUrl}";
|
||||
ExecStart = "${cfg.package}/bin/matomo-console core:archive --url=https://${cfg.hostname}";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -258,7 +272,7 @@ in {
|
|||
# References:
|
||||
# https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html
|
||||
# https://github.com/perusio/piwik-nginx
|
||||
"${user}.${fqdn}" = mkMerge [ cfg.nginx {
|
||||
"${cfg.hostname}" = mkMerge [ cfg.nginx {
|
||||
# don't allow to override the root easily, as it will almost certainly break Matomo.
|
||||
# disadvantage: not shown as default in docs.
|
||||
root = mkForce "${cfg.package}/share";
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ in
|
|||
avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
|
||||
babeld = handleTest ./babeld.nix {};
|
||||
bazarr = handleTest ./bazarr.nix {};
|
||||
bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64
|
||||
bcachefs = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bcachefs.nix {};
|
||||
beanstalkd = handleTest ./beanstalkd.nix {};
|
||||
bees = handleTest ./bees.nix {};
|
||||
bind = handleTest ./bind.nix {};
|
||||
|
|
|
|||
|
|
@ -21,6 +21,20 @@ import ./make-test-python.nix ({ lib, ...} : {
|
|||
testScript = ''
|
||||
nameserver.start()
|
||||
nameserver.wait_for_unit("tinydns.service")
|
||||
nameserver.succeed("host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'")
|
||||
|
||||
# We query tinydns a few times to trigger the bug:
|
||||
#
|
||||
# nameserver # [ 6.105872] mmap: tinydns (842): VmData 331776 exceed data ulimit 300000. Update limits or use boot option ignore_rlimit_data.
|
||||
#
|
||||
# which was reported in https://github.com/NixOS/nixpkgs/issues/119066.
|
||||
# Without the patch <nixpkgs/pkgs/tools/networking/djbdns/softlimit.patch>
|
||||
# it fails on the 10th iteration.
|
||||
nameserver.succeed(
|
||||
"""
|
||||
for i in {1..100}; do
|
||||
host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'
|
||||
done
|
||||
"""
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,27 +1,26 @@
|
|||
{ fetchFromGitHub, installShellFiles, lib, rustPlatform }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mmtc";
|
||||
version = "0.2.13";
|
||||
version = "0.2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "figsoda";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ag87hgdg6fvk80fgznba0xjlcajks5w5s6y8lvwhz9irn2kq2rz";
|
||||
sha256 = "sha256-g2JHY95vkG/Ep2eqz8guteF8fHUso/JuuVijNGkgykA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0lkx0zj9xc0rlrq91l4wydzp430hxlrqyq7ii8wq2fcan8ln22lv";
|
||||
cargoSha256 = "sha256-tVjy/O5hfnQFC6to8VMGc39mEXhA5lwUIne6pVvDec0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
preFixup = ''
|
||||
completions=($releaseDir/build/mmtc-*/out/completions)
|
||||
installShellCompletion ''${completions[0]}/mmtc.{bash,fish}
|
||||
installShellCompletion --zsh ''${completions[0]}/_mmtc
|
||||
installShellCompletion $completions/mmtc.{bash,fish} --zsh $completions/_mmtc
|
||||
'';
|
||||
|
||||
GEN_COMPLETIONS = "1";
|
||||
GEN_COMPLETIONS = 1;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimal mpd terminal client that aims to be simple yet highly configurable";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
pname = "plexamp";
|
||||
version = "3.8.0";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||
name="${pname}-${version}.AppImage";
|
||||
sha512 = "wdOJYmUHPSuijQjmkwq1jLX3qgLzmFxDihlETELlzk13RcpCcczL++V5dqdiQY6UmZVP3KL4VPjXubSq4CmXlQ==";
|
||||
sha512 = "JVzfWlrX21KHw4tSrGpCYqqoWFudnyFG4YnHKsnIUtxLDkjyQA8N2/OrDIR+SlK/b0RRs9KZ4lbqQMX8PXUHsg==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
|
|||
meta = with lib; {
|
||||
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
|
||||
homepage = "https://plexamp.com/";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/33";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/35";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ killercup synthetica ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sublime-music";
|
||||
version = "0.11.13";
|
||||
version = "0.11.14";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
|
|
@ -57,19 +57,26 @@ python3Packages.buildPythonApplication rec {
|
|||
++ lib.optional serverSupport bottle
|
||||
;
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/--cov/d" setup.cfg
|
||||
sed -i "/--no-cov-on-fail/d" setup.cfg
|
||||
'';
|
||||
|
||||
# hook for gobject-introspection doesn't like strictDeps
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
# Use the test suite provided by the upstream project.
|
||||
checkInputs = with python3Packages; [
|
||||
pytest
|
||||
pytest-cov
|
||||
];
|
||||
checkPhase = "${xvfb-run}/bin/xvfb-run pytest";
|
||||
|
||||
# Also run the python import check for sanity
|
||||
pythonImportsCheck = [ "sublime_music" ];
|
||||
checkPhase = ''
|
||||
${xvfb-run}/bin/xvfb-run pytest -k "not test_json_load_unload"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sublime_music"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 sublime-music.desktop -t $out/share/applications
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, cmake, StormLib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smpq";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/smpq/trunk/1.6/+download/smpq_1.6.orig.tar.gz";
|
||||
url = "https://launchpad.net/smpq/trunk/${version}/+download/${pname}_${version}.orig.tar.gz";
|
||||
sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,28 +2,28 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proverif";
|
||||
version = "2.02pl1";
|
||||
version = "2.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz";
|
||||
sha256 = "1jmzfpx0hdgfmkq0jp6i3k5av9xxgndjaj743wfy37svn0ga4jjx";
|
||||
url = "https://bblanche.gitlabpages.inria.fr/proverif/proverif${version}.tar.gz";
|
||||
sha256 = "sha256:1q5mp9il09jylimcaqczb3kh34gb5px88js127gxv0jj5b4bqfc7";
|
||||
};
|
||||
|
||||
buildInputs = with ocamlPackages; [ ocaml findlib lablgtk ];
|
||||
buildInputs = with ocamlPackages; [ ocaml findlib ];
|
||||
|
||||
buildPhase = "./build";
|
||||
buildPhase = "./build -nointeract";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ./proverif $out/bin
|
||||
cp ./proveriftotex $out/bin
|
||||
runHook preInstall
|
||||
install -D -t $out/bin proverif proveriftotex
|
||||
install -D -t $out/share/emacs/site-lisp/ emacs/proverif.el
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Cryptographic protocol verifier in the Dolev-Yao model";
|
||||
homepage = "https://prosecco.gforge.inria.fr/personal/bblanche/proverif/";
|
||||
description = "Cryptographic protocol verifier in the formal model";
|
||||
homepage = "https://bblanche.gitlabpages.inria.fr/proverif/";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.thoughtpolice ];
|
||||
maintainers = with lib.maintainers; [ thoughtpolice vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
40
pkgs/data/icons/vimix-icon-theme/default.nix
Normal file
40
pkgs/data/icons/vimix-icon-theme/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vimix-icon-theme";
|
||||
version = "2021-11-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ali128027yw5kllip7p32c92pby5gaqs0i393m3bp69547np1d4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 jdupes ];
|
||||
|
||||
propagatedBuildInputs = [ hicolor-icon-theme ];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
# These fixup steps are slow and unnecessary for this package
|
||||
dontPatchELF = true;
|
||||
dontRewriteSymlinks = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
patchShebangs install.sh
|
||||
./install.sh -a -d $out/share/icons
|
||||
# replace duplicate files with symlinks
|
||||
jdupes -l -r $out/share/icons
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Material Design icon theme based on Paper icon theme";
|
||||
homepage = "https://github.com/vinceliuice/vimix-icon-theme";
|
||||
license = with licenses; [ cc-by-sa-40 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -36,8 +36,10 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
# fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667
|
||||
(fetchpatch {
|
||||
url = "https://cgit.freebsd.org/ports/patch/?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655";
|
||||
sha256 = "sha256-IMBfqtrqBw3DdmJG0qchZFR6Am1PICMnM5P6BcS8oqI=";
|
||||
url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655";
|
||||
sha256 = "sha256:0ihixyq72yhx6njij7bldsqb80x3y217yh6livknlf5r1wr3hakn";
|
||||
extraPrefix = "";
|
||||
name = "gnome-todo_meson-build.patch";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
./plugin-search-dirs.patch
|
||||
./fix-clang-build.patch # see https://github.com/YosysHQ/yosys/issues/2011
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -104,12 +105,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.isc;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ shell thoughtpolice emily ];
|
||||
#In file included from kernel/driver.cc:20:
|
||||
#./kernel/yosys.h:42:10: fatal error: 'map' file not found
|
||||
##include <map>
|
||||
|
||||
#https://github.com/YosysHQ/yosys/issues/681
|
||||
#https://github.com/YosysHQ/yosys/issues/2011
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
26
pkgs/development/compilers/yosys/fix-clang-build.patch
Normal file
26
pkgs/development/compilers/yosys/fix-clang-build.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 86abc6958..a72f7b792 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -145,7 +145,12 @@ bumpversion:
|
||||
ABCREV = 4f5f73d
|
||||
ABCPULL = 1
|
||||
ABCURL ?= https://github.com/YosysHQ/abc
|
||||
+
|
||||
+ifneq ($(CONFIG),clang)
|
||||
+ABCMKARGS = CC=clang CXX="$(CXX)" LD=clang ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)
|
||||
+else
|
||||
ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)
|
||||
+endif
|
||||
|
||||
# set ABCEXTERNAL = <abc-command> to use an external ABC instance
|
||||
# Note: The in-tree ABC (yosys-abc) will not be installed when ABCEXTERNAL is set.
|
||||
@@ -187,7 +192,7 @@ endif
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG),clang)
|
||||
-CXX = clang
|
||||
+CXX = clang++
|
||||
LD = clang++
|
||||
CXXFLAGS += -std=$(CXXSTD) -Os
|
||||
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-driver";
|
||||
version = "21.3.5";
|
||||
version = "21.4.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "1wc8qhz1j4z42jmnsr38y15kc0jhfqfx8ssnb5055kmmmvzwk1sh";
|
||||
sha256 = "1gf3gkxr68n8ca5bk269w469jykq90z8d3a9v0gag02cl1d6ca3i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfyaml";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantoniou";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1367cbny5msapy48z0yysbkawmk1qjqk7cjnqkjszs47riwvjz3h";
|
||||
sha256 = "0wq7ah9a83w0c5qppdpwqqjffwi85q7slz4im0kmkhxdp23v9m1i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
18
pkgs/development/python-modules/filelock/3.2.nix
Normal file
18
pkgs/development/python-modules/filelock/3.2.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "filelock";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1qry67zv2pmz8px6wdfbjqv75nmryy2ac7asqgs6q6db2722kpcw";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/benediktschmitt/py-filelock";
|
||||
description = "A platform independent file lock for Python";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ henkkalkwater ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,80 +1,86 @@
|
|||
{ lib
|
||||
, arrow
|
||||
, buildPythonPackage
|
||||
, colour
|
||||
, email_validator
|
||||
, enum34
|
||||
, fetchPypi
|
||||
, nose
|
||||
, pillow
|
||||
, flask
|
||||
, flask_sqlalchemy
|
||||
, flask-babelex
|
||||
, flask-mongoengine
|
||||
, geoalchemy2
|
||||
, isPy27
|
||||
, mongoengine
|
||||
, pillow
|
||||
, psycopg2
|
||||
, pymongo
|
||||
, wtf-peewee
|
||||
, pytestCheckHook
|
||||
, shapely
|
||||
, sqlalchemy
|
||||
, sqlalchemy-citext
|
||||
, sqlalchemy-utils
|
||||
, flask-mongoengine
|
||||
, flask_sqlalchemy
|
||||
, flask-babelex
|
||||
, shapely
|
||||
, geoalchemy2
|
||||
, psycopg2
|
||||
, arrow
|
||||
, colour
|
||||
, email_validator
|
||||
, flask
|
||||
, wtf-peewee
|
||||
, wtforms
|
||||
, isPy27
|
||||
, enum34
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-admin";
|
||||
version = "1.5.6";
|
||||
version = "1.5.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-Admin";
|
||||
inherit version;
|
||||
sha256 = "1f31vzc0p2xni5mh1wvjk9jxf4ddlx2fj4r0f3vv2n9db3c63iv8";
|
||||
sha256 = "sha256-6wah8xuYiB3uU6VcZPrr0ZkNaqw4gmNksoDfCyZ5/3Q=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
pillow
|
||||
mongoengine
|
||||
pymongo
|
||||
wtf-peewee
|
||||
sqlalchemy
|
||||
sqlalchemy-citext
|
||||
sqlalchemy-utils
|
||||
flask-mongoengine
|
||||
flask_sqlalchemy
|
||||
flask-babelex
|
||||
shapely
|
||||
geoalchemy2
|
||||
psycopg2
|
||||
arrow
|
||||
colour
|
||||
email_validator
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
wtforms
|
||||
] ++ lib.optionals isPy27 [ enum34 ];
|
||||
] ++ lib.optionals isPy27 [
|
||||
enum34
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
# disable tests that require mongodb, postresql, or network
|
||||
nosetests \
|
||||
-e "mongoengine" \
|
||||
-e "pymongo" \
|
||||
-e "test_form_upload" \
|
||||
-e "test_postgres" \
|
||||
-e "geoa" \
|
||||
-e "test_ajax_fk" \
|
||||
flask_admin/tests
|
||||
'';
|
||||
checkInputs = [
|
||||
arrow
|
||||
colour
|
||||
email_validator
|
||||
flask_sqlalchemy
|
||||
flask-babelex
|
||||
flask-mongoengine
|
||||
geoalchemy2
|
||||
mongoengine
|
||||
pillow
|
||||
psycopg2
|
||||
pymongo
|
||||
pytestCheckHook
|
||||
shapely
|
||||
sqlalchemy
|
||||
sqlalchemy-citext
|
||||
sqlalchemy-utils
|
||||
wtf-peewee
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests have additional requirements
|
||||
"flask_admin/tests/geoa/test_basic.py"
|
||||
"flask_admin/tests/mongoengine/test_basic.py"
|
||||
"flask_admin/tests/pymongo/test_basic.py"
|
||||
"flask_admin/tests/sqla/test_basic.py"
|
||||
"flask_admin/tests/sqla/test_form_rules.py"
|
||||
"flask_admin/tests/sqla/test_postgres.py"
|
||||
"flask_admin/tests/sqla/test_translation.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flask_admin"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and extensible admin interface framework for Flask";
|
||||
homepage = "https://github.com/flask-admin/flask-admin/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +1,64 @@
|
|||
{ buildPythonPackage, fetchFromGitHub, lib
|
||||
# propagatedBuildInputs
|
||||
, absl-py, numpy, opt-einsum
|
||||
# checkInputs
|
||||
, jaxlib, pytestCheckHook
|
||||
{ lib
|
||||
, absl-py
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, jaxlib
|
||||
, numpy
|
||||
, opt-einsum
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jax";
|
||||
version = "0.2.21";
|
||||
version = "0.2.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Fetching from pypi doesn't allow us to run the test suite. See https://discourse.nixos.org/t/pythonremovetestsdir-hook-being-run-before-checkphase/14612/3.
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "jax-v${version}";
|
||||
sha256 = "05w157h6jv20k8w2gnmlxbycmzf24lr5v392q0c5v0qcql11q7pn";
|
||||
sha256 = "1mmn1m4mprpwqlb1smjfdy3f74zm9p3l9dhhn25x6jrcj2cgc5pi";
|
||||
};
|
||||
|
||||
# jaxlib is _not_ included in propagatedBuildInputs because there are
|
||||
# different versions of jaxlib depending on the desired target hardware. The
|
||||
# JAX project ships separate wheels for CPU, GPU, and TPU. Currently only the
|
||||
# CPU wheel is packaged.
|
||||
propagatedBuildInputs = [ absl-py numpy opt-einsum ];
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
numpy
|
||||
opt-einsum
|
||||
scipy
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
jaxlib
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [ jaxlib pytestCheckHook ];
|
||||
# NOTE: Don't run the tests in the expiremental directory as they require flax
|
||||
# which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2.
|
||||
# Not a big deal, this is how the JAX docs suggest running the test suite
|
||||
# anyhow.
|
||||
pytestFlagsArray = [ "-W ignore::DeprecationWarning" "tests/" ];
|
||||
pytestFlagsArray = [
|
||||
"-W ignore::DeprecationWarning"
|
||||
"tests/"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jax"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Differentiate, compile, and transform Numpy code";
|
||||
homepage = "https://github.com/google/jax";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/google/jax";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
51
pkgs/development/python-modules/pymarshal/default.nix
Normal file
51
pkgs/development/python-modules/pymarshal/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, bson
|
||||
, pytest
|
||||
, pytest-cov
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymarshal";
|
||||
version = "2.2.0";
|
||||
disabled = pythonOlder "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stargateaudio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bson
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
bson
|
||||
pytest
|
||||
pytest-cov
|
||||
pyyaml
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "test" ];
|
||||
|
||||
meta = {
|
||||
description = "Python data serialization library";
|
||||
homepage = "https://github.com/stargateaudio/pymarshal";
|
||||
maintainers = with lib.maintainers; [ yuu ];
|
||||
license = lib.licenses.bsd2;
|
||||
};
|
||||
}
|
||||
|
|
@ -13,8 +13,9 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytile";
|
||||
version = "5.2.4";
|
||||
version = "2021.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -45,7 +46,9 @@ buildPythonPackage rec {
|
|||
"examples/"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pytile" ];
|
||||
pythonImportsCheck = [
|
||||
"pytile"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.25.11";
|
||||
version = "2.25.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-snkoTlH2aOOO4S2WZeTXiQifUy3CoL5KFQjKDv2Yup4=";
|
||||
sha256 = "sha256-BVhjwKrPj48pzSyg0zIO/fOfKOcd5o0yd2F1HS9iu1c=";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "velbus-aio";
|
||||
version = "2021.11.0";
|
||||
version = "2021.11.6";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Cereal2nd";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4N1wamy0nqAmVezOd3kBicUAZXRob8gNA89N3fY1Y7o=";
|
||||
sha256 = "sha256-Vm/CgrSSCU76CzAxCtpMsE8/GtPE9SlfqDyzYp4Gc8E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamale";
|
||||
version = "3.0.8";
|
||||
version = "4.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -17,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "23andMe";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0bn0himn5fwndaxn205s55bdc4np7lhd940i0lkv0m7ybhbw7dap";
|
||||
sha256 = "sha256-hFBU3o3HpL0Schgzcx3oYq0IAUVGKThIfEteYcFbLnk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -29,7 +30,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "yamale" ];
|
||||
pythonImportsCheck = [
|
||||
"yamale"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A schema and validator for YAML";
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
fmt
|
||||
libpng
|
||||
(SDL2.override { withStatic = true; })
|
||||
SDL2
|
||||
SDL2_image
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3970,6 +3970,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/jlesquembre/nterm.nvim/";
|
||||
};
|
||||
|
||||
nui-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "nui.nvim";
|
||||
version = "2021-10-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MunifTanjim";
|
||||
repo = "nui.nvim";
|
||||
rev = "362585d6515805d4be4eb665cf8707759a92a254";
|
||||
sha256 = "0gzanzyn7fa0qmngrqzlflzzyjzqkn21nhwbgw48hd0x143p0fab";
|
||||
};
|
||||
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
|
||||
};
|
||||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2021-11-04";
|
||||
|
|
|
|||
|
|
@ -178,6 +178,10 @@ self: super: {
|
|||
'';
|
||||
});
|
||||
|
||||
crates-nvim = super.crates-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
});
|
||||
|
||||
ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: {
|
||||
buildInputs = [ python ];
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -475,6 +475,7 @@ motus/pig.vim
|
|||
mpickering/hlint-refactor-vim
|
||||
ms-jpq/chadtree@chad
|
||||
mtikekar/vim-bsv
|
||||
MunifTanjim/nui.nvim@main
|
||||
mzlogin/vim-markdown-toc
|
||||
mzlogin/vim-smali
|
||||
nacro90/numb.nvim
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib
|
||||
, fetchpatch
|
||||
, kernel
|
||||
, date ? "2021-07-08"
|
||||
, commit ? "3693b2ca83ff9eda49660b31299d2bebe3a1075f"
|
||||
, diffHash ? "1sfq3vwc2kxa761s292f2cqrm0vvqvkdx6drpyn5yaxwnapwidcw"
|
||||
, date ? "2021-11-06"
|
||||
, commit ? "10669a2c540de3276c8d2fc0e43be62f2886f377"
|
||||
, diffHash ? "1rn72wd8jg919j74x8banl70b2bdd6r9fgvnw693j20dq96j5cnw"
|
||||
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
||||
, argsOverride ? {}
|
||||
, ...
|
||||
|
|
@ -16,7 +16,6 @@
|
|||
extraMeta = {
|
||||
branch = "master";
|
||||
maintainers = with lib.maintainers; [ davidak chiiruno ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
} // argsOverride;
|
||||
|
||||
|
|
@ -30,4 +29,4 @@
|
|||
extraConfig = "BCACHEFS_FS m";
|
||||
} ] ++ kernelPatches;
|
||||
|
||||
})).overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = true; }; })
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@ let
|
|||
# * shards.nix (by running `crystal2nix` in invidious’ source tree)
|
||||
# * If the lsquic.cr dependency changed: lsquic in lsquic.nix (version, sha256)
|
||||
# * If the lsquic version changed: boringssl' in lsquic.nix (version, sha256)
|
||||
rev = "21b96a31599e890fe063e3e24cf5f3a995779a69";
|
||||
rev = "21879da80d2dfa97e789a13b90e82e466c4854e3";
|
||||
in
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "invidious";
|
||||
version = "unstable-2021-10-15";
|
||||
version = "unstable-2021-11-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iv-org";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "sha256-Rp3YqjHbP6szohlaEpgopFNdLK31yrcHtyKCeVz76CA=";
|
||||
sha256 = "0jvnwjdh2l0hxfvzim00r3zbs528bb93y1nk0bjrbbrcfv5cn5ss";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
let
|
||||
versions = {
|
||||
matomo = {
|
||||
version = "4.4.1";
|
||||
sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl";
|
||||
version = "4.5.0";
|
||||
sha256 = "sha256-OyjdzY+ENYxOTVjDLjj2unJbpaGODIH2I5Acmt45HDA=";
|
||||
};
|
||||
|
||||
matomo-beta = {
|
||||
version = "4.4.1";
|
||||
version = "4.6.0";
|
||||
# `beta` examples: "b1", "rc1", null
|
||||
# TOOD when updating: use null if stable version is >= latest beta or release candidate
|
||||
beta = null;
|
||||
sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl";
|
||||
# when updating: use null if stable version is >= latest beta or release candidate
|
||||
beta = "b2";
|
||||
sha256 = "sha256-7p/ZPtr5a/tBjrM27ILF3rNfxDIWuzWKCXNom3HlyL8=";
|
||||
};
|
||||
};
|
||||
common = pname: { version, sha256, beta ? null }:
|
||||
|
|
@ -74,10 +74,9 @@ let
|
|||
"misc/composer/clean-xhprof.sh"
|
||||
"misc/cron/archive.sh"
|
||||
"plugins/Installation/FormDatabaseSetup.php"
|
||||
"vendor/leafo/lessphp/package.sh"
|
||||
"vendor/pear/archive_tar/sync-php4"
|
||||
"vendor/szymach/c-pchart/coverage.sh"
|
||||
# drupal_test.sh does not exist in 3.12.0-b3; added for 3.13.0
|
||||
"vendor/matomo/matomo-php-tracker/run_tests.sh"
|
||||
"vendor/twig/twig/drupal_test.sh"
|
||||
];
|
||||
|
||||
|
|
@ -92,6 +91,8 @@ let
|
|||
length="$(wc -c "$f" | cut -d' ' -f1)"
|
||||
hash="$(md5sum "$f" | cut -d' ' -f1)"
|
||||
sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
|
||||
else
|
||||
echo "INFO(files-to-fix): $f does not exist in this version"
|
||||
fi
|
||||
done
|
||||
popd > /dev/null
|
||||
|
|
|
|||
|
|
@ -22,23 +22,24 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bcachefs-tools";
|
||||
version = "unstable-2021-07-08";
|
||||
version = "unstable-2021-11-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e";
|
||||
sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw";
|
||||
rev = "5b84952401146fec9a181a40877352f7faf9ee7b";
|
||||
sha256 = "09zs2h3vzqn163v4i9lrvgy9gcjlw24lld7715j3kyyxnc5vav32";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace Makefile \
|
||||
--replace "pytest-3" "pytest --verbose" \
|
||||
--replace "INITRAMFS_DIR=/etc/initramfs-tools" \
|
||||
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config docutils ];
|
||||
nativeBuildInputs = [ pkg-config docutils python3Packages.python ];
|
||||
|
||||
buildInputs = [
|
||||
libuuid libscrypt libsodium keyutils liburcu zlib libaio
|
||||
|
|
@ -64,6 +65,6 @@ stdenv.mkDerivation {
|
|||
homepage = "https://bcachefs.org/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ davidak chiiruno ];
|
||||
platforms = [ "x86_64-linux" ]; # does not build on aarch64, see https://github.com/koverstreet/bcachefs-tools/issues/39
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
, polkit
|
||||
, procps
|
||||
, systemd
|
||||
, util-linux
|
||||
, vulkan-tools
|
||||
, which
|
||||
}:
|
||||
|
|
@ -35,13 +36,13 @@ let
|
|||
'';
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "goverlay";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benjamimgois";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ZksQse0xWAtH+U6EjcGWT2BOG5dfSnm6XvZLLE5ynHs=";
|
||||
sha256 = "sha256-xuv7u2lLQAB0Zmu7UHGXP/sJwcb8vHDf9hFL+pF+818=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
@ -91,6 +92,7 @@ in stdenv.mkDerivation rec {
|
|||
polkit
|
||||
procps
|
||||
systemd
|
||||
util-linux.bin
|
||||
vulkan-tools
|
||||
which
|
||||
]}"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/overlayunit.pas b/overlayunit.pas
|
||||
index a56cea7..9a4f547 100644
|
||||
index 8c2276d..a62e60a 100644
|
||||
--- a/overlayunit.pas
|
||||
+++ b/overlayunit.pas
|
||||
@@ -4880,7 +4880,7 @@ begin
|
||||
@@ -4913,7 +4913,7 @@ begin
|
||||
//Determine Mangohud dependency status
|
||||
|
||||
//locate MangoHud and store result in tmp folder
|
||||
|
|
@ -11,7 +11,7 @@ index a56cea7..9a4f547 100644
|
|||
|
||||
// Assign Text file dependency_mangohud to variable mangohudVAR
|
||||
AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud');
|
||||
@@ -4889,7 +4889,7 @@ begin
|
||||
@@ -4922,7 +4922,7 @@ begin
|
||||
CloseFile(mangohudVAR);
|
||||
|
||||
// Read String and store value on mangohuddependencyVALUE based on result
|
||||
|
|
@ -20,7 +20,7 @@ index a56cea7..9a4f547 100644
|
|||
mangohuddependencyVALUE := 1
|
||||
else
|
||||
mangohuddependencyVALUE := 0;
|
||||
@@ -4898,7 +4898,7 @@ begin
|
||||
@@ -4931,7 +4931,7 @@ begin
|
||||
//Determine vkBasalt dependency staus
|
||||
|
||||
//locate vkBasalt and store result in tmp folder
|
||||
|
|
@ -29,7 +29,7 @@ index a56cea7..9a4f547 100644
|
|||
|
||||
// Assign Text file dependency_mangohud to variable mangohudVAR
|
||||
AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt');
|
||||
@@ -4907,7 +4907,7 @@ begin
|
||||
@@ -4940,7 +4940,7 @@ begin
|
||||
CloseFile(vkbasaltVAR);
|
||||
|
||||
// Read String and store value on vkbasaltdependencyVALUE based on result
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/1ngmthzWp9K7pBBOBiSMUv0yC66K3Tg2g2PoBskpTU=";
|
||||
sha256 = "022bxird7jblxix7h2fk91090c87033a1j6hf4wvckwpqywm0wac";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-eFWsqjXO6QFTO26ppZ4tiJXc/PEYD+5ZdbTBMoDoLFI=";
|
||||
cargoSha256 = "04fyq0n4v01rsx6xw5raf139ml3nq6casz2nyk23zp3349kb8vad";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, glibc, dns-root-data } :
|
||||
{ lib, stdenv, fetchurl, glibc, dns-root-data, nixosTests } :
|
||||
|
||||
let
|
||||
version = "1.05";
|
||||
|
|
@ -19,7 +19,14 @@ stdenv.mkDerivation {
|
|||
sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w";
|
||||
};
|
||||
|
||||
patches = [ ./hier.patch ./fix-nix-usernamespace-build.patch ];
|
||||
patches = [
|
||||
./hier.patch
|
||||
./fix-nix-usernamespace-build.patch
|
||||
|
||||
# To fix https://github.com/NixOS/nixpkgs/issues/119066.
|
||||
# Note that the NixOS test <nixpkgs/nixos/tests/tinydns.nix> tests for this.
|
||||
./softlimit.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
echo gcc -O2 -include ${glibc.dev}/include/errno.h > conf-cc
|
||||
|
|
@ -41,6 +48,10 @@ stdenv.mkDerivation {
|
|||
rm -rv djbdns-man;
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
tinydns = nixosTests.tinydns;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A collection of Domain Name System tools";
|
||||
longDescription = "Includes software for all the fundamental DNS operations: DNS cache: finding addresses of Internet hosts; DNS server: publishing addresses of Internet hosts; and DNS client: talking to a DNS cache.";
|
||||
|
|
|
|||
12
pkgs/tools/networking/djbdns/softlimit.patch
Normal file
12
pkgs/tools/networking/djbdns/softlimit.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur a/tinydns-conf.c b/tinydns-conf.c
|
||||
--- a/tinydns-conf.c 2001-02-11 21:11:45.000000000 +0000
|
||||
+++ b/tinydns-conf.c 2021-11-08 17:23:06.181385437 +0000
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
start("run");
|
||||
outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
|
||||
- outs(" envdir ./env softlimit -d300000 ");
|
||||
+ outs(" envdir ./env softlimit -d4500000 ");
|
||||
outs(auto_home); outs("/bin/tinydns\n");
|
||||
finish();
|
||||
perm(0755);
|
||||
|
|
@ -23639,6 +23639,8 @@ with pkgs;
|
|||
inherit (gnome) gnome-shell;
|
||||
};
|
||||
|
||||
vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { };
|
||||
|
||||
vistafonts = callPackage ../data/fonts/vista-fonts { };
|
||||
|
||||
vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };
|
||||
|
|
@ -29831,7 +29833,11 @@ with pkgs;
|
|||
|
||||
ddnet = callPackage ../games/ddnet { };
|
||||
|
||||
devilutionx = callPackage ../games/devilutionx {};
|
||||
devilutionx = callPackage ../games/devilutionx {
|
||||
SDL2 = SDL2.override {
|
||||
withStatic = true;
|
||||
};
|
||||
};
|
||||
|
||||
dhewm3 = callPackage ../games/dhewm3 {};
|
||||
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ in {
|
|||
};
|
||||
|
||||
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
|
||||
kernel = linux_5_14;
|
||||
kernel = linux_5_15;
|
||||
kernelPatches = kernel.kernelPatches;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6630,6 +6630,8 @@ in {
|
|||
|
||||
pymanopt = callPackage ../development/python-modules/pymanopt { };
|
||||
|
||||
pymarshal = callPackage ../development/python-modules/pymarshal { };
|
||||
|
||||
pymata-express = callPackage ../development/python-modules/pymata-express { };
|
||||
|
||||
pymatgen = callPackage ../development/python-modules/pymatgen { };
|
||||
|
|
|
|||
|
|
@ -110,6 +110,8 @@ with self; with super; {
|
|||
|
||||
feedparser = callPackage ../development/python-modules/feedparser/5.nix { };
|
||||
|
||||
filelock = callPackage ../development/python-modules/filelock/3.2.nix { };
|
||||
|
||||
flask = callPackage ../development/python-modules/flask/1.nix { };
|
||||
|
||||
flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue