Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit 485bd9c640
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      nixos/modules/virtualisation/anbox.nix
  2. 6
      pkgs/applications/editors/scite/default.nix
  3. 67
      pkgs/applications/emulators/bsnes/ares/default.nix
  4. 22
      pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch
  5. 24
      pkgs/applications/emulators/dgen-sdl/default.nix
  6. 4
      pkgs/applications/misc/mepo/default.nix
  7. 40
      pkgs/applications/misc/phwmon/default.nix
  8. 18
      pkgs/applications/misc/xca/default.nix
  9. 31
      pkgs/applications/networking/browsers/palemoon/default.nix
  10. 2
      pkgs/applications/networking/browsers/palemoon/mozconfig
  11. 4
      pkgs/applications/networking/instant-messengers/cinny/default.nix
  12. 4
      pkgs/applications/networking/instant-messengers/profanity/default.nix
  13. 136
      pkgs/applications/networking/n8n/node-packages.nix
  14. 19
      pkgs/applications/office/ledger/default.nix
  15. 20
      pkgs/applications/office/teapot/default.nix
  16. 31
      pkgs/applications/science/electronics/nanovna-saver/default.nix
  17. 6
      pkgs/applications/science/math/wolfram-engine/default.nix
  18. 7
      pkgs/applications/terminal-emulators/eterm/default.nix
  19. 21
      pkgs/applications/version-management/fnc/default.nix
  20. 6
      pkgs/applications/version-management/git-and-tools/gh/default.nix
  21. 2
      pkgs/development/interpreters/python/mk-python-derivation.nix
  22. 18
      pkgs/development/interpreters/yex-lang/default.nix
  23. 25
      pkgs/development/libraries/libast/default.nix
  24. 4
      pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
  25. 36
      pkgs/development/python-modules/gidgethub/default.nix
  26. 46
      pkgs/development/python-modules/github3_py/default.nix
  27. 4
      pkgs/development/python-modules/jenkinsapi/default.nix
  28. 4
      pkgs/development/tools/analysis/checkov/default.nix
  29. 17
      pkgs/development/tools/open-policy-agent/default.nix
  30. 6
      pkgs/development/tools/snazy/default.nix
  31. 4
      pkgs/development/web/flyctl/default.nix
  32. 42
      pkgs/os-specific/linux/anbox/kmod.nix
  33. 13
      pkgs/os-specific/linux/directvnc/default.nix
  34. 1
      pkgs/servers/dict/default.nix
  35. 6
      pkgs/servers/prowlarr/default.nix
  36. 6
      pkgs/servers/radarr/default.nix
  37. 6
      pkgs/servers/unpackerr/default.nix
  38. 10
      pkgs/tools/filesystems/rdfind/default.nix
  39. 6
      pkgs/tools/security/melt/default.nix
  40. 30
      pkgs/tools/security/scorecard/default.nix
  41. 15
      pkgs/tools/wayland/wdomirror/configure-bounds.patch
  42. 9
      pkgs/tools/wayland/wdomirror/default.nix
  43. 2
      pkgs/top-level/aliases.nix
  44. 2
      pkgs/top-level/all-packages.nix
  45. 2
      pkgs/top-level/linux-kernels.nix
  46. 4
      pkgs/top-level/perl-packages.nix

@ -73,9 +73,6 @@ in
environment.systemPackages = with pkgs; [ anbox ];
boot.kernelModules = [ "ashmem_linux" "binder_linux" ];
boot.extraModulePackages = [ kernelPackages.anbox ];
services.udev.extraRules = ''
KERNEL=="ashmem", NAME="%k", MODE="0666"
KERNEL=="binder*", NAME="%k", MODE="0666"

@ -2,11 +2,11 @@
stdenv.mkDerivation {
pname = "scite";
version = "5.0.2";
version = "5.2.2";
src = fetchurl {
url = "https://www.scintilla.org/scite502.tgz";
sha256 = "00n2gr915f7kvp2250dzn6n0p6lhr6qdlm1m7y2xi6qrrky0bpan";
url = "https://www.scintilla.org/scite522.tgz";
sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd";
};
nativeBuildInputs = [ pkg-config ];

@ -2,83 +2,72 @@
, stdenv
, fetchFromGitHub
, pkg-config
, SDL2
, alsa-lib
, gtk3
, gtksourceview3
, libGL
, libGLU
, libX11
, libXv
, openal
, libpulseaudio
, libao
, libpulseaudio
, openal
, udev
, SDL2
}:
stdenv.mkDerivation rec {
pname = "ares";
version = "126";
version = "127";
src = fetchFromGitHub {
owner = "ares-emulator";
repo = "ares";
rev = "v${version}";
sha256 = "1rj4vmz8lvpmfc6wni7222kagnw9f6jda9rcb6qky2kpizlp2d24";
};
parallel-rdp = fetchFromGitHub {
owner = "Themaister";
repo = "parallel-rdp-standalone";
rev = "0dcebe11ee79288441e40e145c8f340d81f52316";
sha256 = "1avp4wyfkhk5yfjqx5w3jbqghn2mq5la7k9248kjmnp9n9lip6w9";
sha256 = "0rhq39w41j9yr1fkyfmf4n6fjxnq1cglj98rp4wys12kwqv7smvx";
};
patches = [
./dont-rebuild-on-install.patch
./fix-ruby.patch
];
enableParallelBuilding = true;
dontConfigure = true;
nativeBuildInputs = [
pkg-config
];
buildInputs = [
SDL2
alsa-lib
gtk3
gtksourceview3
libGL
libGLU
libX11
libXv
openal
libpulseaudio
libao
libpulseaudio
openal
udev
SDL2
];
buildPhase = ''
runHook preBuild
rm -rf ares/n64/vulkan/parallel-rdp
ln -sf ${parallel-rdp} ares/n64/vulkan/parallel-rdp
make -C desktop-ui -j $NIX_BUILD_CORES openmp=true vulkan=true local=false hiro=gtk3
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/{applications,ares,pixmaps}}
cp desktop-ui/out/ares $out/bin
cp desktop-ui/resource/ares.desktop $out/share/applications
cp desktop-ui/resource/{ares{.ico,.png},font.png} $out/share/pixmaps
cp -r ares/{Shaders,System} $out/share/ares
enableParallelBuilding = true;
runHook postInstall
'';
makeFlags = [
"-C desktop-ui"
"local=false"
"openmp=true"
"hiro=gtk3"
"prefix=$(out)"
];
meta = with lib; {
homepage = "https://ares.dev";
description = "Open-source multi-system emulator with a focus on accuracy and preservation";
license = licenses.isc;
maintainers = with maintainers; [ Madouura ];
platforms = platforms.all;
platforms = platforms.linux;
};
}
# TODO: select between Qt, GTK2 and GTK3
# TODO: support Darwin

