Merge staging-next into staging

main
github-actions[bot] 2 years ago committed by GitHub
commit 5fa658968b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      nixos/modules/services/misc/taskserver/default.nix
  2. 2
      nixos/modules/services/misc/taskserver/doc.xml
  3. 4
      pkgs/desktops/cinnamon/xapps/default.nix
  4. 4
      pkgs/desktops/cinnamon/xviewer/default.nix
  5. 6
      pkgs/development/haskell-modules/configuration-common.nix
  6. 18
      pkgs/development/libraries/libcef/default.nix
  7. 27
      pkgs/development/libraries/libcef/update.sh
  8. 21
      pkgs/development/libraries/readline/5.x.nix
  9. 64
      pkgs/development/libraries/readline/6.2.nix
  10. 13
      pkgs/development/libraries/readline/clang.patch
  11. 14
      pkgs/development/libraries/readline/no-arch_only.patch
  12. 9
      pkgs/development/libraries/readline/readline-6.2-patches.nix
  13. 11
      pkgs/development/libraries/readline/shobj-darwin.patch
  14. 12
      pkgs/development/python-modules/aiohttp-wsgi/default.nix
  15. 21
      pkgs/development/python-modules/awesomeversion/default.nix
  16. 47
      pkgs/development/python-modules/dsinternals/default.nix
  17. 4
      pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
  18. 4
      pkgs/development/python-modules/georss-wa-dfes-client/default.nix
  19. 18
      pkgs/development/python-modules/mypy-boto3-builder/default.nix
  20. 49
      pkgs/development/python-modules/newversion/default.nix
  21. 4
      pkgs/development/python-modules/pyskyqremote/default.nix
  22. 26
      pkgs/development/python-modules/python-rtmidi/default.nix
  23. 4
      pkgs/development/python-modules/rki-covid-parser/default.nix
  24. 19
      pkgs/development/python-modules/rtmidi-python/default.nix
  25. 4
      pkgs/development/python-modules/xml2rfc/default.nix
  26. 4
      pkgs/development/tools/analysis/checkov/default.nix
  27. 6
      pkgs/development/tools/jless/default.nix
  28. 71
      pkgs/development/tools/phantomjs/default.nix
  29. 4
      pkgs/servers/bird/default.nix
  30. 10
      pkgs/tools/graphics/svgbob/default.nix
  31. 11
      pkgs/tools/security/certipy/default.nix
  32. 4
      pkgs/tools/security/exploitdb/default.nix
  33. 6
      pkgs/tools/system/natscli/default.nix
  34. 6
      pkgs/tools/text/mdbook-graphviz/default.nix
  35. 4
      pkgs/top-level/aliases.nix
  36. 6
      pkgs/top-level/all-packages.nix
  37. 12
      pkgs/top-level/python-packages.nix

