Merge staging-next into staging

main
github-actions[bot] 2 years ago committed by GitHub
commit f74178b418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      lib/default.nix
  2. 22
      lib/flakes.nix
  3. 8
      lib/tests/flakes/subflakeTest/flake.nix
  4. 5
      lib/tests/flakes/subflakeTest/subflake/flake.nix
  5. 10
      lib/tests/misc.nix
  6. 13
      pkgs/applications/audio/gtkpod/default.nix
  7. 4
      pkgs/applications/editors/xxe-pe/default.nix
  8. 18
      pkgs/applications/emulators/retrofe/default.nix
  9. 11
      pkgs/applications/emulators/retrofe/include-paths.patch
  10. 86
      pkgs/applications/finance/odoo/default.nix
  11. 4
      pkgs/applications/misc/p2pool/default.nix
  12. 17
      pkgs/applications/version-management/git-and-tools/git-codereview/default.nix
  13. 47
      pkgs/applications/video/byzanz/default.nix
  14. 20
      pkgs/desktops/gnome/extensions/collisions.json
  15. 6
      pkgs/desktops/gnome/extensions/extensionRenames.nix
  16. 158
      pkgs/desktops/gnome/extensions/extensions.json
  17. 4
      pkgs/development/ocaml-modules/labltk/default.nix
  18. 2
      pkgs/development/php-packages/memcached/default.nix
  19. 1
      pkgs/development/php-packages/openswoole/default.nix
  20. 2
      pkgs/development/php-packages/redis/default.nix
  21. 2
      pkgs/development/php-packages/snuffleupagus/default.nix
  22. 1
      pkgs/development/php-packages/swoole/default.nix
  23. 4
      pkgs/development/python-modules/browser-cookie3/default.nix
  24. 4
      pkgs/development/python-modules/fakeredis/default.nix
  25. 3
      pkgs/development/python-modules/flask-restful/default.nix
  26. 6
      pkgs/development/python-modules/gst-python/default.nix
  27. 7
      pkgs/development/python-modules/osmpythontools/default.nix
  28. 4
      pkgs/development/python-modules/pex/default.nix
  29. 21
      pkgs/development/python-modules/proxmoxer/default.nix
  30. 4
      pkgs/development/python-modules/puremagic/default.nix
  31. 4
      pkgs/development/python-modules/pyautogui/default.nix
  32. 20
      pkgs/development/python-modules/pymbolic/default.nix
  33. 3
      pkgs/development/python-modules/pynetdicom/default.nix
  34. 4
      pkgs/development/python-modules/pyrogram/default.nix
  35. 1
      pkgs/development/python-modules/pyscf/default.nix
  36. 5
      pkgs/development/python-modules/pyvips/default.nix
  37. 53
      pkgs/development/python-modules/reportengine/default.nix
  38. 6
      pkgs/development/python-modules/tempest/default.nix
  39. 42
      pkgs/development/python-modules/tesla-powerwall/default.nix
  40. 19
      pkgs/development/python-modules/timetagger/default.nix
  41. 42
      pkgs/development/python-modules/vallox-websocket-api/default.nix
  42. 62
      pkgs/development/python-modules/werkzeug/1.nix
  43. 5
      pkgs/development/tools/electron/generic.nix
  44. 4
      pkgs/games/fheroes2/default.nix
  45. 13
      pkgs/servers/dendrite/default.nix
  46. 8
      pkgs/servers/home-assistant/component-packages.nix
  47. 14
      pkgs/servers/monitoring/prometheus/consul-exporter.nix
  48. 23
      pkgs/servers/timetagger/default.nix
  49. 4
      pkgs/servers/unifi/default.nix
  50. 5
      pkgs/tools/graphics/ploticus/default.nix
  51. 10
      pkgs/tools/networking/boundary/default.nix
  52. 6
      pkgs/tools/networking/mozillavpn/default.nix
  53. 64
      pkgs/tools/networking/zerotierone/default.nix
  54. 13
      pkgs/tools/security/hashdeep/default.nix
  55. 23
      pkgs/tools/system/acpica-tools/default.nix
  56. 14
      pkgs/tools/text/xurls/default.nix
  57. 6
      pkgs/top-level/python-packages.nix