@ -0,0 +1,22 @@
From 65cc7647110edd768e7baa7991143014316e655a Mon Sep 17 00:00:00 2001
From: Madoura <93990818+Madouura@users.noreply.github.com>
Date: Mon, 9 May 2022 10:17:06 -0500
Subject: [PATCH] Update GNUmakefile
---
desktop-ui/GNUmakefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile
index 8e27b11d3..0bee561fb 100644
--- a/desktop-ui/GNUmakefile
+++ b/desktop-ui/GNUmakefile
@@ -106,7 +106,7 @@ endif
$(call rdelete,$(object.path))
$(call rdelete,$(output.path))
-install: all
+install:
ifeq ($(platform),windows)
$(call mkdir,$(prefix)/$(name)/)
else ifeq ($(shell id -un),root)

@ -1,39 +1,41 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, libarchive
, SDL
}:
let
stdenv.mkDerivation rec {
pname = "dgen-sdl";
version = "1.33";
in stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://sourceforge.net/projects/dgen/files/dgen/${version}/${pname}-${version}.tar.gz";
hash = "sha256-meLAYBfCKHPHf4gYbrzAmGckTrbgQsdjuwlLArje9h4=";
};
buildInputs = [ SDL libarchive ];
buildInputs = [
SDL
libarchive
];
configureFlags = [
"--enable-joystick"
"--enable-debugger"
"--enable-debug-vdp"
"--enable-debugger"
"--enable-joystick"
"--enable-pico" # experimental
"--enable-vgmdump"
"--with-star=no" # Needs ASM support
"--with-musa"
"--with-cyclone=no" # Needs ASM support
"--with-mz80"
"--with-cz80"
"--with-drz80=no" # Needs ASM support
"--with-dz80"
"--with-musa"
"--with-mz80"
"--with-star=no" # Needs ASM support
];
meta = with lib; {
homepage = "https://dgen.sourceforge.net/";
homepage = "http://dgen.sourceforge.net/";
description = "Sega Genesis/Mega Drive emulator";
longDescription = ''
DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive

@ -22,13 +22,13 @@ let
menuInputs = if withX11 then [ dmenu xdotool ] else [ bemenu ];
in stdenv.mkDerivation rec {
pname = "mepo";
version = "0.4.1";
version = "0.4.2";
src = fetchFromSourcehut {
owner = "~mil";
repo = pname;
rev = version;
hash = "sha256-soIAQgo8Cyii/zzJapgJmC5hN/ySnHKoSbOg/XgTnGg=";
hash = "sha256-k6YXaqB3EwbDPlTvijZf10q+IYwt4/MiqGXL495KIcY=";
};
nativeBuildInputs = [ pkg-config zig makeWrapper ];

@ -1,40 +0,0 @@
{ lib, stdenv, fetchFromGitLab, python2Packages }:
stdenv.mkDerivation {
pname = "phwmon";
version = "2017-04-10";
src = fetchFromGitLab {
owner = "o9000";
repo = "phwmon";
rev = "b162e53dccc4adf8f11f49408d05fd85d9c6c909";
sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq";
};
nativeBuildInputs = [ python2Packages.wrapPython ];
buildInputs = [ python2Packages.pygtk python2Packages.psutil ];
pythonPath = [ python2Packages.pygtk python2Packages.psutil ];
postPatch = ''
substituteInPlace install.sh --replace "/usr/local" "$out"
'';
installPhase = ''
mkdir -p $out/bin $out/share/applications
./install.sh
'';
postFixup = ''
wrapPythonPrograms
'';
meta = {
homepage = "https://gitlab.com/o9000/phwmon";
description = "Hardware monitor (CPU, memory, network and disk I/O) for the system tray";
license = lib.licenses.gpl2;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.romildo ];
};
}

@ -1,25 +1,23 @@
{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkg-config
, libtool, openssl, qtbase, qttools }:
{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config
, libtool, openssl, qtbase, qttools, sphinx }:
mkDerivation rec {
pname = "xca";
version = "2.2.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "chris2511";
repo = "xca";
rev = "RELEASE.${version}";
sha256 = "0na2816lkfkkvssh9kmf5vwy6x8kd4x7h138jzy61wrvs69vhnbi";
sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk";
};
postPatch = ''
substituteInPlace doc/code2html \
--replace /usr/bin/perl ${perl}/bin/perl
'';
buildInputs = [ libtool openssl qtbase ];
nativeBuildInputs = [ autoreconfHook pkg-config qttools ];
nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ];
# Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710)
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
enableParallelBuilding = true;