@ -106,7 +106,7 @@ let
certtool = "${pkgs.gnutls.bin}/bin/certtool";
nixos-taskserver = pkgs.pythonPackages.buildPythonApplication {
nixos-taskserver = with pkgs.python2.pkgs; buildPythonApplication {
name = "nixos-taskserver";
src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''
@ -129,7 +129,7 @@ let
EOF
'';
propagatedBuildInputs = [ pkgs.pythonPackages.click ];
propagatedBuildInputs = [ click ];
};
in {
@ -138,12 +138,13 @@ in {
enable = mkOption {
type = types.bool;
default = false;
description = ''
description = let
url = "https://nixos.org/manual/nixos/stable/index.html#module-services-taskserver";
in ''
Whether to enable the Taskwarrior server.
More instructions about NixOS in conjuction with Taskserver can be
found in the NixOS manual at
<olink targetdoc="manual" targetptr="module-taskserver"/>.
found <link xlink:href="${url}">in the NixOS manual</link>.
'';
};

@ -1,7 +1,7 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
version="5.0"
xml:id="module-taskserver">
xml:id="module-services-taskserver">
<title>Taskserver</title>
<para>
Taskserver is the server component of

@ -22,7 +22,7 @@
stdenv.mkDerivation rec {
pname = "xapps";
version = "2.2.5";
version = "2.2.8";
outputs = [ "out" "dev" ];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-Ev+gTl9jY1HLbXKnCsVVSsY8ZrHyzsIkp+JTaXOTm6I=";
hash = "sha256-70troRGklu5xGjBIrGvshcOX/UT96hIEFXyo4yj2GT4=";
};
# TODO: https://github.com/NixOS/nixpkgs/issues/36468

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "xviewer";
version = "3.2.2";
version = "3.2.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-FFRms4yh7TQ/O3ee7igeIslimSWLhue3BE1xCrJ3NQ4=";
sha256 = "sha256-OyHSBXtJ/TExl06NLUAaIZq4u0+fI3YGQ37HRZeNP+0=";
};
nativeBuildInputs = [

@ -92,6 +92,12 @@ self: super: {
rm -r $out/doc/?ndroid*
'';
};
# Git annex provides a restricted login shell. Setting
# passthru.shellPath here allows a user's login shell to be set to
# `git-annex-shell` by making `shell = haskellPackages.git-annex`.
# https://git-annex.branchable.com/git-annex-shell/
passthru.shellPath = "/bin/git-annex-shell";
}) super.git-annex;
# Fix test trying to access /home directory

@ -26,6 +26,7 @@
, at-spi2-core
, cups
, libxshmfence
, obs-studio
}:
let
@ -59,27 +60,27 @@ let
"aarch64-linux" = {
platformStr = "linuxarm64";
projectArch = "arm64";
sha256 = "01ny1k10dklsqrrqmxqd9433413wmpk4ddsmkjp9dzv52dvpcl08";
};
"i686-linux" = {
platformStr = "linux32";
projectArch = "x86";
sha256 = "000j6pc336c43xczl1rs5zf8nsf17y76f1kpy14gqgpwyzl8my0w";
};
"x86_64-linux" = {
platformStr = "linux64";
projectArch = "x86_64";
sha256 = "1ydjckld89dkpy5zrvk7jjpz70mnlmbm8yinkfpzgcwbkcakk6k7";
};
};
platforms."aarch64-linux".sha256 = "0m12adzcs6xsmgnqsdc5g0xs6xmjbj560x4d9rnv9fpf1p7jv2fa";
platforms."i686-linux".sha256 = "00cy5kxx8hpifkwhn9qbfch7ng3crx0zb6ypllzip6qms956mama";
platforms."x86_64-linux".sha256 = "1f1hxx4xl0wljyrgj0m3zq47yz2cyqd52qigrkpcvavr1d2sx6m3";
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
in
stdenv.mkDerivation rec {
pname = "cef-binary";
version = "96.0.18";
gitRevision = "fe551e4";
chromiumVersion = "96.0.4664.110";
version = "98.1.21";
gitRevision = "9782362";
chromiumVersion = "98.0.4758.102";
src = fetchurl {
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
@ -102,6 +103,11 @@ stdenv.mkDerivation rec {
cp -r ../include $out/
'';
passthru.tests = {
inherit obs-studio; # frequently breaks on CEF updates
};
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Simple framework for embedding Chromium-based browsers in other applications";
homepage = "https://cef-builds.spotifycdn.com/index.html";

@ -0,0 +1,27 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused jq
set -x -eu -o pipefail
cd $(dirname "${BASH_SOURCE[0]}")
VERSION_JSON=$(curl --silent https://cef-builds.spotifycdn.com/index.json | jq '[.linux64.versions[] | select (.channel == "stable")][0]')
CEF_VERSION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f1)
GIT_REVISION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f2 | cut -c 2-)
CHROMIUM_VERSION=$(echo ${VERSION_JSON} | jq -r '.chromium_version')
SHA256_LINUX64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux64_minimal.tar.bz2)
SHA256_LINUX32=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux32_minimal.tar.bz2)
SHA256_LINUXARM64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linuxarm64_minimal.tar.bz2)
setKV () {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
}
setKV version ${CEF_VERSION}
setKV gitRevision ${GIT_REVISION}
setKV chromiumVersion ${CHROMIUM_VERSION}
setKV 'platforms."aarch64-linux".sha256' ${SHA256_LINUXARM64}
setKV 'platforms."i686-linux".sha256' ${SHA256_LINUX32}
setKV 'platforms."x86_64-linux".sha256' ${SHA256_LINUX64}