@ -11,9 +11,6 @@ let
callLibs = file: import file { lib = self; };
in {
# interacting with flakes
flakes = callLibs ./flakes.nix;
# often used, or depending on very little
trivial = callLibs ./trivial.nix;
fixedPoints = callLibs ./fixed-points.nix;
@ -62,7 +59,6 @@ let
# linux kernel configuration
kernel = callLibs ./kernel.nix;
inherit (self.flakes) callLocklessFlake;
inherit (builtins) add addErrorContext attrNames concatLists
deepSeq elem elemAt filter genericClosure genList getAttr
hasAttr head isAttrs isBool isInt isList isString length

@ -1,22 +0,0 @@
{ lib }:
rec {
/* imports a flake.nix without acknowledging its lock file, useful for
referencing subflakes from a parent flake. The second argument allows
specifying the inputs of this flake.
Example:
callLocklessFlake {
path = ./directoryContainingFlake;
inputs = { inherit nixpkgs; };
}
*/
callLocklessFlake = { path, inputs ? { } }:
let
self = { outPath = path; } //
((import (path + "/flake.nix")).outputs (inputs // { self = self; }));
in
self;
}

@ -1,8 +0,0 @@
{
outputs = { self, subflake, callLocklessFlake }: rec {
x = (callLocklessFlake {
path = subflake;
inputs = {};
}).subflakeOutput;
};
}

@ -1,5 +0,0 @@
{
outputs = { self }: {
subflakeOutput = 1;
};
}

@ -22,16 +22,6 @@ in
runTests {
# FLAKES
testCallLocklessFlake = {
expr = callLocklessFlake {
path = ./flakes/subflakeTest;
inputs = { subflake = ./flakes/subflakeTest/subflake; inherit callLocklessFlake; };
};
expected = { x = 1; outPath = ./flakes/subflakeTest; };
};
# TRIVIAL
testId = {

@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/gtkpod/${pname}-${version}.tar.gz";
sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
};
postPatch = ''
sed -i 's/which/type -P/' scripts/*.sh
'';
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
buildInputs = [
@ -19,15 +22,17 @@ stdenv.mkDerivation rec {
gdl gnome.adwaita-icon-theme gnome.anjuta
] ++ (with perlPackages; [ perl XMLParser ]);
patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: .libs/autodetection.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: multiple definition of
# `gtkpod_app'; .libs/gtkpod_app_iface.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
enableParallelBuilding = true;
meta = with lib; {
description = "GTK Manager for an Apple ipod";
homepage = "http://gtkpod.sourceforge.net";
homepage = "https://sourceforge.net/projects/gtkpod/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.skeidel ];

@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation rec {
pname = "xxe-pe";
version = "9.4.0";
version = "10.1.0";
src =
assert !acceptLicense -> throw ''
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
'';
fetchurl {
url = "https://www.xmlmind.com/xmleditor/_download/xxe-perso-${builtins.replaceStrings [ "." ] [ "_" ] version}.zip";
sha256 = "FKPdf9cOpgm/WG2i8bFnR6MmEifpiq5ykw2zHA8HnT8=";
sha256 = "sha256-AeyaJSEJQQJ/XxvaIky4fnEr+7fVAEqhSxtYhN8L2JA=";
};
nativeBuildInputs = [

@ -1,15 +1,16 @@
{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config
{ lib, stdenv, fetchFromGitHub, cmake, glib, gst_all_1, makeWrapper, pkg-config
, python2, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell
}:
stdenv.mkDerivation {
pname = "retrofe";
version = "0.6.169";
version = "0.10.31";
src = fetchhg {
url = "https://bitbucket.org/teamretro/retrofe";
rev = "8793e03";
sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm";
src = fetchFromGitHub {
owner = "phulshof";
repo = "RetroFE";
rev = "2ddd65a76210d241031c4ac9268255f311df25d1";
sha256 = "sha256-uBfECbU2Df/pPpEXXq62S7Ec0YU4lPIsZ8k5UmKD7xQ=";
};
nativeBuildInputs = [ cmake makeWrapper pkg-config python2 ];
@ -18,12 +19,9 @@ stdenv.mkDerivation {
glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib
] ++ (with gst_all_1; [ gst-libav gst-plugins-base gst-plugins-good ]);
patches = [ ./include-paths.patch ];
configurePhase = ''
cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \
-DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0 \
-DGSTREAMER_BASE_INCLUDE_DIRS='${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0'
'';
buildPhase = ''
@ -70,7 +68,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "A frontend for arcade cabinets and media PCs";
homepage = "http://retrofe.com";
homepage = "http://retrofe.nl/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ hrdinka ];
platforms = with platforms; linux;

@ -1,11 +0,0 @@
diff -ur RetroFE.1/RetroFE/Source/CMakeLists.txt RetroFE.2/RetroFE/Source/CMakeLists.txt
--- RetroFE.1/RetroFE/Source/CMakeLists.txt 2016-02-21 14:52:36.726070602 +0100
+++ RetroFE.2/RetroFE/Source/CMakeLists.txt 2016-02-21 14:38:43.036249029 +0100
@@ -59,6 +59,7 @@
set(RETROFE_INCLUDE_DIRS
"${GLIB2_INCLUDE_DIRS}"
"${GSTREAMER_INCLUDE_DIRS}"
+ "${GSTREAMER_BASE_INCLUDE_DIRS}"
"${SDL2_INCLUDE_DIRS}"
"${SDL2_IMAGE_INCLUDE_DIRS}"
"${SDL2_MIXER_INCLUDE_DIRS}"

@ -2,19 +2,74 @@
, lib
, fetchurl
, python3
, python3Packages
, nodePackages
, wkhtmltopdf
, callPackage
}:
with python3Packages;
let
werkzeug = python3Packages.callPackage ../../../development/python-modules/werkzeug/1.nix {};
in
buildPythonApplication rec {
python = python3.override {
packageOverrides = self: super: {
click = super.click.overridePythonAttrs (old: rec {
version = "7.1.2";
src = old.src.override {
inherit version;
sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
};
});
flask = super.flask.overridePythonAttrs (old: rec {
version = "1.1.4";
src = old.src.override {
inherit version;
sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196";
};
});
itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec {
version = "1.1.0";
src = old.src.override {
inherit version;
sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
};
});
jinja2 = super.jinja2.overridePythonAttrs (old: rec {
version = "2.11.3";
src = old.src.override {
inherit version;
sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6";
};
});
markupsafe = super.markupsafe.overridePythonAttrs (old: rec {
version = "2.0.1";
src = old.src.override {
inherit version;
sha256 = "594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a";
};
});
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
version = "1.0.1";
src = old.src.override {
inherit version;
sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
};
checkInputs = old.checkInputs ++ (with self; [
requests
]);
disabledTests = old.disabledTests ++ [
# ResourceWarning: unclosed file
"test_basic"
"test_date_to_unix"
"test_easteregg"
"test_file_rfc2231_filename_continuations"
"test_find_terminator"
"test_save_to_pathlib_dst"
];
disabledTestPaths = old.disabledTestPaths ++ [
# ResourceWarning: unclosed file
"tests/test_http.py"
];
});
};
};
in python.pkgs.buildPythonApplication rec {
pname = "odoo";
major = "15";
@ -23,6 +78,8 @@ buildPythonApplication rec {
version = "${major}.${minor}.${patch}";
format = "setuptools";
# latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile
src = fetchurl {
url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz";
@ -30,23 +87,12 @@ buildPythonApplication rec {
hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg=";
};
nativeBuildInputs = [
setuptools
wheel
mock
];
buildInputs = [
wkhtmltopdf
nodePackages.rtlcss
];
# needs some investigation
doCheck = false;
makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ];
propagatedBuildInputs = [
propagatedBuildInputs = with python.pkgs; [
babel
chardet
decorator

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "p2pool";
version = "1.9";
version = "2.0";
src = fetchFromGitHub {
owner = "SChernykh";
repo = "p2pool";
rev = "v${version}";
sha256 = "sha256-nqJ0F99QjrpwXHRPxZ7kLCYA9VJWGH2ahcr/MBQrhyY=";
sha256 = "sha256-lJJZ0ZsPTPEaYyzi8chAPo1OlZQ6p9QVqwtSOyJD7W4=";
fetchSubmodules = true;
};

@ -1,17 +1,22 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, git }:
buildGoPackage {
buildGoModule rec {
pname = "git-codereview";
version = "2020-01-15";
goPackagePath = "golang.org/x/review";
version = "1.0.3";
src = fetchFromGitHub {
owner = "golang";
repo = "review";
rev = "f51a73253c4da005cfdf18a036e11185c04c8ce3";
sha256 = "0c4vsyy5zp7pngqn4q87xipndghxyw2x57dkv1kxnrffckx1s3pc";
rev = "v${version}";
sha256 = "sha256-Hyo2UWGlxxeSz3E73DeA0VoOnBJ1VedvpshnATJGbFo=";
};
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
ldflags = [ "-s" "-w" ];
checkInputs = [ git ];
meta = with lib; {
description = "Manage the code review process for Git changes using a Gerrit server";
homepage = "https://golang.org/x/review/git-codereview";

@ -1,13 +1,26 @@
{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }:
{ lib, stdenv
, fetchgit
, wrapGAppsHook
, cairo
, glib
, gnome
, gst_all_1
, gtk3
, intltool
, libtool
, pkg-config
, which
, xorg
}:
stdenv.mkDerivation {
version = "0.2.3.alpha";
pname = "byzanz";
version = "unstable-2016-03-12";
src = fetchgit {
url = "https://gitlab.gnome.org/Archive/byzanz";
rev = "1875a7f6a3903b83f6b1d666965800f47db9286a";
sha256 = "0a72fw2mxl8vdcdnzy0bwis4jk28pd7nc8qgr4vhyw5pd48dynvh";
rev = "81235d235d12c9687897f7fc6ec0de1feaed6623";
hash = "sha256-3DUwXCPBAmeCRlDkiPUgwNyBa6bCvC/TLguMCK3bo4E=";
};
patches = [ ./add-amflags.patch ];
@ -16,11 +29,31 @@ stdenv.mkDerivation {
./autogen.sh --prefix=$out
'';
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
NIX_CFLAGS_COMPILE = builtins.concatStringsSep " " [
"-Wno-error=deprecated-declarations"
"-Wno-error=incompatible-pointer-types"
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ which gnome.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ]
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]);
buildInputs = [
which
gnome.gnome-common
glib
intltool
libtool
cairo
gtk3
xorg.xwininfo
xorg.libXdamage
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-bad
gst-plugins-good
gst-plugins-ugly
gst-libav
wrapGAppsHook
]);
meta = with lib; {
description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser";

@ -32,6 +32,10 @@
"noannoyance@sindex.com",
"noannoyance@daase.net"
],
"somafm-internet-radio": [
"SomaFm-Radio@alireza6677.gmail.com",
"SomaFm-Radio@cajhne.gmail.com"
],
"transparent-window": [
"transparent-window@pbxqdown.github.com",
"transparentwindows.mdirshad07"
@ -79,6 +83,10 @@
"noannoyance@sindex.com",
"noannoyance@daase.net"
],
"somafm-internet-radio": [
"SomaFm-Radio@alireza6677.gmail.com",
"SomaFm-Radio@cajhne.gmail.com"
],
"fuzzy-clock": [
"fuzzy-clock@keepawayfromfire.co.uk",
"FuzzyClock@johngoetz"
@ -87,10 +95,6 @@
"panel-date-format@keiii.github.com",
"panel-date-format@atareao.es"
],
"fullscreen-hot-corner": [
"fullscreen-hot-corner@sorrow.about.alice.pm.me",
"fullscreen-hot-corner@richardblaha.cz"
],
"disable-unredirect-fullscreen-windows": [
"unredirect@vaina.lt",
"unredirect@aunetx"
@ -133,10 +137,6 @@
"fuzzy-clock@keepawayfromfire.co.uk",
"FuzzyClock@johngoetz"
],
"fullscreen-hot-corner": [
"fullscreen-hot-corner@sorrow.about.alice.pm.me",
"fullscreen-hot-corner@richardblaha.cz"
],
"disable-unredirect-fullscreen-windows": [
"unredirect@vaina.lt",
"unredirect@aunetx"
@ -167,10 +167,6 @@
"lockkeys@vaina.lt",
"lockkeys@fawtytoo"
],
"fullscreen-hot-corner": [
"fullscreen-hot-corner@sorrow.about.alice.pm.me",
"fullscreen-hot-corner@richardblaha.cz"
],
"wireguard-indicator": [
"wireguard-indicator@gregos.me",
"wireguard-indicator@atareao.es"

@ -9,9 +9,6 @@
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
"fullscreen-hot-corner@sorrow.about.alice.pm.me" = "fullscreen-hot-corner";
"fullscreen-hot-corner@richardblaha.cz" = "fullscreen-hot-corner-2";
"lockkeys@vaina.lt" = "lock-keys";
"lockkeys@fawtytoo" = "lock-keys-2";
@ -57,6 +54,9 @@
"noannoyance@sindex.com" = "noannoyance";
"noannoyance@daase.net" = "noannoyance-2";
"SomaFm-Radio@alireza6677.gmail.com" = "somafm-internet-radio";
"SomaFm-Radio@cajhne.gmail.com" = "somafm-internet-radio-2";
"panel-date-format@keiii.github.com" = "panel-date-format";
"panel-date-format@atareao.es" = "panel-date-format-2";

File diff suppressed because one or more lines are too long

@ -42,6 +42,10 @@ let
version = "8.06.11";
sha256 = "1zjpg9jvs6i9jvbgn6zgispwqiv8rxvaszxcx9ha9fax3wzhv9qy";
};
"4.14" = mkNewParam {
version = "8.06.12";
sha256 = "sha256:17fmb13l18isgwr38hg9r5a0nayf2hhw6acj5153cy1sygsdg3b5";
};
};
param = params . ${lib.versions.majorMinor ocaml.version}
or (throw "labltk is not available for OCaml ${ocaml.version}");

@ -13,8 +13,6 @@ buildPecl rec {
internalDeps = [
php.extensions.session
] ++ lib.optionals (lib.versionOlder php.version "7.4") [
php.extensions.hash
];
configureFlags = [

@ -9,7 +9,6 @@ buildPecl {
sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg=";
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];
internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];
meta = with lib; {
changelog = "https://pecl.php.net/package/openswoole/${version}";

@ -10,8 +10,6 @@ buildPecl {
session
] ++ lib.optionals (lib.versionOlder php.version "8.0") [
json
] ++ lib.optionals (lib.versionOlder php.version "7.4") [
hash
];
meta = with lib; {

@ -22,8 +22,6 @@ buildPecl rec {
internalDeps = with php.extensions; [
session
] ++ lib.optionals (lib.versionOlder php.version "7.4") [
hash
];
patches = [

@ -7,7 +7,6 @@ buildPecl {
sha256 = "sha256-SnhDRC7/a7BTHn87c6YCz/R8jI6aES1ibSD6YAl6R+I=";
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];
internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];
doCheck = true;
checkTarget = "tests";

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "browser-cookie3";
version = "0.14.0";
version = "0.14.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-kWYMl/JZxonLfT0u/13bXz0MlC36jssWWq/i05FDpOA=";
hash = "sha256-2cMWFyHK+7M99Z9O7PiKue37c5XVBe/n88AF5ax7A2s=";
};
propagatedBuildInputs = [

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "1.7.4";
version = "1.7.5";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-aWl//usJk5BzYF7qyX9SS8yrrgQmV1eldcf8kjCHqmU=";
hash = "sha256-STdcYwmB3UBF2akuJwn81Edskfkn4CKEk+76Yl5wUTM=";
};
postPatch = ''

@ -10,6 +10,7 @@
, pythonOlder
, pytz
, six
, werkzeug
}:
buildPythonPackage rec {
@ -25,7 +26,7 @@ buildPythonPackage rec {
hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4=";
};
patches = [
patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [
./werkzeug-2.1.0-compat.patch
];

@ -5,7 +5,7 @@
, ninja
, pkg-config
, python3
, python
, pygobject3
, gobject-introspection
, gst-plugins-base
@ -32,7 +32,7 @@ buildPythonPackage rec {
meson
ninja
pkg-config
python3
python
gobject-introspection
gst-plugins-base
];
@ -43,7 +43,7 @@ buildPythonPackage rec {
];
mesonFlags = [
"-Dpygi-overrides-dir=${placeholder "out"}/${python3.sitePackages}/gi/overrides"
"-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides"
];
doCheck = true;

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "osmpythontools";
version = "0.3.3";
version = "0.3.4";
src = fetchFromGitHub {
owner = "mocnik-science";
repo = "osm-python-tools";
rev = "v.${version}";
sha256 = "sha256-335zo/kOX4OpUwHas2aaPibY6zNmDaaHJpolbTQWqKk=";
rev = "v${version}";
sha256 = "sha256-7r42b/B9h7cMgM+wFS0Fink/3WjUNvz+PwLn3C5hawc=";
};
propagatedBuildInputs = [
@ -54,6 +54,7 @@ buildPythonPackage rec {
'';
homepage = "https://github.com/mocnik-science/osm-python-tools";
license = licenses.gpl3Only;
changelog = "https://raw.githubusercontent.com/mocnik-science/osm-python-tools/v${version}/version-history.md";
maintainers = with maintainers; [ das-g ];
};
}

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.85";
version = "2.1.87";
format = "flit";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ABRidGtJikMIHItT21MJdiIqpA26IUN1aFMNyRVKyDA=";
hash = "sha256-LPOHpylnWxwEdPT3oJjbn8NkTY9tE/pMyGE8Dy7nwrU=";
};
nativeBuildInputs = [

@ -11,14 +11,16 @@
buildPythonPackage rec {
pname = "proxmoxer";
version = "1.3.0";
disabled = pythonOlder "3.6";
version = "1.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-3EpId20WVVjXA/wxwy1peyHPcXdiT3fprABkcNBpZtE=";
rev = "refs/tags/${version}";
hash = "sha256-FY0JLDBoKmh85VoKh3UuPPRbMAIjs3l/fZM4owniH1c=";
};
propagatedBuildInputs = [
@ -32,9 +34,14 @@ buildPythonPackage rec {
pytestCheckHook
];
# Tests require openssh_wrapper which is outdated and not available
pytestFlagsArray = [ "tests/paramiko_tests.py" ];
pythonImportsCheck = [ "proxmoxer" ];
pytestFlagsArray = [
# Tests require openssh_wrapper which is outdated and not available
"tests/paramiko_tests.py"
];
pythonImportsCheck = [
"proxmoxer"
];
meta = with lib; {
description = "Python wrapper for Proxmox API v2";

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "puremagic";
version = "1.13";
version = "1.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-yaHw/pOqWLUtYoM3l/JB0JToLXdi04n0BSccRdbCVDw=";
sha256 = "sha256-PV3ybMfsmuu/hCoJEVovqF3FnqZBT6VoVyxEd115bLw=";
};
# test data not included on pypi

@ -1,14 +1,10 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python3Packages
, pkgs
, fetchzip
, mouseinfo
, pygetwindow
, pymsgbox
, pyperclip
, pyrect
, pyscreeze
, pytweening
, tkinter

@ -2,17 +2,21 @@
, buildPythonPackage
, fetchPypi
, matchpy
, pytools
, pytestCheckHook
, pythonOlder
, pytools
}:
buildPythonPackage rec {
pname = "pymbolic";
version = "2022.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-tS9FHdC5gD4D3jMgrzt85XIwcAYcbSMcACFvbaQlkBI=";
hash = "sha256-tS9FHdC5gD4D3jMgrzt85XIwcAYcbSMcACFvbaQlkBI=";
};
propagatedBuildInputs = [
@ -24,10 +28,20 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
# pytest is a test requirement not a run-time one
substituteInPlace setup.py \
--replace '"pytest>=2.3",' ""
'';
pythonImportsCheck = [
"pymbolic"
];
meta = with lib; {
description = "A package for symbolic computation";
homepage = "https://documen.tician.de/pymbolic/";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pydicom";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM=";
hash = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM=";
};
propagatedBuildInputs = [
@ -41,6 +41,7 @@ buildPythonPackage rec {
"TestEchoSCP"
"TestEchoSCPCLI"
"TestEventHandlingAcceptor"
"TestEventHandlingRequestor"
"TestFindSCP"
"TestFindSCPCLI"
"TestGetSCP"

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyrogram";
version = "2.0.19";
version = "2.0.23";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pyrogram";
repo = "pyrogram";
rev = "v${version}";
hash = "sha256-HcUawiKlPS0zqB5kEScfV82xnLG0n62owzK5upOLn4I=";
hash = "sha256-+qJfqC6jLfrPwXl6zR7b21jY/s9leWeBxVgMa1IDRg4=";
};
propagatedBuildInputs = [

@ -1,5 +1,4 @@
{ buildPythonPackage
, python3
, lib
, fetchFromGitHub
, cmake

@ -5,7 +5,8 @@
, glib
, vips
, cffi
, pkgconfig
, pkgconfig # from pythonPackages
, pkg-config # from pkgs
, lib }:
buildPythonPackage rec {
@ -19,7 +20,7 @@ buildPythonPackage rec {
sha256 = "sha256-qMVoVzqXALhPWVKLzu+VqihHPN7J+pMhKnXdb+ow0zw=";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig pkg-config ];
buildInputs = [ glib vips ];

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, fetchPypi
, flit
, jinja2
, ruamel-yaml
, matplotlib
, pandas
, pandoc
, pygments
, blessings
, curio
, hypothesis
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "reportengine";
version = "0.30.dev0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "eb612994b7f364e872301b4569b544648e95e587d803284ddb5610efc8f2170f";
};
nativeBuildInputs = [ flit ];
propagatedBuildInputs = [
jinja2
ruamel-yaml
matplotlib
pandas
pygments
blessings
curio
];
checkInputs = [
hypothesis
pandoc
pytestCheckHook
];
pythonImportsCheck = [ "reportengine" ];
meta = with lib; {
description = "A framework for declarative data analysis";
homepage = "https://github.com/NNPDF/reportengine/";
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ veprbl ];
};
}

@ -24,7 +24,7 @@
, hacking
, oslotest
, bash
, python3
, python
}:
buildPythonApplication rec {
@ -76,8 +76,8 @@ buildPythonApplication rec {
# Tests expect these applications available as such.
mkdir -p bin
export PATH="$PWD/bin:$PATH"
printf '#!${bash}/bin/bash\nexec ${python3.interpreter} -m tempest.cmd.main "$@"\n' > bin/tempest
printf '#!${bash}/bin/bash\nexec ${python3.interpreter} -m tempest.cmd.subunit_describe_calls "$@"\n' > bin/subunit-describe-calls
printf '#!${bash}/bin/bash\nexec ${python.interpreter} -m tempest.cmd.main "$@"\n' > bin/tempest
printf '#!${bash}/bin/bash\nexec ${python.interpreter} -m tempest.cmd.subunit_describe_calls "$@"\n' > bin/subunit-describe-calls
chmod +x bin/*
stestr --test-path tempest/tests run -e <(echo "

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, pytestCheckHook
, responses
}:
buildPythonPackage rec {
pname = "tesla-powerwall";
version = "0.3.17";
format = "setuptools";
src = fetchPypi {
pname = "tesla_powerwall";
inherit version;
sha256 = "09351e408e8e3cc03414944c1a487ef2178300829559e80835026acb84330cfd";
};
propagatedBuildInputs = [
requests
];
checkInputs = [
pytestCheckHook
responses
];
pytestFlagsArray = [
"tests/unit"
];
pythonImportsCheck = [ "tesla_powerwall" ];
meta = {
description = "API for Tesla Powerwall";
homepage = "https://github.com/jrester/tesla_powerwall";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

@ -1,13 +1,18 @@
{ lib
, python3Packages
, buildPythonPackage
, fetchFromGitHub
, asgineer
, itemdb
, jinja2
, markdown
, pscript
, pyjwt
, uvicorn
, pytestCheckHook
, requests
, pytest
, pythonOlder
}:
python3Packages.buildPythonPackage rec {
buildPythonPackage rec {
pname = "timetagger";
version = "22.4.2";
@ -18,7 +23,7 @@ python3Packages.buildPythonPackage rec {
sha256 = "sha256-CWY+5O4Y1dvKQNy1Cclqj4+U6q5vVVj9hZq41MYqXKs=";
};
propagatedBuildInputs = with python3Packages; [
propagatedBuildInputs = [
asgineer
itemdb
jinja2
@ -35,12 +40,8 @@ python3Packages.buildPythonPackage rec {
checkInputs = [
pytestCheckHook
requests
pytest
];
# fails with `No module named pytest` on python version 3.10
doCheck = pythonOlder "3.10";
meta = with lib; {
homepage = "https://timetagger.app";
license = licenses.gpl3Only;

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, construct
, websockets
, asynctest
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "vallox-websocket-api";
version = "2.11.0";
disabled = pythonOlder "3.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "yozik04";
repo = "vallox_websocket_api";
rev = version;
hash = "sha256-wZiPrPl9ESp43PFdRPvqB2nOg+ogfaArunZOR3Q9cvs=";
};
propagatedBuildInputs = [
construct
websockets
];
checkInputs = [
asynctest
pytestCheckHook
];
meta = {
description = "Async API for Vallox ventilation units";
homepage = "https://github.com/yozik04/vallox_websocket_api";
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

@ -1,62 +0,0 @@
{ lib, stdenv, buildPythonPackage, fetchPypi
, itsdangerous, hypothesis
, pytestCheckHook, requests
, pytest-timeout
, isPy3k
}:
buildPythonPackage rec {
pname = "Werkzeug";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
};
propagatedBuildInputs = [ itsdangerous ];
checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ];
postPatch = ''
# ResourceWarning causes tests to fail
rm tests/test_routing.py
'';
disabledTests = [
"test_save_to_pathlib_dst"
"test_cookie_maxsize"
"test_cookie_samesite_attribute"
"test_cookie_samesite_invalid"
"test_range_parsing"
"test_content_range_parsing"
"test_http_date_lt_1000"
"test_best_match_works"
"test_date_to_unix"
"test_easteregg"
# Seems to be a problematic test-case:
#
# > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg))
# E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]>
# E
# E Traceback (most recent call last):
# E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers
# E return Headers(result)
# E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True>
"test_basic_routing"
"test_merge_slashes_match"
"test_merge_slashes_build"
"TestMultiPart"
"TestHTTPUtility"
] ++ lib.optionals stdenv.isDarwin [
"test_get_machine_id"
];
meta = with lib; {
homepage = "https://palletsprojects.com/p/werkzeug/";
description = "A WSGI utility library for Python";
license = licenses.bsd3;
maintainers = [ ];
};
}

@ -63,6 +63,7 @@ let
electronLibPath = with lib; makeLibraryPath (
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ]
++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ]
++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ]
++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ]
++ optionals (versionAtLeast version "17.0.0") [ libglvnd ]
@ -95,9 +96,7 @@ let
$out/lib/electron/electron \
${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" }
wrapProgram $out/lib/electron/electron \
--prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
"''${gappsWrapperArgs[@]}"
wrapProgram $out/lib/electron/electron "''${gappsWrapperArgs[@]}"
'';
};

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "fheroes2";
version = "0.9.14";
version = "0.9.15";
src = fetchFromGitHub {
owner = "ihhub";
repo = "fheroes2";
rev = version;
sha256 = "sha256-M5sUEOKU7KSenAAE7dUI8algB5XsbQQ1s3sDflZLsiA=";
sha256 = "sha256-bT6asrre16NuavG7X28aHdEPeHdxMBdz2o2KCB+mrbg=";
};
buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];

@ -1,17 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub, fetchurl, nixosTests, postgresql, postgresqlTestHook }:
{ lib, buildGoModule, fetchFromGitHub
, nixosTests, postgresql, postgresqlTestHook }:
buildGoModule rec {
pname = "matrix-dendrite";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "dendrite";
rev = "v${version}";
sha256 = "sha256-w4un+TdFTzfVZltvo6ZAPQ3B9HJvnGlJW+LmZHuYk1M=";
sha256 = "sha256-MPWvBUI6Mqt3f5UY6lpTBwPpihW+QSNq1M3FnIff+mM=";
};
vendorSha256 = "sha256-AJ7Hn23aji/cXioDaOSyF8XD3Mr135DZf7KbUW1SoJ4=";
vendorSha256 = "sha256-OXy2xuwTLPNvBnVB6wj/YRW/XMiekjTubRRPVX9bxdQ=";
checkInputs = [
postgresqlTestHook
@ -31,8 +32,8 @@ buildGoModule rec {
};
meta = with lib; {
homepage = "https://matrix.org";
description = "Dendrite is a second-generation Matrix homeserver written in Go!";
homepage = "https://matrix-org.github.io/dendrite";
description = "A second-generation Matrix homeserver written in Go";
license = licenses.asl20;
maintainers = teams.matrix.members;
platforms = platforms.unix;

@ -2032,7 +2032,8 @@
poolsense
];
"powerwall" = ps: with ps; [
]; # missing inputs: tesla-powerwall
tesla-powerwall
];
"profiler" = ps: with ps; [
guppy3
objgraph
@ -2884,7 +2885,8 @@
"vacuum" = ps: with ps; [
];
"vallox" = ps: with ps; [
]; # missing inputs: vallox-websocket-api
vallox-websocket-api
];
"vasttrafik" = ps: with ps; [
]; # missing inputs: vtjp
"velbus" = ps: with ps; [
@ -3557,6 +3559,7 @@
"plugwise"
"point"
"poolsense"
"powerwall"
"profiler"
"prometheus"
"prosegur"
@ -3732,6 +3735,7 @@
"utility_meter"
"uvc"
"vacuum"
"vallox"
"velbus"
"venstar"
"vera"

@ -1,18 +1,20 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "consul_exporter";
version = "0.7.1";
goPackagePath = "github.com/prometheus/consul_exporter";
version = "0.8.0";
src = fetchFromGitHub {
owner = "prometheus";
repo = "consul_exporter";
rev = "v${version}";
sha256 = "16ibafcbpiplsh1awcvblzzf2cbr4baf8wiwpdpibgmcwwf9m5ya";
sha256 = "sha256-5odAKMWK2tDZ3a+bIVIdPgzxrW64hF8nNqItGO7sODI=";
};
vendorSha256 = "sha256-vbaiHeQRo9hsHa/10f4202xLe9mduELRJMCDFuyKlW0=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Prometheus exporter for Consul metrics";
homepage = "https://github.com/prometheus/consul_exporter";

@ -1,6 +1,5 @@
{ lib
, pkgs
, python3Packages
, python3
, fetchFromGitHub
, addr ? "127.0.0.1"
@ -13,24 +12,18 @@
# timetagger.
#
let
tt = python3Packages.timetagger;
in
python3Packages.buildPythonPackage rec {
pname = tt.name;
version = tt.version;
src = tt.src;
meta = tt.meta;
python3.pkgs.buildPythonApplication {
inherit (python3.pkgs.timetagger) pname version src meta;
propagatedBuildInputs = [ tt ]
++ (with python3Packages; [
setuptools
]);
propagatedBuildInputs = with python3.pkgs; [
setuptools
timetagger
];
format = "custom";
installPhase = ''
mkdir -p $out/bin
echo "#!${pkgs.python3}/bin/python3" >> $out/bin/timetagger
echo "#!${python3.interpreter}" >> $out/bin/timetagger
cat run.py >> $out/bin/timetagger
sed -Ei 's,0\.0\.0\.0:80,${addr}:${toString port},' $out/bin/timetagger
chmod +x $out/bin/timetagger

@ -65,7 +65,7 @@ in rec {
};
unifi7 = generic {
version = "7.1.61";
sha256 = "sha256-7Ac8BjlBLCslSU6IZK0EtheKz4CtH7tcmR8J2rUGYbs=";
version = "7.1.65";
sha256 = "sha256-ilC4L59rui8WBKkWrzTFuEePo6L3wLC27Z5/Ef0MX7k=";
};
}

@ -4,6 +4,7 @@
, zlib
, libX11
, libpng
, libjpeg
, gd
, freetype
}:
@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
libpng
gd
freetype
libjpeg
];
hardeningDisable = [ "format" ];
@ -43,6 +45,7 @@ stdenv.mkDerivation rec {
preBuild = ''
cd src
'';
makeFlags = [ "CC=cc" ];
preInstall = ''
mkdir -p "$out/bin"
@ -72,6 +75,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ pSub ];
homepage = "http://ploticus.sourceforge.net/";
platforms = with platforms; linux;
platforms = with platforms; linux ++ darwin;
};
}

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
version = "0.7.6";
version = "0.8.0";
src =
let
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
aarch64-darwin = "darwin_arm64";
};
sha256 = selectSystem {
x86_64-linux = "sha256-nsc8S63OUEo9db/hs9oA53Lk+amIsxB/O4TJCs4zdNw=";
aarch64-linux = "sha256-KttqYuF7xC88L49f7JKKr77FbKBihptoBIoemgFInm0=";
x86_64-darwin = "sha256-ov4CtiWsOU/AWfAo7x99RshW6+eU9lFD5ypo6MKyPM0=";
aarch64-darwin = "sha256-3E9fv8BSu7XXIwRmTrDECLNQKdoeUqitKbsTrXs+tTE=";
x86_64-linux = "sha256-cZ41+VwbTQ/X/A0+OL1ZVXVv3eu90H5kMLiHqyc3688=";
aarch64-linux = "sha256-2svJx3rp0swyuXz3WCLRvDTRkweLMVIKrgYekcG8LdE=";
x86_64-darwin = "sha256-zkSESscsapyoMlFdaTzmooOEjUTte8MDNIGVhy9knzc=";
aarch64-darwin = "sha256-A7KNhTWuLjNaO2GyldCDquRur0i5KoXl6GZYQIqt0cI=";
};
in
fetchzip {

@ -118,7 +118,11 @@ stdenv.mkDerivation {
python3 scripts/utils/import_languages.py --qt_path '${lib.getDev qttools}/bin'
'';
qmakeFlags = [ "USRPATH=$(out)" "ETCPATH=$(out)/etc" ];
qmakeFlags = [
"USRPATH=$(out)"
"ETCPATH=$(out)/etc"
"CONFIG-=debug" # https://github.com/mozilla-mobile/mozilla-vpn-client/pull/3539
];
qtWrapperArgs =
[ "--prefix" "PATH" ":" (lib.makeBinPath [ wireguard-tools ]) ];

@ -1,15 +1,37 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute2, ronn }:
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, fetchurl
stdenv.mkDerivation rec {
, buildPackages
, iproute2
, lzo
, openssl
, pkg-config
, ronn
, zlib
}:
let
pname = "zerotierone";
version = "1.8.4";
version = "1.8.9";
src = fetchFromGitHub {
owner = "zerotier";
repo = "ZeroTierOne";
rev = version;
sha256 = "sha256-aM0FkcrSd5dEJVdJryIGuyWNFwvKH0SBfOuy4dIMK4A=";
sha256 = "sha256-N1VqzjaFJRJiSG4qHqRy4Fs8TlkUqyDoq0/3JQdGwfA=";
};
in stdenv.mkDerivation {
inherit pname version src;
cargoDeps = rustPlatform.fetchCargoTarball {
src = "${src}/zeroidc";
name = "${pname}-${version}";
sha256 = "sha256-PDsJtz279P2IpgiL0T92IbcANeGSUnGKhEH1dj9VtbM=";
};
postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock";
preConfigure = ''
patchShebangs ./doc/build.sh
@ -20,9 +42,19 @@ stdenv.mkDerivation rec {
--replace 'armv5' 'armv6'
'';
nativeBuildInputs = [ ronn ];
buildInputs = [ openssl lzo zlib iproute2 ];
nativeBuildInputs = [
pkg-config
ronn
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
];
buildInputs = [
iproute2
lzo
openssl
zlib
];
enableParallelBuilding = true;
@ -30,18 +62,20 @@ stdenv.mkDerivation rec {
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkPhase = ''
runHook preCheck
./zerotier-selftest
runHook postCheck
'';
installPhase = ''
install -Dt "$out/bin/" zerotier-one
ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool
ln -s $out/bin/zerotier-one $out/bin/zerotier-cli
installFlags = [ "DESTDIR=$$out/upstream" ];
postInstall = ''
mv $out/upstream/usr/sbin $out/bin
mkdir -p $man/share
mv $out/upstream/usr/share/man $man/share/man
mkdir -p $man/share/man/man8
for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do
cat doc/$cmd | gzip -9n > $man/share/man/man8/$cmd.gz
done
rm -rf $out/upstream
'';
outputs = [ "out" "man" ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "hashdeep";
@ -11,6 +11,17 @@ stdenv.mkDerivation rec {
sha256 = "0m2b042ndikavmplv3qjdhfj44hl1h8car83c192xi9nv5ahi7mf";
};
patches = [
(fetchpatch {
# Relevant link: <https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1512>
# Defect report fixed in GCC 11
# Search for "DR 1512" in <https://gcc.gnu.org/gcc-11/changes.html>
name = "fix-cpp-defect-report-1512.patch";
url = "https://github.com/jessek/hashdeep/commit/6ef69a26126ee4e69a25392fd456b8a66c51dffd.patch";
sha256 = "sha256-IrqcnrKINeoh56FR25FzSM1YJMkM2yFd/GwOeWGRLFo=";
})
];
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {

@ -1,17 +1,20 @@
{ lib, stdenv, fetchurl, bison, flex }:
{ lib
, stdenv
, fetchurl
, bison
, flex
}:
stdenv.mkDerivation rec {
pname = "acpica-tools";
version = "20211217";
version = "20220331";
src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
sha256 = "14jrrdrl3sw438791zf2v6rjvhiq78yl7hz2ldzp83c251cgh495";
hash = "sha256-rK/2ixTx4IBOu/xLlyaKTMvvz6BTsC7Zkk8rFNipjiE=";
};
NIX_CFLAGS_COMPILE = "-O3";
enableParallelBuilding = true;
nativeBuildInputs = [ bison flex ];
buildFlags = [
"acpibin"
@ -24,7 +27,9 @@ stdenv.mkDerivation rec {
"iasl"
];
nativeBuildInputs = [ bison flex ];
NIX_CFLAGS_COMPILE = "-O3";
enableParallelBuilding = true;
# We can handle stripping ourselves.
INSTALLFLAGS = "-m 555";
@ -32,10 +37,10 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; {
description = "ACPICA Tools";
homepage = "https://www.acpica.org/";
description = "ACPICA Tools";
license = with licenses; [ iasl gpl2Only bsd3 ];
platforms = platforms.linux;
maintainers = with maintainers; [ tadfisher ];
platforms = platforms.linux;
};
}

@ -1,24 +1,24 @@
{ buildGoPackage, lib, fetchFromGitHub }:
{ buildGoModule, lib, fetchFromGitHub }:
buildGoPackage rec {
version = "2.3.0";
buildGoModule rec {
pname = "xurls";
version = "2.4.0";
src = fetchFromGitHub {
owner = "mvdan";
repo = "xurls";
rev = "v${version}";
sha256 = "sha256-+oWYW7ZigkNS6VADNmVwarIsYyd730RAdDwnNIAYvlA=";
sha256 = "sha256-lyDcwbdVKyFRfsYCcPAgIgvrEEdwK0lxmJTvMJcFBCw=";
};
goPackagePath = "mvdan.cc/xurls/v2";
subPackages = [ "cmd/xurls" ];
vendorSha256 = "sha256-lJzgJxW/GW3J09uKQGoEX+UsHnB1pGG71U/zy4b9rXo=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Extract urls from text";
homepage = "https://github.com/mvdan/xurls";
maintainers = with maintainers; [ koral ];
platforms = platforms.unix;
license = licenses.bsd3;
};
}

@ -8984,6 +8984,8 @@ in {
repocheck = callPackage ../development/python-modules/repocheck { };
reportengine = callPackage ../development/python-modules/reportengine { };
reportlab = callPackage ../development/python-modules/reportlab { };
repoze_lru = callPackage ../development/python-modules/repoze_lru { };
@ -10193,6 +10195,8 @@ in {
tern = callPackage ../development/python-modules/tern { };
tesla-powerwall = callPackage ../development/python-modules/tesla-powerwall { };
tesla-wall-connector = callPackage ../development/python-modules/tesla-wall-connector { };
teslajsonpy = callPackage ../development/python-modules/teslajsonpy { };
@ -10772,6 +10776,8 @@ in {
validobj = callPackage ../development/python-modules/validobj { };
vallox-websocket-api = callPackage ../development/python-modules/vallox-websocket-api { };
variants = callPackage ../development/python-modules/variants { };
varint = callPackage ../development/python-modules/varint { };

Loading…
Cancel
Save