@ -6,7 +6,7 @@
, dbus
, dbus-glib
, desktop-file-utils
, fetchzip
, fetchFromGitea
, ffmpeg
, fontconfig
, freetype
@ -39,19 +39,21 @@
# https://developer.palemoon.org/build/linux/
assert stdenv.cc.isGNU;
assert with lib.strings; (
versionAtLeast stdenv.cc.version "4.9"
&& !hasPrefix "6" stdenv.cc.version
&& versionOlder stdenv.cc.version "11"
versionAtLeast stdenv.cc.version "7.1"
&& versionOlder stdenv.cc.version "12"
);
stdenv.mkDerivation rec {
pname = "palemoon";
version = "29.4.6";
src = fetchzip {
name = "${pname}-${version}";
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
sha256 = "sha256-6bI3AnIhp0x3BCgTvmbOXDBGrJXg3cN+AmwI8XCKD8g=";
version = "31.0.0";
src = fetchFromGitea {
domain = "repo.palemoon.org";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
fetchSubmodules = true;
sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc=";
};
nativeBuildInputs = [
@ -139,14 +141,9 @@ stdenv.mkDerivation rec {
./mach install
# Fix missing icon due to wrong WMClass
# https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221
substituteInPlace ./palemoon/branding/official/palemoon.desktop \
--replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon'
# Install official branding stuff
desktop-file-install --dir=$out/share/applications \
./palemoon/branding/official/palemoon.desktop
# Install official branding icons
for iconname in default{16,22,24,32,48,256} mozicon128; do
n=''${iconname//[^0-9]/}
size=$n"x"$n
@ -155,7 +152,7 @@ stdenv.mkDerivation rec {
# Remove unneeded SDK data from installation
# https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729
rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}}
rm -r $out/{include,share/idl,lib/palemoon-devel-${version}}
runHook postInstall
'';

@ -20,8 +20,6 @@ ac_add_options --enable-strip
ac_add_options --enable-devtools
ac_add_options --enable-av1
ac_add_options --disable-eme
ac_add_options --disable-webrtc
ac_add_options --disable-gamepad
ac_add_options --disable-tests
ac_add_options --disable-debug

@ -4,11 +4,11 @@ let
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
in stdenv.mkDerivation rec {
pname = "cinny";
version = "1.8.2";
version = "2.0.0";
src = fetchurl {
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
sha256 = "sha256-0harFaO1MWzTmN/Q3e38MC2O7P9yVeQ5ZSy0yiGbtCs=";
sha256 = "sha256-tM3YA0GW8Z24gt8t9dOyr10GCINodAB0b4/gD7jfgOM=";
};
installPhase = ''

@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "profanity";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
rev = version;
hash = "sha256-kmixWp9Q2tMVp+tk5kbTdBfgRNghKk3+48L582hqlm8=";
hash = "sha256-yUiiww8yhymdqR6CITRnItxZhfpZiEbu1WyD8bDW+vc=";
};
patches = [

@ -463,6 +463,15 @@ let
sha512 = "L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ==";
};
};
"@types/generic-pool-3.1.10" = {
name = "_at_types_slash_generic-pool";
packageName = "@types/generic-pool";
version = "3.1.10";
src = fetchurl {
url = "https://registry.npmjs.org/@types/generic-pool/-/generic-pool-3.1.10.tgz";
sha512 = "WRT/9taXh9XJRA9yvrbC02IqGZhK9GbFE/vuP2LeSLrqmDzz5wdXsH0Ige/F+3+rbbZfwH3LEazDsU0JiSV3vA==";
};
};
"@types/json-diff-0.5.2" = {
name = "_at_types_slash_json-diff";
packageName = "@types/json-diff";
@ -589,13 +598,13 @@ let
sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==";
};
};
"@types/snowflake-sdk-1.6.3" = {
"@types/snowflake-sdk-1.6.4" = {
name = "_at_types_slash_snowflake-sdk";
packageName = "@types/snowflake-sdk";
version = "1.6.3";
version = "1.6.4";
src = fetchurl {
url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.3.tgz";
sha512 = "YGlCPN88p6WYQCjBDIXwe2aWPkWNzKPW5/XJOGGnaXIacqULfKO6puq2a4OU02WCzfWr+XvOEj1MKWnxBhm+jw==";
url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.4.tgz";
sha512 = "v3QjPbvd2dhyI5fPU5whxgUjhf9O19acIGiL65aUPCnkLIla5Z0ZqOiP3Jw5eyghunZHWohKfvtV+UdesCi29g==";
};
};
"@types/tough-cookie-2.3.8" = {
@ -976,13 +985,13 @@ let
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
};
};
"aws-sdk-2.1129.0" = {
"aws-sdk-2.1131.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1129.0";
version = "2.1131.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1129.0.tgz";
sha512 = "gQZaByfW7zKCg1n/kA+xDdLhI/SauaokRTq+lztK1cCCdFkR5CShcKeK/qUgVxjy43mwB7CkeTh1WUr2NMb0jg==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1131.0.tgz";
sha512 = "Ic3f2fSgVhYDQ0OBGxE6ODtSwaKyxBPGrI2RGrYt2Oj0Z8f227P7dB90o9X7y2MtnuJ4WoAzkf3Vc1c1UnnZlA==";
};
};
"aws-sign2-0.7.0" = {
@ -1804,13 +1813,13 @@ let
sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
};
};
"convict-6.2.2" = {
"convict-6.2.3" = {
name = "convict";
packageName = "convict";
version = "6.2.2";
version = "6.2.3";
src = fetchurl {
url = "https://registry.npmjs.org/convict/-/convict-6.2.2.tgz";
sha512 = "3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg==";
url = "https://registry.npmjs.org/convict/-/convict-6.2.3.tgz";
sha512 = "mTY04Qr7WrqiXifdeUYXr4/+Te4hPFWDvz6J2FVIKCLc2XBhq63VOSSYAKJ+unhZAYOAjmEdNswTOeHt7s++pQ==";
};
};
"cookie-0.4.1" = {
@ -1858,13 +1867,13 @@ let
sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
};
};
"core-js-3.22.4" = {
"core-js-3.22.5" = {
name = "core-js";
packageName = "core-js";
version = "3.22.4";
version = "3.22.5";
src = fetchurl {
url = "https://registry.npmjs.org/core-js/-/core-js-3.22.4.tgz";
sha512 = "1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w==";
url = "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz";
sha512 = "VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==";
};
};
"core-util-is-1.0.2" = {
@ -2344,13 +2353,13 @@ let
sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==";
};
};
"es-abstract-1.19.5" = {
"es-abstract-1.20.0" = {
name = "es-abstract";
packageName = "es-abstract";
version = "1.19.5";
version = "1.20.0";
src = fetchurl {
url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz";
sha512 = "Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==";
url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz";
sha512 = "URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==";
};
};
"es-to-primitive-1.2.1" = {
@ -2776,6 +2785,24 @@ let
sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
};
};
"function.prototype.name-1.1.5" = {
name = "function.prototype.name";
packageName = "function.prototype.name";
version = "1.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz";
sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==";
};
};
"functions-have-names-1.2.3" = {
name = "functions-have-names";
packageName = "functions-have-names";
version = "1.2.3";
src = fetchurl {
url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz";
sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==";
};
};
"gauge-3.0.2" = {
name = "gauge";
packageName = "gauge";
@ -3847,13 +3874,13 @@ let
sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA==";
};
};
"libphonenumber-js-1.9.52" = {
"libphonenumber-js-1.9.53" = {
name = "libphonenumber-js";
packageName = "libphonenumber-js";
version = "1.9.52";
version = "1.9.53";
src = fetchurl {
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.52.tgz";
sha512 = "8k83chc+zMj+J/RkaBxi0PpSTAdzHmpqzCMqquSJVRfbZFr8DCp6vPC7ms2PIPGxeqajZLI6CBLW5nLCJCJrYg==";
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.53.tgz";
sha512 = "3cuMrA2CY3TbKVC0wKye5dXYgxmVVi4g13gzotprQSguFHMqf0pIrMM2Z6ZtMsSWqvtIqi5TuQhGjMhxz0O9Mw==";
};
};
"libqp-1.1.0" = {
@ -4144,13 +4171,13 @@ let
sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==";
};
};
"luxon-2.3.2" = {
"luxon-2.4.0" = {
name = "luxon";
packageName = "luxon";
version = "2.3.2";
version = "2.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz";
sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw==";
url = "https://registry.npmjs.org/luxon/-/luxon-2.4.0.tgz";
sha512 = "w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA==";
};
};
"mailparser-3.5.0" = {
@ -4531,13 +4558,13 @@ let
sha512 = "Me8fk76HeWUmTPnksH4kzG0bKOp1yLFjAC4F+EcEllIIf+x75kjN+gSH4uwgvspzGCVO88ZnppWoGQwvHQpXQw==";
};
};
"n8n-nodes-base-0.173.0" = {
"n8n-nodes-base-0.174.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
version = "0.173.0";
version = "0.174.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.173.0.tgz";
sha512 = "9ya0cgRMk6iz01m2shZHahe4KurL89/T+iGLywrUZdPdIRni7LR4ywSG51B4jko73+zsKPNYjya650BGNz7TaQ==";
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.174.0.tgz";
sha512 = "2yYWeSkfI08BtgGZvOksmQOpjNPYmhvkqO2SBTuTAqkryZ1AHiw6RtILsf2575prQDdep2clxIZxW7owxxFmLA==";
};
};
"n8n-workflow-0.98.0" = {
@ -5791,6 +5818,15 @@ let
sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==";
};
};
"regexp.prototype.flags-1.4.3" = {
name = "regexp.prototype.flags";
packageName = "regexp.prototype.flags";
version = "1.4.3";
src = fetchurl {
url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz";
sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==";
};
};
"reinterval-1.1.0" = {
name = "reinterval";
packageName = "reinterval";
@ -6367,13 +6403,13 @@ let
sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==";
};
};
"sqlite3-5.0.7" = {
"sqlite3-5.0.8" = {
name = "sqlite3";
packageName = "sqlite3";
version = "5.0.7";
version = "5.0.8";
src = fetchurl {
url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.7.tgz";
sha512 = "9PUfvpol1/5SI3WZawFINwpRz6qhUeJJtFNG6rr0CvDWMXN75PJPv+3b0aVEOOx5rAZIPcXW2zVasH8foqw7Gg==";
url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.8.tgz";
sha512 = "f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ==";
};
};
"sqlstring-2.3.3" = {
@ -7534,10 +7570,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.175.1";
version = "0.176.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.175.1.tgz";
sha512 = "rInwNB6wxOs79EvC2HFALyDhdDPJwLVT+z1LivxLRD9dZOrtlMD9wdDfESpHYS5ikND4T5JW32HaxGF9nnzlJA==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.176.0.tgz";
sha512 = "eJTzCFcujAfJegWKQhGi+upAsfTEpW1/2HC5vwV2btdgm8XCMyhVBMJJR7ZJMozFNDz8ErLhwtlIfQCQSXRP0A==";
};
dependencies = [
(sources."@azure/abort-controller-1.1.0" // {
@ -7652,6 +7688,7 @@ in
sources."@types/express-serve-static-core-4.17.28"
sources."@types/express-unless-0.5.3"
sources."@types/ftp-0.3.33"
sources."@types/generic-pool-3.1.10"
sources."@types/json-diff-0.5.2"
sources."@types/jsonwebtoken-8.5.8"
sources."@types/lodash-4.14.182"
@ -7669,7 +7706,7 @@ in
sources."@types/range-parser-1.2.4"
sources."@types/readable-stream-2.3.13"
sources."@types/serve-static-1.13.10"
sources."@types/snowflake-sdk-1.6.3"
sources."@types/snowflake-sdk-1.6.4"
sources."@types/tough-cookie-2.3.8"
sources."@types/tunnel-0.0.3"
sources."@xmldom/xmldom-0.7.5"
@ -7725,7 +7762,7 @@ in
];
})
sources."avsc-5.7.4"
(sources."aws-sdk-2.1129.0" // {
(sources."aws-sdk-2.1131.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -7898,11 +7935,11 @@ in
})
sources."content-disposition-0.5.4"
sources."content-type-1.0.4"
sources."convict-6.2.2"
sources."convict-6.2.3"
sources."cookie-0.4.1"
sources."cookie-parser-1.4.6"
sources."cookie-signature-1.0.6"
sources."core-js-3.22.4"
sources."core-js-3.22.5"
sources."core-util-is-1.0.2"
sources."crc-32-1.2.2"
sources."cron-1.7.2"
@ -7966,7 +8003,7 @@ in
sources."entities-2.2.0"
sources."env-variable-0.0.6"
sources."err-code-2.0.3"
sources."es-abstract-1.19.5"
sources."es-abstract-1.20.0"
sources."es-to-primitive-1.2.1"
sources."es5-ext-0.8.2"
sources."escalade-3.1.1"
@ -8024,6 +8061,8 @@ in
sources."fs-minipass-2.1.0"
sources."fs.realpath-1.0.0"
sources."function-bind-1.1.1"
sources."function.prototype.name-1.1.5"
sources."functions-have-names-1.2.3"
sources."gauge-3.0.2"
sources."generate-function-2.3.1"
sources."generic-pool-3.8.2"
@ -8168,7 +8207,7 @@ in
sources."iconv-lite-0.6.3"
];
})
sources."libphonenumber-js-1.9.52"
sources."libphonenumber-js-1.9.53"
sources."libqp-1.1.0"
sources."limiter-1.1.5"
sources."linkify-it-4.0.0"
@ -8212,7 +8251,7 @@ in
sources."yallist-2.1.2"
];
})
sources."luxon-2.3.2"
sources."luxon-2.4.0"
(sources."mailparser-3.5.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
@ -8283,7 +8322,7 @@ in
sources."n8n-core-0.116.0"
sources."n8n-design-system-0.19.0"
sources."n8n-editor-ui-0.142.1"
(sources."n8n-nodes-base-0.173.0" // {
(sources."n8n-nodes-base-0.174.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
@ -8469,6 +8508,7 @@ in
sources."redis-parser-3.0.0"
sources."reflect-metadata-0.1.13"
sources."regenerator-runtime-0.13.9"
sources."regexp.prototype.flags-1.4.3"
sources."reinterval-1.1.0"
sources."remove-trailing-separator-1.1.0"
sources."remove-trailing-slash-0.1.1"
@ -8577,7 +8617,7 @@ in
];
})
sources."sprintf-js-1.1.2"
sources."sqlite3-5.0.7"
sources."sqlite3-5.0.8"
sources."sqlstring-2.3.3"
sources."sse-channel-3.1.1"
sources."ssf-0.11.2"

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3
, texinfo, gnused, usePython ? true }:
, fetchpatch, installShellFiles, texinfo, gnused, usePython ? true }:
stdenv.mkDerivation rec {
pname = "ledger";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
gmp mpfr libedit gnused
] ++ lib.optional usePython python3;
nativeBuildInputs = [ cmake texinfo ];
nativeBuildInputs = [ cmake texinfo installShellFiles ];
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
@ -34,8 +34,21 @@ stdenv.mkDerivation rec {
--replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python3.sitePackages}"'
'';
patches = [
# Add support for $XDG_CONFIG_HOME. Remove with the next release
(fetchpatch {
url = "https://github.com/ledger/ledger/commit/c79674649dee7577d6061e3d0776922257520fd0.patch";
sha256 = "sha256-vwVQnY9EUCXPzhDJ4PSOmQStb9eF6H0yAOiEmL6sAlk=";
excludes = [ "doc/NEWS.md" ];
})
];
installTargets = [ "doc" "install" ];
postInstall = ''
installShellCompletion --cmd ledger --bash $src/contrib/ledger-completion.bash
'';
meta = with lib; {
homepage = "https://ledger-cli.org/";
description = "A double-entry accounting system with a command-line reporting interface";
@ -49,6 +62,6 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.all;
maintainers = with maintainers; [ jwiegley ];
maintainers = with maintainers; [ jwiegley marsam ];
};
}