@ -1,21 +0,0 @@
{ lib, stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
pname = "readline";
version = "5.2";
src = fetchurl {
url = "mirror://gnu/readline/readline-${version}.tar.gz";
sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
};
propagatedBuildInputs = [ncurses];
patches = lib.optional stdenv.isDarwin ./shobj-darwin.patch;
meta = with lib; {
branch = "5";
platforms = platforms.unix;
license = licenses.gpl2;
};
}

@ -1,64 +0,0 @@
{ fetchurl, lib, stdenv, ncurses
}:
stdenv.mkDerivation (rec {
pname = "readline";
version = "6.2";
src = fetchurl {
url = "mirror://gnu/readline/readline-${version}.tar.gz";
sha256 = "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr";
};
propagatedBuildInputs = [ncurses];
patchFlags = [ "-p0" ];
patches =
[ ./link-against-ncurses.patch
./no-arch_only.patch
./clang.patch
]
++
(let
patch = nr: sha256:
fetchurl {
url = "mirror://gnu/readline/readline-${version}-patches/readline62-${nr}";
inherit sha256;
};
in
import ./readline-6.2-patches.nix patch);
meta = {
description = "Library for interactive line editing";
longDescription = ''
The GNU Readline library provides a set of functions for use by
applications that allow users to edit command lines as they are
typed in. Both Emacs and vi editing modes are available. The
Readline library includes additional functions to maintain a
list of previously-entered command lines, to recall and perhaps
reedit those lines, and perform csh-like history expansion on
previous commands.
The history facilities are also placed into a separate library,
the History library, as part of the build process. The History
library may be used without Readline in applications which
desire its capabilities.
'';
homepage = "https://savannah.gnu.org/projects/readline/";
license = lib.licenses.gpl3Plus;
maintainers = [ ];
branch = "6.2";
platforms = lib.platforms.unix;
};
}
//
# Don't run the native `strip' when cross-compiling.
(if stdenv.hostPlatform != stdenv.buildPlatform
then { dontStrip = true; }
else { }))

@ -1,13 +0,0 @@
diff --git a/support/shobj-conf b/support/shobj-conf
index 5a63e80..4b2a741 100644
--- support/shobj-conf
+++ support/shobj-conf
@@ -189,7 +189,7 @@ darwin*|macosx*)
darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
;;
- *) SHOBJ_LDFLAGS='-dynamic'
+ *) SHOBJ_LDFLAGS='-dynamiclib'
SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
;;
esac

@ -1,14 +0,0 @@
diff -ru -x '*~' readline-6.2-orig/support/shobj-conf readline-6.2/support/shobj-conf
--- support/shobj-conf 2009-10-28 14:20:21.000000000 +0100
+++ support/shobj-conf 2014-07-01 13:03:28.000000000 +0200
@@ -168,8 +168,8 @@
SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
SHLIB_LIBSUFF='dylib'
- SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
;;

@ -1,9 +0,0 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q")
(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy")
(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb")
(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89")
(patch "005" "1x61bjl3wgs1gwla9b3y1hh12m1j5qlbis22258mljjl9mg900pg")
]

@ -1,11 +0,0 @@
--- a/support/shobj-conf.orig 2006-04-11 06:15:43.000000000 -0700
+++ b/support/shobj-conf 2007-11-08 01:15:43.000000000 -0800
@@ -171,7 +171,7 @@
SHLIB_LIBSUFF='dylib'
case "${host_os}" in
- darwin[78]*) SHOBJ_LDFLAGS=''
+ darwin[789]*) SHOBJ_LDFLAGS=''
SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
;;
*) SHOBJ_LDFLAGS='-dynamic'

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiohttp-wsgi";
version = "0.9.1";
version = "0.10.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "etianen";
repo = pname;
rev = version;
sha256 = "sha256-lQ0mAUqsOmozUIMd6nwRATaq8C5SUFGoyQu1v0RBnas=";
rev = "v${version}";
sha256 = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q=";
};
propagatedBuildInputs = [
@ -26,12 +26,6 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# makes http request to another server
# https://github.com/etianen/aiohttp-wsgi/issues/32
"testEnviron"
];
pythonImportsCheck = [ "aiohttp_wsgi" ];
meta = with lib; {

@ -1,14 +1,15 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "awesomeversion";
version = "22.1.0";
format = "setuptools";
version = "22.2.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -16,19 +17,23 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-eoY920c8mgunvZd0M/vR7+bMCPFqqCm3F/fq0vo6K/0=";
sha256 = "sha256-FlJrk/PH3nBLakQfS+ruDwAPH/oo16JcfrtVRFgbUXY=";
};
postPatch = ''
# Upstream doesn't set a version
substituteInPlace setup.py \
--replace "main" ${version}
'';
nativeBuildInputs = [
poetry-core
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
# Upstream doesn't set a version
substituteInPlace pyproject.toml \
--replace 'version = "0"' 'version = "${version}"'
'';
pythonImportsCheck = [
"awesomeversion"
];

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pycryptodomex
, pyopenssl
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dsinternals";
version = "1.2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "p0dalirius";
repo = "pydsinternals";
rev = version;
hash = "sha256-C1ar9c4F4WI5ICX7PJe8FzVwK8bxZds+kMBpttEp9Ko=";
};
propagatedBuildInputs = [
pyopenssl
pycryptodomex
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dsinternals"
];
pytestFlagsArray = [
"tests/*.py"
];
meta = with lib; {
description = "Module to interact with Windows Active Directory";
homepage = "https://github.com/p0dalirius/pydsinternals";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fab ];
};
}

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "georss-qld-bushfire-alert-client";
version = "0.5";
version = "0.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "exxamalte";
repo = "python-georss-qld-bushfire-alert-client";
rev = "v${version}";
hash = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk=";
hash = "sha256-7KVR0hdLwyCj7MYJoRvQ6wTeJQAmCUarYxJXEFaN8Pc=";
};
propagatedBuildInputs = [

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "georss-wa-dfes-client";
version = "0.3";
version = "0.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "exxamalte";
repo = "python-georss-wa-dfes-client";
rev = "v${version}";
hash = "sha256-R7so5EYsKGrOdEXVZ44A+kgTA3pIW6W/R4hzw+Yx0wU=";
hash = "sha256-s7qGTlWFdOtw0eMK7idld7HPOxO8CjODCmUi0WmRLdI=";
};
propagatedBuildInputs = [

@ -7,6 +7,7 @@
, jinja2
, md-toc
, mdformat
, newversion
, poetry-core
, pyparsing
, pytestCheckHook
@ -15,16 +16,16 @@
buildPythonPackage rec {
pname = "mypy-boto3-builder";
version = "6.3.2";
version = "7.1.2";
format = "pyproject";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "vemel";
repo = "mypy_boto3_builder";
rev = version;
sha256 = "1krsh8pmxigpzz21gvsy7qnpnwfkyyjbz92bqp9iflf7kklfhb79";
hash = "sha256-p81Dk6Kv0MzHvexhM8Su5/yIpB+ZGBFqOtm0D18l26s=";
};
nativeBuildInputs = [
@ -38,6 +39,7 @@ buildPythonPackage rec {
jinja2
md-toc
mdformat
newversion
pyparsing
];
@ -45,12 +47,14 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# Should be fixed with 5.x
"test_get_types"
pythonImportsCheck = [
"mypy_boto3_builder"
];
pythonImportsCheck = [ "mypy_boto3_builder" ];
disabledTests = [
# Tests require network access
"TestBotocoreChangelogChangelog"
];
meta = with lib; {
description = "Type annotations builder for boto3";

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, packaging
, poetry-core
, pytestCheckHook
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec {
pname = "newversion";
version = "1.8.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "vemel";
repo = pname;
rev = version;
hash = "sha256-27HWMzSzyAbiOW7OUhlupRWIVJG6DrpXObXmxlCsmxU=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
packaging
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"newversion"
];
meta = with lib; {
description = "PEP 440 version manager";
homepage = "https://github.com/vemel/newversion";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyskyqremote";
version = "0.3.1";
version = "0.3.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "RogerSelwyn";
repo = "skyq_remote";
rev = version;
sha256 = "sha256-yPdyO78QdaLPBJQSeUP48uDr0Zhrj9nPxWbhKAMw0ww=";
sha256 = "sha256-R/HmkVbVKbO54lDSw1tLYs2mXi/XqZX9GGXozv+96iI=";
};
propagatedBuildInputs = [

@ -1,5 +1,17 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, pkg-config, alsa-lib, libjack2, tox, flake8, alabaster
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, isPy27
, pkg-config
, alsa-lib
, libjack2
, tox
, flake8
, alabaster
, CoreAudio
, CoreMIDI
, CoreServices
}:
buildPythonPackage rec {
@ -13,7 +25,15 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib libjack2 ];
buildInputs = [
libjack2
] ++ lib.optionals stdenv.isLinux [
alsa-lib
] ++ lib.optionals stdenv.isDarwin [
CoreAudio
CoreMIDI
CoreServices
];
checkInputs = [
tox
flake8

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "rki-covid-parser";
version = "1.3.1";
version = "1.3.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "thebino";
repo = pname;
rev = "v${version}";
sha256 = "UTLWBbNjvRuBwc5JD8l+izJu5vODLwS16ExdxUPT14A=";
sha256 = "sha256-lJFeGg34L+hmH/ZhTx7FGir/9dK/rviaGveOl2HgNlM=";
};
propagatedBuildInputs = [

@ -1,4 +1,13 @@
{ lib, buildPythonPackage, fetchPypi, cython, alsa-lib }:
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, cython
, alsa-lib
, CoreAudio
, CoreMIDI
, CoreServices
}:
buildPythonPackage rec {
pname = "rtmidi-python";
@ -14,7 +23,13 @@ buildPythonPackage rec {
'';
nativeBuildInputs = [ cython ];
buildInputs = [ alsa-lib ];
buildInputs = lib.optionals stdenv.isLinux [
alsa-lib
] ++ lib.optionals stdenv.isDarwin [
CoreAudio
CoreMIDI
CoreServices
];
setupPyBuildFlags = [ "--from-cython" ];

@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "xml2rfc";
version = "3.12.1";
version = "3.12.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-xIStWb03CygnqB92AXf0uxMLw7pLhSE3mLQ8l1J6dZM=";
sha256 = "sha256-CsxelHZbg25oBRM3P5UYlbWgsnR/L/w8vSFgHK1FKKI=";
};
propagatedBuildInputs = [

@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.873";
version = "2.0.875";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-81gNvfaFqTEGReOP7LgcN5OLU3xeO62r/45b5lEEgow=";
hash = "sha256-ZM554FZayuxxf9dgbGcvfPoXm5rWjjZoNySnKpxRO/w=";
};
nativeBuildInputs = with py.pkgs; [

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "jless";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "PaulJuliusMartinez";
repo = "jless";
rev = "v${version}";
sha256 = "sha256-gBqyo/N/qF6HCTUrSKNVLiL1fc/JTfip1kNpNCBzRT8=";
sha256 = "sha256-IK+EllkctdhIYuzj7eLjadxKoutICPeSXAjLMFiRjmo=";
};
cargoSha256 = "sha256-PbX61RVbrI2kTuyXK+LhQdJDvNo3KjIQH5eBbL6iUBM=";
cargoSha256 = "sha256-CAyKWwtMq5UOODVRrpVHrhlep2wqG434dMGeYV2FSZY=";
meta = with lib; {
description = "A command-line pager for JSON data";

@ -1,71 +0,0 @@
{ stdenv, lib, fetchurl, freetype, fontconfig, openssl, unzip }:
let
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
in
stdenv.mkDerivation rec {
pname = "phantomjs";
version = "1.9.8";
# I chose to use the binary build for now.
# The source version is quite nasty to compile
# because it has bundled a lot of external libraries (like QT and Webkit)
# and no easy/nice way to use the system versions of these
src = if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-i686.tar.bz2";
sha256 = "11fzmssz9pqf3arh4f36w06sl2nyz8l9h8iyxyd7w5aqnq5la0j1";
}
else
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-x86_64.tar.bz2";
sha256 = "0fhnqxxsxhy125fmif1lwgnlhfx908spy7fx9mng4w72320n5nd1";
}
else # x86_64-darwin
fetchurl {
url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-macosx.zip";
sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg";
};
nativeBuildInputs = lib.optional stdenv.isDarwin unzip;
buildPhase = lib.optionalString (!stdenv.isDarwin) ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \
bin/phantomjs
'';
dontPatchELF = true;
dontStrip = true;
installPhase = ''
mkdir -p $out/share/doc/phantomjs
cp -a bin $out
cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs
'';
meta = {
description = "Headless WebKit with JavaScript API";
longDescription = ''
PhantomJS is a headless WebKit with JavaScript API.
It has fast and native support for various web standards:
DOM handling, CSS selector, JSON, Canvas, and SVG.
PhantomJS is an optimal solution for:
- Headless Website Testing
- Screen Capture
- Page Automation
- Network Monitoring
'';
homepage = "https://phantomjs.org/";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.bluescreen303 ];
inherit platforms;
};
}

@ -60,7 +60,7 @@ in
};
bird2 = generic {
version = "2.0.8";
sha256 = "1xp7f0im1v8pqqx3xqyfkd1nsxk8vnbqgrdrwnwhg8r5xs1xxlhr";
version = "2.0.9";
sha256 = "sha256-dnhrvN7TBh4bsiGwEfLMACIewGPenNoASn2bBhoJbV4=";
};
}