@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchzip
, fetchFromGitHub
, cmake
, libtirpc
, ncurses
@ -10,12 +10,18 @@ stdenv.mkDerivation rec {
pname = "teapot";
version = "2.3.0";
src = fetchzip {
src = fetchFromGitHub {
name = "${pname}-${version}";
url = "https://www.syntax-k.de/projekte/teapot/${pname}-${version}.tar.gz";
sha256 = "sha256-wzAwZwOMeTsuR5LhfjspGdejT6X1V8YJ8B7v9pcbxaY=";
owner = "museoa";
repo = pname;
rev = version;
hash = "sha256-38XFjRzOGasr030f+mRYT+ptlabpnVJfa+1s7ZAjS+k=";
};
prePatch = ''
cd src
'';
patches = [
# include a local file in order to make cc happy
./001-fix-warning.patch
@ -41,8 +47,8 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://www.syntax-k.de/projekte/teapot/";
description = "Table Editor And Planner, Or: Teapot!";
inherit (src.meta) homepage;
description = "Table Editor And Planner, Or: Teapot";
longDescription = ''
Teapot is a compact spreadsheet software originally written by Michael
Haardt. It features a (n)curses-based text terminal interface, and
@ -70,4 +76,4 @@ stdenv.mkDerivation rec {
};
}
# TODO: patch/fix FLTK building
# TODO: add documentation from
# TODO: add documentation

@ -1,36 +1,23 @@
{ lib
, python3
, fetchFromGitHub
, wrapQtAppsHook
{
lib,
python3,
fetchFromGitHub,
wrapQtAppsHook,
}:
let
python = python3.override {
packageOverrides = self: super: {
scipy = super.scipy.overridePythonAttrs (oldAttrs: rec {
version = "1.4.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "0ndw7zyxd2dj37775mc75zm4fcyiipnqxclc45mkpxy8lvrvpqfy";
};
doCheck = false;
});
};
};
in python.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "nanovna-saver";
version = "0.3.8";
version = "0.4.0";
src = fetchFromGitHub {
owner = "NanoVNA-Saver";
repo = pname;
rev = "v${version}";
sha256 = "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv";
sha256 = "1n1bh46spdyk7kgvv95hyfy9f904czhzlvk41vliqkak56hj2ss1";
};
nativeBuildInputs = [ wrapQtAppsHook ];
propagatedBuildInputs = with python.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
cython
scipy
pyqt5

@ -112,10 +112,14 @@ stdenv.mkDerivation rec {
# Fix library paths
cd $out/libexec/${dirName}/Executables
for path in MathKernel WolframKernel math mcc wolfram; do
for path in MathKernel math mcc wolfram; do
makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}"
done
for path in WolframKernel wolframscript; do
makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}"
done
# ... and xkeyboard config path for Qt
for path in WolframPlayer wolframplayer; do
makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path \

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "eterm";
version = "0.9.6-unstable=2020-03-03";
version = "0.9.6+date=2020-03-03";
src = fetchFromGitHub {
owner = "mej";
@ -43,7 +43,10 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
knownVulnerabilities = [
"Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)"
''Usage of ANSI escape sequences causes unexpected newline-termination,
leading to unexpected command execution. More info at:
- https://www.cve.org/CVERecord?id=CVE-2021-33477
- https://www.openwall.com/lists/oss-security/2021/05/17/1''
];
};
}