@ -2,15 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "svgbob";
version = "0.6.3";
version = "0.6.5";
src = fetchCrate {
inherit version;
crateName = "svgbob_cli";
sha256 = "sha256-yYRBV0s19J0M02wenGayy7Ebx6wDhiLiGmb+os29u9I=";
sha256 = "sha256-EsOq081wfnuFT0OKqLyi3R105brZwuHJwzEx00c2LGg=";
};
cargoSha256 = "sha256-R4W+Oe7Ks2D9qE1IpV6/AMMMwZnCfJ5DzxFAMpV2rFE=";
cargoSha256 = "sha256-sBU3GoqUH9cS1Kn0MCysCG9kQsWQqteVui1AHW9bfs0=";
postInstall = ''
mv $out/bin/svgbob_cli $out/bin/svgbob
'';
meta = with lib; {
description = "Convert your ascii diagram scribbles into happy little SVG";

@ -5,22 +5,23 @@
python3.pkgs.buildPythonApplication rec {
pname = "certipy";
version = "unstable-2021-11-08";
version = "2.0";
src = fetchFromGitHub {
owner = "ly4k";
repo = "Certipy";
rev = "c2f5581505c54f3bf9fe4e6f07c17fa9ef501cab";
sha256 = "0m2n30prqd9d02kmryk8vry4cabcad1892qr8a02qfg6r98x8q3q";
rev = version;
hash = "sha256-xN0DrLrxWNCEy3HodA1pOJHYhDyA1sMRVIfefbXq45E=";
};
propagatedBuildInputs = with python3.pkgs; [
asn1crypto
pycryptodome
dnspython
dsinternals
impacket
ldap3
pyasn1
dnspython
pycryptodome
];
# Project has no tests

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-02-17";
version = "2022-02-19";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-qmddjXZq4SLsAMEIMtpkXURfTUEDjXnkFGXLt/zrk9s=";
sha256 = "sha256-cHAvExbZqqLGPRsa578Po1G3uX2EIcx/visOB0RgNQc=";
};
nativeBuildInputs = [ makeWrapper ];

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "natscli";
version = "0.0.28";
version = "0.0.29";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-w0a2BzfRKf55hFgdaDLsR2YeC5Jqa2uynlRN2oGPX8g=";
sha256 = "sha256-q1T+bDOOPs4eLnRWkYG6VY0AwfG/W2boSY5DZhMv+ZI=";
};
vendorSha256 = "sha256-kt6KflivmsG6prxWXtODcXSP2sNn4daH8ruZMxYLk3g=";
vendorSha256 = "sha256-YTvgofZoWGDZL/ujjZ9RqAgv6UH2caZBrV9/uav3KVw=";
meta = with lib; {
description = "NATS Command Line Interface";

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-graphviz";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "dylanowen";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yY8ZdRNP0G9dwrwUtNZIaodIlEK4GRgZQ5D1GpLhDGg=";
sha256 = "sha256-HTHGb23wc10iAWXX/TNMXjTLWm+OSf1WWW1+/aQRcsk=";
};
cargoSha256 = "sha256-d8/xa2Aq6g0Kvqq11kzVTp1oooN6dPowpKW0uenBevw=";
cargoSha256 = "sha256-7z/4brKY9vpic8mv1b4P/8DE+VyColYnPPoPmY9891M=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

@ -849,6 +849,8 @@ mapAliases ({
pgp-tools = signing-party; # Added 2017-03-26
pg_tmp = ephemeralpg; # Added 2018-01-16
phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20
# 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
@ -1009,6 +1011,8 @@ mapAliases ({
rdf4store = throw "rdf4store has been removed from nixpkgs."; # Added 2019-12-21
rdiff_backup = rdiff-backup; # Added 2014-11-23
rdmd = dtools; # Added 2017-08-19
readline5 = throw "readline-5 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20
readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20
readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22
recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10
redkite = throw "redkite was archived by upstream"; # Added 2021-04-12

@ -15374,8 +15374,6 @@ with pkgs;
pgcli = pkgs.python3Packages.pgcli;
phantomjs = callPackage ../development/tools/phantomjs { };
phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { };
picotool = callPackage ../development/tools/picotool { };
@ -19736,10 +19734,6 @@ with pkgs;
readline = readline6;
readline6 = readline63;
readline5 = callPackage ../development/libraries/readline/5.x.nix { };
readline62 = callPackage ../development/libraries/readline/6.2.nix { };
readline63 = callPackage ../development/libraries/readline/6.3.nix { };
readline70 = callPackage ../development/libraries/readline/7.0.nix { };

@ -2460,6 +2460,8 @@ in {
ds4drv = callPackage ../development/python-modules/ds4drv { };
dsinternals = callPackage ../development/python-modules/dsinternals { };
dsmr-parser = callPackage ../development/python-modules/dsmr-parser { };
dtlssocket = callPackage ../development/python-modules/dtlssocket { };
@ -5432,6 +5434,8 @@ in {
nevow = callPackage ../development/python-modules/nevow { };
newversion = callPackage ../development/python-modules/newversion { };
nexia = callPackage ../development/python-modules/nexia { };
nextcloudmonitor = callPackage ../development/python-modules/nextcloudmonitor { };
@ -8143,7 +8147,9 @@ in {
python-registry = callPackage ../development/python-modules/python-registry { };
python-rtmidi = callPackage ../development/python-modules/python-rtmidi { };
python-rtmidi = callPackage ../development/python-modules/python-rtmidi {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices;
};
python-sat = callPackage ../development/python-modules/python-sat { };
@ -8789,7 +8795,9 @@ in {
rstcheck = callPackage ../development/python-modules/rstcheck { };
rtmidi-python = callPackage ../development/python-modules/rtmidi-python { };
rtmidi-python = callPackage ../development/python-modules/rtmidi-python {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices;
};
rtoml = callPackage ../development/python-modules/rtoml { };

Loading…
Cancel
Save