@ -2,22 +2,13 @@
stdenv.mkDerivation rec {
pname = "fnc";
version = "0.10";
version = "0.12";
src = fetchurl {
url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz";
sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk";
sha256 = "05cg8id4d1ia8y60y3x23167bl1rn2fdpkf1jfj3aklhlihvkbxd";
};
patches = [
(fetchpatch {
name = "sqlite3-upgrade.patch";
url = "https://fnc.bsdbox.org/vpatch?from=12e8919d436f52ca&to=091ce838edf67f1d";
sha256 = "sha256-uKSO+lCY6h7Wkv5T7zeagMbpDxj6oirA/bty6i6Py8s=";
})
];
patchFlags = [ "-p0" ];
buildInputs = [ libiconv ncurses zlib ];
makeFlags = [ "PREFIX=$(out)" ];
@ -26,14 +17,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
test "$($out/bin/fnc --version)" = '${pname} ${version}'
runHook postInstallCheck
'';
meta = with lib; {
description = "Interactive ncurses browser for Fossil repositories";
longDescription = ''

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.9.0";
version = "2.10.1";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-k8td9YKtlkit3YzpAncocZE7+Cl8v9ZNyPD4ZysCFRI=";
sha256 = "sha256-2lIHEO4+oW9+C7VSulmVwZJ1l6RYBbV6wlKMvdOGqi8=";
};
vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ=";
vendorSha256 = "sha256-EFJfd6sUK5iquFW0kXaiH6tLiNqbZNe9awpIqmqhp7I=";
nativeBuildInputs = [ installShellFiles ];

@ -176,8 +176,6 @@ let
# default to python's platforms
platforms = python.meta.platforms;
isBuildPythonPackage = python.meta.platforms;
} // lib.optionalAttrs (attrs?pname) {
mainProgram = attrs.pname;
} // meta;
} // lib.optionalAttrs (attrs?checkPhase) {
# If given use the specified checkPhase, otherwise use the setup hook.

@ -1,21 +1,25 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub }:
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "yex-lang";
version = "unstable-2021-12-25";
version = "0.pre+date=2022-05-10";
src = fetchFromGitHub {
owner = "nonamescm";
repo = "yex-lang";
rev = "a97def1431b73b8693700f530ec023f1776eaf83";
hash = "sha256-CEzJtlEVMvMnRyUKdko1UDTluv8Fc88tfOpKGIFMnRw=";
rev = "866c4decbb9340f5af687b145e2c4f47fcbee786";
hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k=";
};
cargoSha256 = "sha256-mHMenqcdt9Yjm/6H1Ywf637Sv8ddq6a4Eu2/A/jX9gQ=";
cargoSha256 = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI=";
meta = with lib; {
homepage = "https://github.com/nonamesc/yex-lang";
description = "A cool functional scripting language written in rust";
homepage = "https://github.com/nonamescm/yex-lang";
description = "A functional scripting language written in rust";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
mainProgram = "yex";

@ -1,20 +1,29 @@
{ lib, stdenv, fetchurl
, pkg-config }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "libast";
version = "0.7.1";
version = "0.8";
src = fetchurl {
url = "http://www.eterm.org/download/${pname}-${version}.tar.gz";
sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj";
src = fetchFromGitHub {
owner = "mej";
repo = pname;
rev = version;
hash = "sha256-rnqToFi+d6D6O+JDHQxkVjTc/0RBag6Jqv4uDcE4PNc=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
meta = with lib; {
inherit (src.meta) homepage;
description = "Library of Assorted Spiffy Things";
homepage = "https://www.eterm.org";
license = licenses.bsd2;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.unix;

@ -9,14 +9,14 @@
}:
buildPythonPackage rec {
version = "1.0.0";
version = "1.1.0";
pname = "azure-mgmt-redhatopenshift";
disabled = isPy27; # don't feel like fixing namespace issues on python2
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980";
sha256 = "sha256-Tq8h3fvajxIG2QjtCyHCQDE2deBDioxLLaQQek/O24U=";
};
propagatedBuildInputs = [

@ -2,21 +2,20 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, pytest-runner
, pytest
, pytest-asyncio
, twisted
, treq
, tornado
, aiohttp
, uritemplate
, pyjwt
, pytestCheckHook
, aiohttp
, httpx
, importlib-resources
, pytest-asyncio
, pytest-tornasync
}:
buildPythonPackage rec {
pname = "gidgethub";
version = "5.1.0";
format = "flit";
disabled = pythonOlder "3.6";
@ -25,20 +24,25 @@ buildPythonPackage rec {
sha256 = "sha256-kNGTb6mA2XBaljYvpOWaKFEks3NigsiPgmdIgSMKTiU=";
};
nativeBuildInputs = [ setuptools pytest-runner ];
checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ];
propagatedBuildInputs = [
uritemplate
pyjwt
];
postPatch = ''
substituteInPlace setup.py \
--replace "extras_require=extras_require," "extras_require=None,"
'';
checkInputs = [
pytestCheckHook
aiohttp
httpx
importlib-resources
pytest-asyncio
pytest-tornasync
];
# requires network (reqests github.com)
doCheck = false;
disabledTests = [
# Require internet connection
"test__request"
"test_get"
];
meta = with lib; {
description = "An async GitHub API library";

@ -1,41 +1,50 @@
{ lib
, pythonOlder
, buildPythonPackage
, pythonOlder
, fetchPypi
, betamax
, pytest
, betamax-matchers
, unittest2
, mock
, requests
, uritemplate
, python-dateutil
, jwcrypto
, pyopenssl
, ndg-httpsclient
, pyasn1
, pyjwt
, pytestCheckHook
, betamax
, betamax-matchers
}:
buildPythonPackage rec {
pname = "github3.py";
version = "3.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Cbcr4Ul9NGsJaM3oNgoNavedwgbQFJpjzT7IbGXDd8w=";
};
checkInputs = [ betamax pytest betamax-matchers ]
++ lib.optional (pythonOlder "3") unittest2
++ lib.optional (pythonOlder "3.3") mock;
propagatedBuildInputs = [ requests uritemplate python-dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ];
propagatedBuildInputs = [
requests
uritemplate
python-dateutil
pyjwt
];
postPatch = ''
sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py
checkInputs = [
pytestCheckHook
betamax
betamax-matchers
];
# Solves "__main__.py: error: unrecognized arguments: -nauto"
preCheck = ''
rm tox.ini
'';
# TODO: only disable the tests that require network
doCheck = false;
disabledTests = [
# FileNotFoundError: [Errno 2] No such file or directory: 'tests/id_rsa.pub'
"test_delete_key"
];
meta = with lib; {
homepage = "https://github3py.readthedocs.org/en/master/";
@ -43,5 +52,4 @@ buildPythonPackage rec {
license = licenses.bsd3;
maintainers = with maintainers; [ pSub ];
};
}

@ -1,5 +1,6 @@
{ lib, stdenv
, buildPythonPackage
, pythonAtLeast
, fetchPypi
, mock
, pytest
@ -13,6 +14,9 @@
buildPythonPackage rec {
pname = "jenkinsapi";
version = "0.3.11";
format = "setuptools";
disabled = pythonAtLeast "3.6";
src = fetchPypi {
inherit pname version;

@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.1118";
version = "2.0.1132";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-8zhCyIHI3Pl5fTqQGSe8l6+7DZQsI6YgyTSCs1BNe94=";
hash = "sha256-jy6a421lOfNGhxEuCOw+0JRD9RH7XJFP0dxhN0taKmk=";
};
nativeBuildInputs = with py.pkgs; [

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, installShellFiles
@ -6,15 +7,17 @@
, enableWasmEval ? false
}:
assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs";
buildGoModule rec {
pname = "open-policy-agent";
version = "0.38.1";
version = "0.40.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
sha256 = "sha256-x8mSlZ2X0DdkhaW5QXs5axERJkwARu8tHueQHXfamXM=";
sha256 = "sha256-rLfo2SUlxL6QFc2v+nxFnbyYcfy7i3OFhGt6ZAUteHY=";
};
vendorSha256 = null;
@ -35,12 +38,13 @@ buildGoModule rec {
# Feed in all but the e2e tests for testing
# This is because subPackages above limits what is built to just what we
# want but also limits the tests
# Also avoid wasm tests on darwin due to wasmtime-go build issues
getGoDirs() {
go list ./... | grep -v e2e
go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"}
}
# Remove test case that fails on < go1.17
rm test/cases/testdata/cryptox509parsecertificates/test-cryptox509parsecertificates-0123.yaml
'' + lib.optionalString stdenv.isDarwin ''
# resolve "too many open files" errors during the tests on darwin
ulimit -n 1024
'';
postInstall = ''
@ -66,6 +70,7 @@ buildGoModule rec {
'';
meta = with lib; {
mainProgram = "opa";
homepage = "https://www.openpolicyagent.org";
changelog = "https://github.com/open-policy-agent/opa/blob/v${version}/CHANGELOG.md";
description = "General-purpose policy engine";

@ -2,15 +2,15 @@
rustPlatform.buildRustPackage rec {
pname = "snazy";
version = "0.4.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "chmouel";
repo = pname;
rev = version;
sha256 = "sha256-Pv+vLdbMTbDbdUVQhA07WY+o1PwtCiqdAXCj+UlP/ZQ=";
sha256 = "sha256-SoyGvy1F39kvMLuT9QFXiGEpN0DWS3X9ZDZhFocymCw=";
};
cargoSha256 = "sha256-96xgpkkWHsyb3kxEXM5f5jFSjbO+VEmX2uHltGJUPGk=";
cargoSha256 = "sha256-vz2bXmuRWFCx7dH0u2zVJLurtUAQ51ZqWVAcuUrm6d8=";
doInstallCheck = true;
installCheckPhase = ''

@ -18,7 +18,7 @@ buildGoModule rec {
ldflags = [
"-s" "-w"
"-X github.com/superfly/flyctl/internal/buildinfo.commit=${src.rev}"
"-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00+0000"
"-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z"
"-X github.com/superfly/flyctl/internal/buildinfo.environment=production"
"-X github.com/superfly/flyctl/internal/buildinfo.version=${version}"
];
@ -40,6 +40,6 @@ buildGoModule rec {
downloadPage = "https://github.com/superfly/flyctl";
homepage = "https://fly.io/";
license = licenses.asl20;
maintainers = with maintainers; [ aaronjanse jsierles ];
maintainers = with maintainers; [ aaronjanse jsierles techknowlogick ];
};
}

@ -1,42 +0,0 @@
{ lib, stdenv, kernel, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "anbox-modules";
version = "2020-06-14-${kernel.version}";
src = fetchFromGitHub {
owner = "anbox";
repo = "anbox-modules";
rev = "98f0f3b3b1eeb5a6954ca15ec43e150b76369086";
sha256 = "sha256-6xDJQ4YItdbYqle/9VNfOc7D80yFGd9cFyF+CuABaF0=";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
KERNEL_SRC="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
buildPhase = ''
for d in ashmem binder;do
cd $d
make
cd -
done
'';
installPhase = ''
modDir=$out/lib/modules/${kernel.modDirVersion}/kernel/updates/
mkdir -p $modDir
for d in ashmem binder;do
mv $d/$d*.ko $modDir/.
done
'';
meta = with lib; {
description = "Anbox ashmem and binder drivers.";
homepage = "https://github.com/anbox/anbox-modules";
license = licenses.gpl2Only;
platforms = platforms.linux;
broken = kernel.kernelAtLeast "5.5";
maintainers = with maintainers; [ edwtjo ];
};
}

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }:
stdenv.mkDerivation {
pname = "directvnc";
@ -11,6 +11,17 @@ stdenv.mkDerivation {
sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b";
};
patches = [
# Pull fix pending upstream inclusion for -fno-common toolchain
# support:
# https://github.com/drinkmilk/directvnc/pull/7
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/drinkmilk/directvnc/commit/e9c23d049bcf31d0097348d44391fe5fd9aad12b.patch";
sha256 = "1dnzr0dnx20w80r73j4a9n6mhbazjzlr5ps9xjj898924cg140zx";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ directfb zlib libjpeg xorgproto ];

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
patchPhase = "patch -p0 < ${./buildfix.diff}";
configureFlags = [
"--enable-dictorg"
"--datadir=/run/current-system/sw/share/dictd"
"--sysconfdir=/etc"
];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnetCorePackages, openssl, nixosTests }:
{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }:
let
os =
@ -38,10 +38,10 @@ in stdenv.mkDerivation rec {
mkdir -p $out/{bin,share/${pname}-${version}}
cp -r * $out/share/${pname}-${version}/.
makeWrapper "${dotnetCorePackages.runtime_3_1}/bin/dotnet" $out/bin/Prowlarr \
makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Prowlarr \
--add-flags "$out/share/${pname}-${version}/Prowlarr.dll" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
curl sqlite libmediainfo mono openssl icu ]}
curl sqlite libmediainfo mono openssl icu zlib ]}
runHook postInstall
'';

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnetCorePackages, openssl, nixosTests }:
{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }:
let
os = if stdenv.isDarwin then "osx" else "linux";
@ -31,10 +31,10 @@ in stdenv.mkDerivation rec {
mkdir -p $out/{bin,share/${pname}-${version}}
cp -r * $out/share/${pname}-${version}/.
makeWrapper "${dotnetCorePackages.runtime_3_1}/bin/dotnet" $out/bin/Radarr \
makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Radarr \
--add-flags "$out/share/${pname}-${version}/Radarr.dll" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
curl sqlite libmediainfo mono openssl icu ]}
curl sqlite libmediainfo mono openssl icu zlib ]}
runHook postInstall
'';

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "unpackerr";
version = "0.9.9";
version = "0.10.0";
src = fetchFromGitHub {
owner = "davidnewhall";
repo = "unpackerr";
rev = "v${version}";
sha256 = "sha256-lQqa1YtMLsCEfiC3Ld+lw4SvAD8wctSGi2YdXt9lrTA=";
sha256 = "sha256-o+dE3SX+Q+nhxUO4biEluLEeQhsZgzjXdWTdQcw/H2o=";
};
vendorSha256 = "sha256-W9lTIjntaNZSJVt6Jow8uSew+zCaGWU9qzseClNiVUI=";
vendorSha256 = "sha256-vo5Saq0QEEKi3/0ZXuQDtlMmEIPwshYHHr8h24cD0sI=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, nettle }:
{ lib, stdenv, fetchpatch, fetchurl, nettle }:
stdenv.mkDerivation rec {
pname = "rdfind";
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21";
};
patches = [
(fetchpatch {
name = "include-limits.patch";
url = "https://github.com/pauldreik/rdfind/commit/61877de88d782b63b17458a61fcc078391499b29.patch";
sha256 = "0igzm4833cn905pj84lgr88nd5gx35dnjl8kl8vrwk7bpyii6a8l";
})
];
buildInputs = [ nettle ];
meta = with lib; {

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "melt";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "melt";
rev = "v${version}";
sha256 = "sha256-I1LNCrJo3Ihh03aTUG0QhS6ySuMqNJJGyZ8XZzClDlU=";
sha256 = "sha256-R1ml/SQswsltBFLWOvI5GjI4VZUqEH3uwqgmdIrC/Q4=";
};
vendorSha256 = "sha256-eRFWDyXN2c5VSxYOE12sczYP3rGtzLjY9M2DQgHNFyA=";
vendorSha256 = "sha256-9LTR7CrTBGAh7TPMQenY4vZQ7KMYv02fDsY51pkJZSo=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "scorecard";
version = "4.1.0";
version = "4.2.0";
src = fetchFromGitHub {
owner = "ossf";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QOWQhuEEnwtHmQwl5WCCHcKMjwhgxn9xerR0Bxi3660=";
sha256 = "sha256-MTqXQCPmm2NoueVd3bbQlRz4pi2dOZ9l2EUfb60LwsM=";
# populate values otherwise taken care of by goreleaser,
# unfortunately these require us to use git. By doing
# this in postFetch we can delete .git afterwards and
@ -16,20 +16,14 @@ buildGoModule rec {
leaveDotGit = true;
postFetch = ''
cd "$out"
commit="$(git rev-parse HEAD)"
source_date_epoch=$(git log --date=iso8601-strict -1 --pretty=%ct)
substituteInPlace "$out/pkg/scorecard_version.go" \
--replace 'gitCommit = "unknown"' "gitCommit = \"$commit\"" \
--replace 'buildDate = "unknown"' "buildDate = \"$source_date_epoch\""
git rev-parse HEAD > $out/COMMIT
# 0000-00-00T00:00:00Z
date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-AFadBzkRj0D1MXLHzexvomJ0cqirhW82tnNRGx/gChI=";
vendorSha256 = "sha256-JT1hoEm3eBjR5mlNJ+/tBpHIw6FSvFXC/nEVPkbIfq8=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
subPackages = [ "." ];
@ -37,10 +31,16 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/ossf/scorecard/v${lib.versions.major version}/pkg.gitVersion=v${version}"
"-X github.com/ossf/scorecard/v${lib.versions.major version}/pkg.gitTreeState=clean"
"-X sigs.k8s.io/release-utils/version.gitVersion=v${version}"
"-X sigs.k8s.io/release-utils/version.gitTreeState=clean"
];
# ldflags based on metadata from git and source
preBuild = ''
ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)"
ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
'';
preCheck = ''
# Feed in all but the e2e tests for testing
# This is because subPackages above limits what is built to just what we
@ -63,7 +63,7 @@ buildGoModule rec {
installCheckPhase = ''
runHook preInstallCheck
$out/bin/scorecard --help
$out/bin/scorecard version | grep "v${version}"
# $out/bin/scorecard version 2>&1 | grep "v${version}"
runHook postInstallCheck
'';

@ -0,0 +1,15 @@
From https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438
--- a/main.c
+++ b/main.c
@@ -409,9 +409,12 @@ xdg_toplevel_handle_close(void *data, struct xdg_toplevel *xdg_toplevel)
ctx->quit = true;
}
+static void xdg_toplevel_handle_configure_bounds(void *data, struct xdg_toplevel *toplevel, int32_t width, int32_t height) {}
+
static const struct xdg_toplevel_listener xdg_toplevel_listener = {
xdg_toplevel_handle_configure,
xdg_toplevel_handle_close,
+ xdg_toplevel_handle_configure_bounds,
};

@ -23,6 +23,15 @@ stdenv.mkDerivation {
buildInputs = [ wayland ];
patches = [
# A recent change to xdg-shell-client-protocol causes a build
# failure. This was reported upstream as GH #5. User @AlexBMJ
# posted the following two-line fix in that issue, but the
# developer has not yet responded:
# https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438
./configure-bounds.patch
];
installPhase = ''
runHook preInstall
install -m755 -D wdomirror $out/bin/wdomirror

@ -954,6 +954,8 @@ mapAliases ({
phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20
phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22
philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26
phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
# Obsolete PHP version aliases
php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03
php73Packages = php73; # Added 2021-06-03

@ -28898,8 +28898,6 @@ with pkgs;
phraseapp-client = callPackage ../tools/misc/phraseapp-client { };
phwmon = callPackage ../applications/misc/phwmon { };
pianobar = callPackage ../applications/audio/pianobar { };
pianobooster = qt5.callPackage ../applications/audio/pianobooster { };

@ -271,8 +271,6 @@ in {
});
};
anbox = callPackage ../os-specific/linux/anbox/kmod.nix { };
apfs = callPackage ../os-specific/linux/apfs { };
batman_adv = callPackage ../os-specific/linux/batman-adv {};

@ -4764,6 +4764,10 @@ let
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto";
buildInputs = [ CryptOpenSSLGuess ];
meta = {
# errors with: 74366 Abort trap: 6
broken = stdenv.isDarwin && stdenv.isAarch64;
};
};
CryptOpenSSLRSA = buildPerlPackage {

Loading…
Cancel
Save