Merge remote-tracking branch 'origin/master' into haskell-updates

main
sternenseemann 2 years ago
commit bd2615ed6a
  1. 12
      maintainers/maintainer-list.nix
  2. 9
      nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
  3. 4
      nixos/doc/manual/release-notes/rl-2205.section.md
  4. 9
      nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
  5. 11
      nixos/modules/services/networking/frr.nix
  6. 1
      nixos/modules/services/networking/nebula.nix
  7. 6
      nixos/modules/services/web-apps/restya-board.nix
  8. 33
      nixos/modules/services/x11/window-managers/xmonad.nix
  9. 6
      pkgs/applications/audio/bristol/default.nix
  10. 11
      pkgs/applications/audio/dirt/default.nix
  11. 2
      pkgs/applications/audio/ecasound/default.nix
  12. 6
      pkgs/applications/audio/jamin/default.nix
  13. 2
      pkgs/applications/audio/noisetorch/default.nix
  14. 9
      pkgs/applications/audio/ympd/default.nix
  15. 46
      pkgs/applications/blockchains/nearcore/default.nix
  16. 6
      pkgs/applications/emulators/bsnes/ares/default.nix
  17. 36
      pkgs/applications/graphics/drawio/headless.nix
  18. 6
      pkgs/applications/graphics/grafx2/default.nix
  19. 11
      pkgs/applications/misc/gpg-mdp/default.nix
  20. 4
      pkgs/applications/misc/zettlr/default.nix
  21. 4
      pkgs/applications/networking/cluster/krane/Gemfile.lock
  22. 8
      pkgs/applications/networking/cluster/krane/gemset.nix
  23. 6
      pkgs/applications/networking/cluster/waypoint/default.nix
  24. 33
      pkgs/applications/networking/mujmap/default.nix
  25. 6
      pkgs/applications/science/logic/alt-ergo/default.nix
  26. 6
      pkgs/applications/science/math/eukleides/default.nix
  27. 6
      pkgs/applications/version-management/git-and-tools/lab/default.nix
  28. 11
      pkgs/applications/window-managers/matchbox/default.nix
  29. 5
      pkgs/applications/window-managers/yeahwm/default.nix
  30. 17
      pkgs/development/compilers/ccl/default.nix
  31. 4
      pkgs/development/compilers/jasmin-compiler/default.nix
  32. 6
      pkgs/development/compilers/yap/default.nix
  33. 28
      pkgs/development/libraries/cpp-ipfs-api/default.nix
  34. 35
      pkgs/development/libraries/cpp-ipfs-http-client/default.nix
  35. 27
      pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch
  36. 7
      pkgs/development/libraries/kde-frameworks/kimageformats.nix
  37. 24
      pkgs/development/libraries/rtrlib/default.nix
  38. 3
      pkgs/development/libraries/ucommon/default.nix
  39. 16
      pkgs/development/ocaml-modules/genspio/default.nix
  40. 2
      pkgs/development/ocaml-modules/stdcompat/default.nix
  41. 4
      pkgs/development/python-modules/aioesphomeapi/default.nix
  42. 7
      pkgs/development/python-modules/deepdiff/default.nix
  43. 4
      pkgs/development/python-modules/dulwich/default.nix
  44. 4
      pkgs/development/python-modules/gcsfs/default.nix
  45. 4
      pkgs/development/python-modules/peaqevcore/default.nix
  46. 7
      pkgs/development/python-modules/phik/default.nix
  47. 28
      pkgs/development/python-modules/ttp-templates/default.nix
  48. 20
      pkgs/development/python-modules/ttp/default.nix
  49. 31
      pkgs/development/python-modules/ttp/templates.nix
  50. 6
      pkgs/development/python-modules/whois/default.nix
  51. 6
      pkgs/development/tools/rust/cargo-deny/default.nix
  52. 13
      pkgs/development/tools/rust/rust-analyzer/default.nix
  53. 49
      pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix
  54. 6
      pkgs/development/tools/treefmt/default.nix
  55. 6
      pkgs/development/web/deno/default.nix
  56. 10
      pkgs/development/web/deno/librusty_v8.nix
  57. 11
      pkgs/games/brogue/default.nix
  58. 5
      pkgs/games/egoboo/default.nix
  59. 6
      pkgs/misc/wiki-tui/default.nix
  60. 29
      pkgs/os-specific/linux/disk-indicator/default.nix
  61. 11
      pkgs/os-specific/linux/kmscube/default.nix
  62. 34
      pkgs/os-specific/linux/rt-tests/default.nix
  63. 42
      pkgs/servers/bloat/default.nix
  64. 3
      pkgs/servers/frr/default.nix
  65. 17
      pkgs/servers/gemini/agate/default.nix
  66. 9
      pkgs/servers/monitoring/lcdproc/default.nix
  67. 4
      pkgs/servers/web-apps/wiki-js/default.nix
  68. 4
      pkgs/servers/zoneminder/default.nix
  69. 4
      pkgs/stdenv/generic/make-derivation.nix
  70. 6
      pkgs/tools/admin/adtool/default.nix
  71. 6
      pkgs/tools/bluetooth/bluez-tools/default.nix
  72. 6
      pkgs/tools/filesystems/jfsutils/default.nix
  73. 7
      pkgs/tools/misc/dua/default.nix
  74. 4
      pkgs/tools/misc/esphome/dashboard.nix
  75. 4
      pkgs/tools/misc/esphome/default.nix
  76. 10
      pkgs/tools/misc/neofetch/default.nix
  77. 23
      pkgs/tools/misc/pandoc-drawio-filter/default.nix
  78. 2
      pkgs/tools/misc/wimboot/default.nix
  79. 8
      pkgs/tools/misc/yubikey-personalization/default.nix
  80. 11
      pkgs/tools/networking/hping/default.nix
  81. 6
      pkgs/tools/networking/iftop/default.nix
  82. 5
      pkgs/tools/networking/iouyap/default.nix
  83. 7
      pkgs/tools/networking/lsh/default.nix
  84. 4
      pkgs/tools/networking/networkmanager/default.nix
  85. 6
      pkgs/tools/nix/alejandra/default.nix
  86. 8
      pkgs/tools/package-management/cde/default.nix
  87. 4
      pkgs/tools/package-management/nix-update/default.nix
  88. 4
      pkgs/tools/security/exploitdb/default.nix
  89. 4
      pkgs/tools/security/libmodsecurity/default.nix
  90. 5
      pkgs/tools/system/ddrutility/default.nix
  91. 6
      pkgs/tools/text/xml/xmldiff/default.nix
  92. 1
      pkgs/top-level/aliases.nix
  93. 13
      pkgs/top-level/all-packages.nix

@ -3662,6 +3662,12 @@
githubId = 103082;
name = "Ed Brindley";
};
elizagamedev = {
email = "eliza@eliza.sh";
github = "elizagamedev";
githubId = 4576666;
name = "Eliza Velasquez";
};
elliot = {
email = "hack00mind@gmail.com";
github = "Eliot00";
@ -10122,6 +10128,12 @@
githubId = 81340136;
name = "polykernel";
};
poelzi = {
email = "nix@poelzi.org";
github = "poelzi";
githubId = 66107;
name = "Daniel Poelzleithner";
};
polyrod = {
email = "dc1mdp@gmail.com";
github = "polyrod";

@ -516,6 +516,15 @@
<literal>(ghc.withPackages.override { useLLVM = true; }) (p: [])</literal>.
</para>
</listitem>
<listitem>
<para>
The update of the haskell package set brings with it a new
version of the <literal>xmonad</literal> module, which will
break your configuration if you use <literal>launch</literal>
as entrypoint. The example code the corresponding nixos module
was adjusted, you way want to have a look at it.
</para>
</listitem>
<listitem>
<para>
The <literal>home-assistant</literal> module now requires

@ -163,6 +163,10 @@ In addition to numerous new and upgraded packages, this release has the followin
`useLLVM`. So instead of `(ghc.withPackages (p: [])).override { withLLVM = true; }`,
one needs to use `(ghc.withPackages.override { useLLVM = true; }) (p: [])`.
- The update of the haskell package set brings with it a new version of the `xmonad`
module, which will break your configuration if you use `launch` as entrypoint. The
example code the corresponding nixos module was adjusted, you way want to have a look at it.
- The `home-assistant` module now requires users that don't want their
configuration to be managed declaratively to set
`services.home-assistant.config = null;`. This is required

@ -35,8 +35,15 @@ with lib;
# Enable sound in graphical iso's.
hardware.pulseaudio.enable = true;
# Spice guest additions
# VM guest additions to improve host-guest interaction
services.spice-vdagentd.enable = true;
services.qemuGuest.enable = true;
virtualisation.vmware.guest.enable = true;
virtualisation.hypervGuest.enable = true;
services.xe-guest-utilities.enable = true;
# The VirtualBox guest additions rely on an out-of-tree kernel module
# which lags behind kernel releases, potentially causing broken builds.
virtualisation.virtualbox.guest.enable = false;
# Enable plymouth
boot.plymouth.enable = true;

@ -106,6 +106,14 @@ let
TCP Port to bind to for the VTY interface.
'';
};
extraOptions = mkOption {
type = types.listOf types.str;
default = [];
description = ''
Extra options for the daemon.
'';
};
};
in
@ -196,7 +204,8 @@ in
PIDFile = "frr/${daemon}.pid";
ExecStart = "${pkgs.frr}/libexec/frr/${daemon} -f /etc/frr/${service}.conf"
+ optionalString (scfg.vtyListenAddress != "") " -A ${scfg.vtyListenAddress}"
+ optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}";
+ optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}"
+ " " + (concatStringsSep " " scfg.extraOptions);
ExecReload = "${pkgs.python3.interpreter} ${pkgs.frr}/libexec/frr/frr-reload.py --reload --daemon ${daemonName service} --bindir ${pkgs.frr}/bin --rundir /run/frr /etc/frr/${service}.conf";
Restart = "on-abnormal";
};

@ -192,6 +192,7 @@ in
Group = networkId;
})
];
unitConfig.StartLimitIntervalSec = 0; # ensure Restart=always is always honoured (networks can go down for arbitrarily long)
};
}) enabledNetworks);

@ -263,8 +263,8 @@ in
serviceConfig.RemainAfterExit = true;
wantedBy = [ "multi-user.target" ];
requires = [ "postgresql.service" ];
after = [ "network.target" "postgresql.service" ];
requires = if cfg.database.host == null then [] else [ "postgresql.service" ];
after = [ "network.target" ] ++ (if cfg.database.host == null then [] else [ "postgresql.service" ]);
script = ''
rm -rf "${runDir}"
@ -282,7 +282,7 @@ in
sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php"
'' else ''
sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', '${cfg.database.host}');/g" "${runDir}/server/php/config.inc.php"
sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'file_get_contents(${cfg.database.passwordFile})'"});/g" "${runDir}/server/php/config.inc.php
sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'$(cat ${cfg.database.passwordFile})');/g"}" "${runDir}/server/php/config.inc.php"
''}
sed -i "s/^.*'R_DB_PORT'.*$/define('R_DB_PORT', '${toString cfg.database.port}');/g" "${runDir}/server/php/config.inc.php"
sed -i "s/^.*'R_DB_NAME'.*$/define('R_DB_NAME', '${cfg.database.name}');/g" "${runDir}/server/php/config.inc.php"

@ -128,33 +128,34 @@ in {
[ ( (mod4Mask,xK_r), compileRestart True)
, ( (mod4Mask,xK_q), restart "xmonad" True ) ]
compileRestart resume = do
dirs <- asks directories
whenX (recompile dirs True) $ do
when resume writeStateToFile
catchIO
( do
args <- getArgs
executeFile (cacheDir dirs </> compiledConfig) False args Nothing
)
main = getDirectories >>= launch myConfig
--------------------------------------------
{- version 0.17.0 -}
{- For versions before 0.17.0 use this instead -}
--------------------------------------------
-- compileRestart resume =
-- dirs <- io getDirectories
-- whenX (recompile dirs True) $
-- whenX (recompile True) $
-- when resume writeStateToFile
-- *> catchIO
-- ( do
-- dir <- getXMonadDataDir
-- args <- getArgs
-- executeFile (cacheDir dirs </> compiledConfig) False args Nothing
-- executeFile (dir </> compiledConfig) False args Nothing
-- )
--
-- main = getDirectories >>= launch myConfig
-- main = launch myConfig
--------------------------------------------
compileRestart resume =
whenX (recompile True) $
when resume writeStateToFile
*> catchIO
( do
dir <- getXMonadDataDir
args <- getArgs
executeFile (dir </> compiledConfig) False args Nothing
)
main = launch myConfig
'';
};

@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
configurePhase = "./configure --prefix=$out --enable-jack-default-audio --enable-jack-default-midi";
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: brightonCLI.o:/build/bristol-0.60.11/brighton/brightonCLI.c:139: multiple definition of
# `event'; brightonMixerMenu.o:/build/bristol-0.60.11/brighton/brightonMixerMenu.c:1182: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
preInstall = ''
sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, libsndfile, libsamplerate, liblo, libjack2 }:
stdenv.mkDerivation {
pname = "dirt";
@ -10,6 +10,15 @@ stdenv.mkDerivation {
sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n";
fetchSubmodules = true;
};
patches = [
# Pull patch pending upstream inclusion for upstream gcc-10 support:
# https://github.com/tidalcycles/Dirt/pull/65
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/tidalcycles/Dirt/commit/43fd267745d486228c4185b4fcbd7d9fbc362cc2.patch";
sha256 = "08r34ylzs31wwf0la995pb149ccq0vr7qg4792pkhca57zi0bff8";
})
];
buildInputs = [ libsndfile libsamplerate liblo libjack2 ];
postPatch = ''
sed -i "s|./samples|$out/share/dirt/samples|" dirt.c

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
CXXFLAGS = "-std=c++11";
configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0";
configureFlags = [ "--enable-liblilv" "--with-extra-cppflags=-Dnullptr=0" ];
postPatch = ''
sed -i -e '

@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 ]
++ (with perlPackages; [ perl XMLParser ]);
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: jamin-preferences.o:/build/jamin-0.95.0/src/hdeq.h:64: multiple definition of
# `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = "-ldl";
postInstall = ''

@ -33,6 +33,8 @@ buildGoModule rec {
'';
meta = with lib; {
insecure = true;
knownVulnerabilities = [ "https://github.com/lawl/NoiseTorch/releases/tag/0.11.6" ];
description = "Virtual microphone device with noise supression for PulseAudio";
homepage = "https://github.com/lawl/NoiseTorch";
license = licenses.gpl3Plus;

@ -18,11 +18,18 @@ stdenv.mkDerivation rec {
sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq";
};
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: CMakeFiles/ympd.dir/src/mpd_client.c.o:(.bss+0x0): multiple definition of `mpd';
# CMakeFiles/ympd.dir/src/ympd.c.o:(.bss+0x20): first defined here
# Should be fixed by pending https://github.com/notandy/ympd/pull/191 (does not apply as is).
NIX_CFLAGS_COMPILE = "-fcommon";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libmpdclient openssl ];
meta = with lib; {
homepage = "https://www.ympd.org";
homepage = "https://github.com/notandy/ympd";
description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS";
maintainers = [ maintainers.siddharthist ];
platforms = platforms.unix;

@ -1,42 +1,60 @@
{ rustPlatform, lib, fetchFromGitHub
, zlib, elfutils, openssl
, cmake, python3, pkg-config, protobuf, perl, llvmPackages
, zlib, openssl
, pkg-config, protobuf, llvmPackages
}:
rustPlatform.buildRustPackage rec {
#https://github.com/near/nearcore
pname = "nearcore";
version = "1.25.0";
version = "1.26.0";
# https://github.com/near/nearcore/tags
src = fetchFromGitHub {
owner = "near";
repo = "nearcore";
# there is also a branch for this version number, so we need to be explicit
rev = "refs/tags/${version}";
sha256 = "sha256-7hiBqJLGIf+kNKJvMQ7KtGZm/SWLY3pT7YDlwbm3HDM=";
sha256 = "sha256-N3A+hy5I1/yJ3IN9gDw3m1IZ9qK8LNhn3fuXLMn23bg=";
};
cargoSha256 = "sha256-EGv4CibSHL9oTAdWK7d/SOzZWPcEB16hTWlWHjKU4wc=";
cargoSha256 = "sha256-g07liit048TSL73wFyDK+eKu33Z6fPJcJ+VeGgTtuS8=";
postPatch = ''
substituteInPlace neard/build.rs \
--replace 'get_git_version()?' '"nix:${version}"'
'';
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
CARGO_PROFILE_RELEASE_LTO = "fat";
NEAR_RELEASE_BUILD = "release";
OPENSSL_NO_VENDOR = 1; # we want to link to OpenSSL provided by Nix
# don't build SDK samples that require wasm-enabled rust
cargoBuildFlags = [ "-p" "neard" ];
buildAndTestSubdir = "neard";
doCheck = false; # needs network
buildInputs = [ zlib elfutils openssl ];
buildInputs = [
zlib
openssl
];
nativeBuildInputs = [
cmake
python3
pkg-config
protobuf
perl
];
# fat LTO requires ~3.4GB RAM
requiredSystemFeatures = [ "big-parallel" ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include";
meta = with lib; {
description = "Reference client for NEAR Protocol";
homepage = "https://github.com/near/nearcore";
license = licenses.mit;
maintainers = with maintainers; [ mic92 ];
platforms = platforms.unix;
license = licenses.gpl3;
maintainers = with maintainers; [ mic92 mikroskeem ];
# only x86_64 is supported in nearcore because of sse4+ support, macOS might
# be also possible
platforms = [ "x86_64-linux" ];
};
}

@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, pkg-config
, wrapGAppsHook
, SDL2
, alsa-lib
, gtk3
@ -18,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "ares";
version = "127";
version = "128";
src = fetchFromGitHub {
owner = "ares-emulator";
repo = "ares";
rev = "v${version}";
sha256 = "0rhq39w41j9yr1fkyfmf4n6fjxnq1cglj98rp4wys12kwqv7smvx";
sha256 = "sha256-Ojf1kyColBK0S3DwXjGaAZSl0ljhgiXkfKC11BL2fEc=";
};
patches = [
@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
wrapGAppsHook
];
buildInputs = [

@ -0,0 +1,36 @@
{ lib, writeTextFile, runtimeShell, drawio, xvfb-run }:
writeTextFile {
name = "${drawio.pname}-headless-${drawio.version}";
executable = true;
destination = "/bin/drawio";
text = ''
#!${runtimeShell}
# Electron really wants a configuration directory to not die with:
# "Error: Failed to get 'appData' path"
# so we give it some temp dir as XDG_CONFIG_HOME
tmpdir=$(mktemp -d)
function cleanup {
rm -rf "$tmpdir"
}
trap cleanup EXIT
# Drawio needs to run in a virtual X session, because Electron
# refuses to work and dies with an unhelpful error message otherwise:
# "The futex facility returned an unexpected error code."
XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run ${drawio}/bin/drawio $@
'';
meta = with lib; {
description = "xvfb wrapper around drawio";
longDescription = ''
A wrapper around drawio for running in headless environments.
Runs drawio under xvfb-run, with configuration going to a temporary
directory.
'';
maintainers = with maintainers; [ qyliss tfc ];
};
}

@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
preBuild = "cd src";
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: ../obj/unix/tiles.o:/build/grafx2/src/global.h:306: multiple definition of
# `Main_selector'; ../obj/unix/main.o:/build/grafx2/src/global.h:306: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
preInstall = '' mkdir -p "$out" '';
installPhase = ''make install prefix="$out"'';

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, ncurses, gnupg }:
{ fetchurl, fetchpatch, lib, stdenv, ncurses, gnupg }:
let version = "0.7.4";
in stdenv.mkDerivation {
@ -14,6 +14,15 @@ in stdenv.mkDerivation {
url = "https://tamentis.com/projects/mdp/files/mdp-${version}.tar.gz";
sha256 = "04mdnx4ccpxf9m2myy9nvpl9ma4jgzmv9bkrzv2b9affzss3r34g";
};
patches = [
# Pull fix pending upstream inclusion for -fno-common toolchain support:
# https://github.com/tamentis/mdp/pull/9
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/tamentis/mdp/commit/95c77de3beb96dc7c76ff36d3f3dfb18411d7c54.patch";
sha256 = "1j6yvjzkx31b758yav4arhlm5ig7phl8mgx4fcwj7lm2pfvzwcsz";
})
];
buildInputs = [ ncurses ];
prePatch = ''
substituteInPlace ./configure \

@ -8,11 +8,11 @@
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
let
pname = "zettlr";
version = "2.2.5";
version = "2.2.6";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
sha256 = "sha256-KP3lt0CweT1f/BR3IpnjwCqNvhFbrpz9KLg6K8OMs+I=";
sha256 = "sha256-f01WLxp8fe7y2EwTUhpPqcRuWBs/9lMaAAOdybmHB5M=";
};
appimageContents = appimageTools.extractType2 {
inherit name src;

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.2.3)
activesupport (7.0.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -60,7 +60,7 @@ GEM
ffi-compiler (>= 1.0, < 2.0)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
jsonpath (1.1.1)
jsonpath (1.1.2)
multi_json
jwt (2.3.0)
krane (2.4.6)

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8";
sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj";
type = "gem";
};
version = "7.0.2.3";
version = "7.0.3";
};
addressable = {
dependencies = ["public_suffix"];
@ -276,10 +276,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0slr38w21gwizkq4nk6c7l7lcqc2c733zfn5fq1pmbwy5bwiggad";
sha256 = "0fkdjic88hh0accp0sbx5mcrr9yaqwampf5c3214212d4i614138";
type = "gem";
};
version = "1.1.1";
version = "1.1.2";
};
jwt = {
groups = ["default"];

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "waypoint";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NRR/N61QdBF4jaioF7+X3xOdvaJ8COEzXL4hVHYSqW4=";
sha256 = "sha256-Pq1gGXROPHHMaOoQwx6cObvMF+SoilOROR4bwI0Y/GM=";
};
vendorSha256 = "sha256-57/MzO5TulGKMkGdQRoFNKIKF7upJiPazF0+Ovt/LG8=";
vendorSha256 = "sha256-Q8ookgQwecRuSrnQiIREBMDxK9NAWfHu+sIQeMO/T4w=";
nativeBuildInputs = [ go-bindata installShellFiles ];

@ -0,0 +1,33 @@
{ lib
, fetchFromGitHub
, rustPlatform
, notmuch
, stdenv
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "mujmap";
version = "0.1.1";
src = fetchFromGitHub {
owner = "elizagamedev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-O5CbLgs+MkATPtess0gocgPB9kwD8FMR/urwm6jo2rA=";
};
cargoSha256 = "sha256-nOZ+HnzXhVp+tLrNMZO1NmZIhIqlWz0fRMbHVIQkOxI=";
buildInputs = [
notmuch
] ++ lib.optional stdenv.isDarwin Security;
meta = with lib; {
description = "Bridge for synchronizing email and tags between JMAP and notmuch";
homepage = "https://github.com/elizagamedev/mujmap/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ elizagamedev ];
mainProgram = "mujmap";
};
}

@ -17,7 +17,7 @@ in
let alt-ergo-lib = ocamlPackages.buildDunePackage rec {
pname = "alt-ergo-lib";
inherit version src useDune2;
configureFlags = pname;
configureFlags = [ pname ];
nativeBuildInputs = [ which ];
buildInputs = with ocamlPackages; [ dune-configurator ];
propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ];
@ -26,7 +26,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec {
let alt-ergo-parsers = ocamlPackages.buildDunePackage rec {
pname = "alt-ergo-parsers";
inherit version src useDune2;
configureFlags = pname;
configureFlags = [ pname ];
nativeBuildInputs = [ which ocamlPackages.menhir ];
propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]);
}; in
@ -35,7 +35,7 @@ ocamlPackages.buildDunePackage {
inherit pname version src useDune2;
configureFlags = pname;
configureFlags = [ pname ];
nativeBuildInputs = [ which ocamlPackages.menhir ];
buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ];

@ -32,6 +32,12 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
--replace '$(SHARE_DIR)/texmf' "$tex"
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: eukleides_build/triangle.o:(.bss+0x28): multiple definition of `A';
# eukleides_build/quadrilateral.o:(.bss+0x18): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
preInstall = ''
mkdir -p $out/bin
'';

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "lab";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
sha256 = "sha256-sw00D/PJaLAPHoPdJC2WYUNklIzMbc/bXt2jlQZ7E90=";
sha256 = "sha256-7AUhH2aBRpsjUzZQGE2fHDOa1k0rMUfZJqUEKZXpJuM=";
};
subPackages = [ "." ];
vendorSha256 = "sha256-FwnVMH//GwFbi+llFF6XNqrZX2hRB4r51p8TRz2vN+g=";
vendorSha256 = "sha256-ChysquNuUffcM3qaWUdqu3Av33gnKkdlotEoFKoedA0=";
doCheck = false;

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, libmatchbox, libX11, libXext }:
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libmatchbox, libX11, libXext }:
stdenv.mkDerivation rec {
pname = "matchbox";
@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1";
};
patches = [
# Pull upstream fix for -fno-common tollchains:
(fetchpatch {
name = "fno-common.patch";
url = "https://git.yoctoproject.org/matchbox-window-manager/patch/?id=844f61069896fe3f549ab425d731c061028f697c";
sha256 = "1md2s7q094hn4gzg21pfyz8d426y07d5rbx2icas9nvc8jj7bwfc";
})
];
meta = {
description = "X window manager for non-desktop embedded systems";
homepage = "https://www.yoctoproject.org/software-item/matchbox/";

@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
prefix="${placeholder "out"}" )
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: screen.o:(.bss+0x40): multiple definition of `fg'; client.o:(.bss+0x40): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
postInstall = ''
gzip -9 --stdout yeahwm.1 > yeahwm.1.gz
install -m644 yeahwm.1.gz ${placeholder "out"}/share/man/man1/

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }:
{ lib, stdenv, fetchurl, fetchpatch, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }:
let
options = rec {
@ -59,6 +59,21 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256;
};
patches = [
# Pull upstream fiux for -fno-common toolchains:
# https://github.com/Clozure/ccl/pull/316
(fetchpatch {
name = "fno-common-p1.patch";
url = "https://github.com/Clozure/ccl/commit/185dc1a00e7492f8be98e5f93b561758423595f1.patch";
sha256 = "0wqfds7346qdwdsxz3bl2p601ib94rdp9nknj7igj01q8lqfpajw";
})
(fetchpatch {
name = "fno-common-p2.patch";
url = "https://github.com/Clozure/ccl/commit/997de91062d1f152d0c3b322a1e3694243e4a403.patch";
sha256 = "10w6zw8wgalkdyya4m48lgca4p9wgcp1h44hy9wqr94dzlllq0f6";
})
];
buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ];
CCL_RUNTIME = cfg.runtime;

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jasmin-compiler";
version = "21.0";
version = "2022.04.0";
src = fetchurl {
url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2";
sha256 = "sha256:1px17fpc00gca5ayfcr4k008srkyw120c25rnyf7cgzfs1gpylj2";
sha256 = "sha256:0yf3lp469m8jdpqmqq3sw3h8l3psrzdp134wp3l1q31j3akskn2s";
};
sourceRoot = "jasmin-compiler-v${version}/compiler";

@ -13,7 +13,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-tabling=yes" ];
NIX_CFLAGS_COMPILE = "-fpermissive";
# -fcommon: workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libYap.a(pl-dtoa.o):/build/yap-6.3.3/H/pl-yap.h:230: multiple definition of `ATOM_';
# libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here
NIX_CFLAGS_COMPILE = "-fpermissive -fcommon";
meta = {
homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";

@ -1,28 +0,0 @@
{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
stdenv.mkDerivation {
pname = "cpp-ipfs-api";
version = "2017-01-04";
src = fetchFromGitHub {
owner = "vasild";
repo = "cpp-ipfs-api";
rev = "96a890f4518665a56581a2a52311eaa65928eac8";
sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ curl ];
propagatedBuildInputs = [ nlohmann_json ];
NIX_CFLAGS_COMPILE = [
"-Wno-error=range-loop-construct"
];
meta = with lib; {
description = "IPFS C++ API client library";
homepage = "https://github.com/vasild/cpp-ipfs-api";
license = licenses.mit;
platforms = platforms.all;
};
}

@ -0,0 +1,35 @@
{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
stdenv.mkDerivation {
pname = "cpp-ipfs-http-client";
version = "unstable-2022-01-30";
src = fetchFromGitHub {
owner = "vasild";
repo = "cpp-ipfs-http-client";
rev = "3cdfa7fc6326e49fc81b3c7ca43ce83bdccef6d9";
sha256 = "sha256-/oyafnk4SbrvoCh90wkZXNBjknMKA6EEUoEGo/amLUo=";
};
patches = [ ./unvendor-nlohmann-json.patch ];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace '# Fetch "JSON for Modern C++"' "include_directories(${nlohmann_json}/include)"
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ curl ];
propagatedBuildInputs = [ nlohmann_json ];
NIX_CFLAGS_COMPILE = [
"-Wno-error=range-loop-construct"
];
meta = with lib; {
description = "IPFS C++ API client library";
homepage = "https://github.com/vasild/cpp-ipfs-http-client";
license = licenses.mit;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}

@ -0,0 +1,27 @@
--- source/CMakeLists.txt
+++ source/CMakeLists.txt
@@ -56,11 +56,6 @@ target_include_directories(${IPFS_API_LIBNAME}
)
# Fetch "JSON for Modern C++"
-include(FetchContent)
-message(STATUS "Fetching nlohmann/JSON")
-# Retrieve Nlohmann JSON
-FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz)
-FetchContent_MakeAvailable(json)
# libcurl requires additional libs only for static Windows builds
if(WIN32)
@@ -71,12 +66,11 @@ set_target_properties(${IPFS_API_LIBNAME} PROPERTIES
SOVERSION ${PROJECT_VERSION_MAJOR}
VERSION ${PROJECT_VERSION}
)
-target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS} nlohmann_json::nlohmann_json)
+target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS})
if(NOT DISABLE_INSTALL)
install(TARGETS ${IPFS_API_LIBNAME} DESTINATION lib)
install(FILES include/ipfs/client.h DESTINATION include/ipfs)
install(FILES include/ipfs/http/transport.h DESTINATION include/ipfs/http)
- install(FILES ${json_SOURCE_DIR}/include/nlohmann/json.hpp DESTINATION include/nlohmann)
endif()
# Tests, use "CTEST_OUTPUT_ON_FAILURE=1 make test" to see output from failed tests

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
ilmbase, karchive, openexr, libavif, qtbase
ilmbase, karchive, openexr, libavif, libheif, qtbase
}:
let inherit (lib) getDev; in
@ -10,9 +10,12 @@ mkDerivation {
pname = "kimageformats";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive openexr libavif qtbase ];
buildInputs = [ karchive openexr libavif libheif qtbase ];
outputs = [ "out" ]; # plugins only
CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR";
cmakeFlags = [
"-DKIMAGEFORMATS_HEIF=ON"
];
meta = with lib; {
broken = versionOlder qtbase.version "5.14";

@ -0,0 +1,24 @@
{ lib, fetchFromGitHub, stdenv, cmake, libssh, openssl }:
stdenv.mkDerivation rec {
pname = "rtrlib";
version = "0.8.0";
src = fetchFromGitHub {
repo = pname;
owner = "rtrlib";
rev = "v${version}";
sha256 = "sha256-ISb4ojcDvXY/88GbFMrA5V5+SGE6CmE5D+pokDTwotQ=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libssh openssl ];
meta = with lib; {
description = "An open-source C implementation of the RPKI/Router Protocol client";
homepage = "https://github.com/rtrlib/rtrlib";
license = licenses.mit;
maintainers = with maintainers; [ Anillc ];
platforms = platforms.all;
};
}

@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
# use C++14 Standard until error handling code gets updated upstream
CXXFLAGS = [ "-std=c++14" ];
# disable flaky networking test
postPatch = ''
substituteInPlace test/stream.cpp \

@ -1,27 +1,19 @@
{ lib, fetchFromGitHub, buildDunePackage
, nonstd, sosa
, base, fmt
}:
buildDunePackage rec {
pname = "genspio";
version = "0.0.2";
useDune2 = false;
version = "0.0.3";
src = fetchFromGitHub {
owner = "hammerlab";
repo = pname;
rev = "${pname}.${version}";
sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x";
sha256 = "sha256:1788cnn10idp5i1hggg4pys7k0w8m3h2p4xa42jipfg4cpj7shaf";
};
minimalOCamlVersion = "4.03";
propagatedBuildInputs = [ nonstd sosa ];
configurePhase = ''
ocaml please.mlt configure
'';
propagatedBuildInputs = [ base fmt ];
doCheck = true;

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
# build fails otherwise
enableParallelBuilding = false;
configureFlags = "--libdir=$(OCAMLFIND_DESTDIR)";
configureFlags = [ "--libdir=$(OCAMLFIND_DESTDIR)" ];
meta = {
homepage = "https://github.com/thierry-martinez/stdcompat";

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "10.8.2";
version = "10.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zvilMBx9H2VDmu13IiAiCqXEGkbpAJpGnt4Ea7FlGVI=";
sha256 = "sha256-j1YYzyOLuH+COBDXJUpkUx8H2K8F5tC5LB8ysZKi6oI=";
};
propagatedBuildInputs = [

@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "seperman";
repo = "deepdiff";
rev = "v${version}";
hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk=";
hash = "sha256-7eagu6lef5bc/4KU3y067LFOGtH6whda1ocBuRHS/kI=";
};
postPatch = ''
@ -49,11 +49,6 @@ buildPythonPackage rec {
pyyaml
];
disabledTests = [
# Assertion issue with the decimal places
"test_get_numeric_types_distance"
];
meta = with lib; {
description = "Deep Difference and Search of any Python object/data";
homepage = "https://github.com/seperman/deepdiff";

@ -17,7 +17,7 @@
}:
buildPythonPackage rec {
version = "0.20.38";
version = "0.20.40";
pname = "dulwich";
format = "setuptools";
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-c0Z5DYc1yG+7xbcLZ08O+UCWweUJm6cnNJFigjmBf8g=";
hash = "sha256-vtcO/gt91RpHvOqbmEqwamdddDi3izLaHLr891D7utc=";
};
LC_ALL = "en_US.UTF-8";

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "gcsfs";
version = "2022.01.0";
version = "2022.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "fsspec";
repo = pname;
rev = version;
hash = "sha256-wNeK1GdjK9GKaaECcFeBLjFf/h3MbLI5e4MX0UNoTqE=";
hash = "sha256-+Bchwsa8Jj7WBWbzyH+GQuqZki4EltMryumKt4Pm1es=";
};
propagatedBuildInputs = [

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "0.0.23";
version = "0.0.24";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-z59TJ+P7WNMcTyevi4etWUFUnBJXAVhDOnO4GXjjuR0=";
hash = "sha256-rAC0NXkK18DmPiZJbqSZh5O0i6KvMpWvaANWyK3zMXQ=";
};
postPatch = ''

@ -15,12 +15,14 @@
, ninja
, numba
, pybind11
, scikit-build
}:
buildPythonPackage rec {
pname = "phik";
version = "0.12.2";
disabled = !isPy3k;
format = "pyproject";
src = fetchPypi {
inherit pname version;
@ -50,10 +52,13 @@ buildPythonPackage rec {
nativeBuildInputs = [
cmake
ninja
scikit-build
];
pythonImportCheck = [ "phik" ];
postInstall = ''
rm -r $out/bin
rm -r $out/bin
'';
meta = with lib; {

@ -1,11 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, netmiko
, pytestCheckHook
, python
, pythonOlder
, ttp
}:
buildPythonPackage rec {
@ -22,24 +18,14 @@ buildPythonPackage rec {
hash = "sha256-Qx+z/srYgD67FjXzYrc8xtA99n8shWK7yWj/r/ETN2U=";
};
propagatedBuildInputs = [
ttp
];
postPatch = ''
# Drop circular dependency on ttp
substituteInPlace setup.py \
--replace '"ttp>=0.6.0"' ""
'';
checkInputs = [
netmiko
pytestCheckHook
];
pythonImportsCheck = [
"ttp_templates"
];
pytestFlagsArray = [
# The other tests requires data which is no part of the source
"test/test_ttp_templates_methods.py"
"test/test_yang_openconfig_lldp.py"
];
# Circular dependency on ttp
doCheck = false;
meta = with lib; {
description = "Template Text Parser Templates collections";

@ -1,22 +1,20 @@
{ lib
, buildPythonPackage
, callPackage
, fetchFromGitHub
, cerberus
, configparser
, deepdiff
, fetchFromGitHub
, geoip2
, jinja2
, netmiko
, openpyxl
, tabulate
, yangson
, pytestCheckHook
, pyyaml
, tabulate
, ttp-templates
, yangson
}:
let
ttp_templates = callPackage ./templates.nix { };
in
buildPythonPackage rec {
pname = "ttp";
version = "0.8.4";
@ -26,7 +24,7 @@ buildPythonPackage rec {
owner = "dmulyalin";
repo = pname;
rev = version;
sha256 = "sha256-vuKlddqm8KirqAJyvBPfRb5Nw9zo4Fl1bwbfVMhmH9g=";
hash = "sha256-vuKlddqm8KirqAJyvBPfRb5Nw9zo4Fl1bwbfVMhmH9g=";
};
propagatedBuildInputs = [
@ -37,7 +35,7 @@ buildPythonPackage rec {
geoip2
jinja2
# n2g unpackaged
# netmiko unpackaged
netmiko
# nornir unpackaged
openpyxl
tabulate
@ -51,7 +49,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
pyyaml
ttp_templates
ttp-templates
];
disabledTestPaths = [
@ -87,6 +85,8 @@ buildPythonPackage rec {
"test_TTP_CACHE_FOLDER_env_variable_usage"
# requires additional network setup
"test_child_group_do_not_start_if_no_parent_started"
# Assertion Error
"test_in_threads_parsing"
];
pytestFlagsArray = [

@ -1,31 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "ttp-templates";
version = "0.1.1";
format = "setuptools";
src = fetchPypi {
pname = "ttp_templates";
inherit version;
sha256 = "0vg7k733i8jqnfz8mpq8kzr2l7b7drk29zkzik91029f6w7li007";
};
# drop circular dependency on ttp
postPatch = ''
substituteInPlace setup.py --replace '"ttp>=0.6.0"' ""
'';
# circular dependency on ttp
doCheck = false;
meta = with lib; {
description = "Template Text Parser Templates";
homepage = "https://github.com/dmulyalin/ttp_templates";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "whois";
version = "0.9.14";
version = "0.9.15";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "DannyCork";
repo = "python-whois";
rev = version;
sha256 = "1df4r2pr356y1c2ys6pzdl93fmx9ci4y75xphc95xn27zvqbpvix";
rev = "refs/tags/${version}";
sha256 = "sha256-Pfogvo0s678KHO85r4yopEaL4n/2cIY1+CnQu3iB8xc=";
};
propagatedBuildInputs = [

@ -11,19 +11,19 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = pname;
rev = version;
sha256 = "sha256-8zJvVuEljCa63mQcgK3E3/SHica6DZbNys+PG7E2GtI=";
sha256 = "sha256-w64fdjKXiCaM+U28Hte+I0LPqmGKxbCVRUyhNWcVyTc=";
};
# enable pkg-config feature of zstd
cargoPatches = [ ./zstd-pkg-config.patch ];
cargoSha256 = "sha256-bMm/JWzVrgS8XHV1ZXeGQm79JUC7zL0h6v92tqajXfU=";
cargoSha256 = "sha256-K9Ab4L/wnpUqe+gLKhtHX4fOgWXv6ZL9faa58hzdq/0=";
nativeBuildInputs = [ pkg-config ];

@ -1,5 +1,6 @@
{ lib
, stdenv
, callPackage
, fetchFromGitHub
, rustPlatform
, CoreServices
@ -11,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2022-05-02";
cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ=";
version = "2022-05-17";
cargoSha256 = "sha256-H0nuS56mvo5YUAUOsEnR4Cv3iFKixoHK83BcM1PFMA8=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";
sha256 = "sha256-vrVpgQYUuJPgK1NMb1nxlCdxjoYo40YkUbZpH2Z2mwM=";
};
patches = [
@ -54,7 +55,11 @@ rustPlatform.buildRustPackage rec {
runHook postInstallCheck
'';
passthru.updateScript = ./update.sh;
passthru = {
updateScript = ./update.sh;
# FIXME: Pass overrided `rust-analyzer` once `buildRustPackage` also implements #119942
tests.neovim-lsp = callPackage ./test-neovim-lsp.nix { };
};
meta = with lib; {
description = "A modular compiler frontend for the Rust language";

@ -0,0 +1,49 @@
{ runCommandNoCC, cargo, neovim, rust-analyzer, rustc }:
runCommandNoCC "test-neovim-rust-analyzer" {
nativeBuildInputs = [ cargo neovim rust-analyzer rustc ];
testRustSrc = /* rust */ ''
fn main() {
let mut var = vec![None];
var.push(Some("hello".to_owned()));
}
'';
nvimConfig = /* lua */ ''
vim.lsp.buf_attach_client(vim.api.nvim_get_current_buf(), vim.lsp.start_client({
cmd = { "rust-analyzer" },
handlers = {
["$/progress"] = function(_, msg, ctx)
if msg.token == "rustAnalyzer/Indexing" and msg.value.kind == "end" then
vim.cmd("goto 23") -- let mut |var =...
vim.lsp.buf.hover()
end
end,
["textDocument/hover"] = function(_, msg, ctx)
-- Keep newlines.
io.write(msg.contents.value)
vim.cmd("q")
end,
},
on_error = function(code)
print("error: " .. code)
vim.cmd("q")
end
}))
'';
} ''
# neovim requires a writable HOME.
export HOME="$(pwd)"
cargo new --bin test-rust-analyzer
cd test-rust-analyzer
cat <<<"$testRustSrc" >src/main.rs
cat <<<"$nvimConfig" >script.lua
# `-u` doesn't work
result="$(nvim --headless +'lua dofile("script.lua")' src/main.rs)"
echo "$result"
[[ "$result" == *"var: Vec<Option<String>>"* ]]
touch $out
''

@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "treefmt";
version = "0.3.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "numtide";
repo = "treefmt";
rev = "v${version}";
sha256 = "sha256-PTT87Na4KpyN6a7T49vHHhSqSOF6JSWr5/jiys1Uzko=";
hash = "sha256-+EcqrmjZR8pkBiIXpdJ/KfmTm719lgz7oC9tH7OhJKY=";
};
cargoSha256 = "sha256-Gvr6Zjd9Gvn2CyjNHlJaKPFYUViPezRwoDBeVelRlkU=";
cargoSha256 = "sha256-DXsKUeSmNUIKPsvrLxkg+Kp78rEfjmJQYf2pj1LWW38=";
meta = {
description = "one CLI to format the code tree";

@ -16,15 +16,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.21.3";
version = "1.22.0";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0LjY5XBtR9uoxLOOFRebbSuH9chSdH1/9rtsY15NdCM=";
sha256 = "sha256-gragdn3ToOz/We+iVOrX/Fx0g7Zbb7RT5C/2K1+/spc=";
};
cargoSha256 = "sha256-8YldzUO9Jysu0w2NvGWDIr2eIWcrX9ALUodYwIykt64=";
cargoSha256 = "sha256-+lNrkOCiC9WT0hbuUBCTaFCsVWJVbp/up2iov3MMt8o=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.42.0";
version = "0.42.1";
shas = {
x86_64-linux = "sha256-p8wC2r9+PKEabaHj0NF059TBSKOpE+rtZkqk1SXINzQ=";
aarch64-linux = "sha256-1mQQ5XmR+WcYW6BGfnUdsG4yzhwIal80Y5fWw4XAJ3g=";
x86_64-darwin = "sha256-a5Mu33gXn2X02WRdtO1hb9JRctmFTiCaLNhScz2D0J8=";
aarch64-darwin = "sha256-THEFn8nQDktXJlY1zpi2760KAS2eKEQ9O3Y+yqI2OYw=";
x86_64-linux = "sha256-rAqIkJ85l5eSojTowVZl5waK/fk00JI4fI1AY1ue/i4=";
aarch64-linux = "sha256-uGptQ5V4u6Vz5BI9xmMShB3gnIUjvA/LKeh+kj71XK8=";
x86_64-darwin = "sha256-Hcb4Vct9aTv4APJfNpydRY68jpEE3wZVctKhURohz4Y=";
aarch64-darwin = "sha256-OSrbI7pX9arCJt8ymRLEARo8admPDHvpDLqf3+iYzVQ=";
};
}

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }:
{ lib, stdenv, fetchurl, fetchpatch, SDL, ncurses, libtcod, makeDesktopItem }:
stdenv.mkDerivation rec {
pname = "brogue";
@ -8,6 +8,15 @@ stdenv.mkDerivation rec {
url = "https://sites.google.com/site/broguegame/brogue-${version}-linux-amd64.tbz2";
sha256 = "0i042zb3axjf0cpgpdh8hvfn66dbfizidyvw0iymjk2n760z2kx7";
};
patches = [
# Pull upstream fix for -fno-common toolchains:
# https://github.com/tmewett/BrogueCE/pull/63
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/tmewett/BrogueCE/commit/2c7ed0c48d9efd06bf0a2589ba967c0a22a8fa87.patch";
sha256 = "19lr2fa25dh79klm4f4kqyyqq7w5xmw9z0fvylkcckqvcv7dwhp3";
})
];
prePatch = ''
sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \

@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
'';
*/
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: mad.o:(.bss+0x233800): multiple definition of `tile_dict'; camera.o:(.bss+0x140): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = "-lm";
meta = {

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "wiki-tui";
version = "0.4.7";
version = "0.4.8";
src = fetchFromGitHub {
owner = "Builditluc";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qoj5rg0YeBWQuU/HU84wOSG9y9p4Q1DFbqsh61mYnUc=";
sha256 = "sha256-/u0segKHrrtXfEjOmpnQ/iFbsM+VfsZKTpyc1IfuOU8=";
};
buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-btSWvlObvn08cAWVMM4R0aciYz8swRFZjX+WDhALj3M=";
cargoSha256 = "sha256-3xvaEzqAz/U8CkdGYXLBnxrgW1raeKuzRsmD+0Sd4iQ=";
# Tests fail with this error: `found argument --test-threads which was not expected`
doCheck = false;

@ -2,31 +2,40 @@
stdenv.mkDerivation {
pname = "disk-indicator";
version = "unstable-2014-05-19";
version = "unstable-2018-12-18";
src = fetchFromGitHub {
owner = "MeanEYE";
repo = "Disk-Indicator";
rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da";
sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI=";
rev = "ec2d2f6833f038f07a72d15e2d52625c23e10b12";
sha256 = "sha256-cRqgIxF6H1WyJs5hhaAXVdWAlv6t22BZLp3p/qRlCSM=";
};
buildInputs = [ libX11 ];
patchPhase = ''
substituteInPlace ./makefile --replace "COMPILER=c99" "COMPILER=gcc -std=c99"
substituteInPlace ./makefile --replace "COMPILE_FLAGS=" "COMPILE_FLAGS=-O2 "
postPatch = ''
# avoid -Werror
substituteInPlace Makefile --replace "-Werror" ""
# avoid host-specific options
substituteInPlace Makefile --replace "-march=native" ""
'';
buildPhase = "make -f makefile";
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
postConfigure = ''
patchShebangs ./configure.sh
./configure.sh --all
'';
hardeningDisable = [ "fortify" ];
makeFlags = [
"COMPILER=${stdenv.cc.targetPrefix}cc"
];
installPhase = ''
runHook preInstall
mkdir -p "$out/bin"
cp ./disk_indicator "$out/bin/"
runHook postInstall
'';
meta = {

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }:
{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }:
stdenv.mkDerivation {
pname = "kmscube";
@ -10,6 +10,15 @@ stdenv.mkDerivation {
sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933";
};
patches = [
# Pull upstream patch for -fno-common toolchains.
(fetchpatch {
name = "fno-common.patch";
url = "https://gitlab.freedesktop.org/mesa/kmscube/-/commit/908ef39864442c0807954af5d3f88a3da1a6f8a5.patch";
sha256 = "1gxn3b50mvjlc25234839v5z29r8fd9di4176a3yx4gbsz8cc5vi";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libdrm libX11 libGL mesa ];

@ -0,0 +1,34 @@
{ stdenv
, lib
, makeWrapper
, fetchurl
, numactl
, python3
}:
stdenv.mkDerivation rec {
pname = "rt-tests";
version = "2.3";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/${pname}-${version}.tar.gz";
sha256 = "Q+rNdpRdsmW2gcsrfwg12EzpvO6qlEP/Mb/OWQMNmr8=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ numactl python3 ];
makeFlags = [ "prefix=$(out)" "DESTDIR=" "PYLIB=$(out)/${python3.sitePackages}" ];
postInstall = ''
wrapProgram "$out/bin/determine_maximum_mpps.sh" --prefix PATH : $out/bin
'';
meta = with lib; {
homepage = https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;
description = "Suite of real-time tests - cyclictest, hwlatdetect, pip_stress, pi_stress, pmqtest, ptsematest, rt-migrate-test, sendme, signaltest, sigwaittest, svsematest";
platforms = platforms.linux;
maintainers = with maintainers; [ poelzi ];
license = licenses.gpl2;
};
}

@ -0,0 +1,42 @@
{ lib
, buildGoModule
, fetchgit
, unstableGitUpdater
}:
buildGoModule {
pname = "bloat";
version = "unstable-2022-03-31";
src = fetchgit {
url = "git://git.freesoftwareextremist.com/bloat";
rev = "a38d29a43592601d37d671db8748f0980071c0c4";
sha256 = "sha256-7Hxt0QlOYMBMvDS40fpfSItGkd5nYFQmmjJIevNyeF8=";
};
vendorSha256 = null;
postInstall = ''
mkdir -p $out/share/bloat
cp -r templates $out/share/bloat/templates
cp -r static $out/share/bloat/static
sed \
-e "s%=templates%=$out/share/bloat/templates%g" \
-e "s%=static%=$out/share/bloat/static%g" \
< bloat.conf > $out/share/bloat/bloat.conf.example
'';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
description = "A web client for Pleroma and Mastodon";
longDescription = ''
A lightweight web client for Pleroma and Mastodon.
Does not require JavaScript to display text, images, audio and videos.
'';
homepage = "https://bloat.freesoftwareextremist.com";
downloadPage = "https://git.freesoftwareextremist.com/bloat/";
license = licenses.cc0;
maintainers = with maintainers; [ fgaz ];
};
}

@ -23,6 +23,7 @@
, pcre2
, python3
, readline
, rtrlib
# tests
, nettools
@ -62,6 +63,7 @@ stdenv.mkDerivation rec {
pcre2
python3
readline
rtrlib
] ++ lib.optionals stdenv.isLinux [
libcap
];
@ -78,6 +80,7 @@ stdenv.mkDerivation rec {
"--localstatedir=/run/frr"
"--sbindir=$(out)/libexec/frr"
"--sysconfdir=/etc/frr"
"--enable-rpki"
];
postPatch = ''

@ -1,25 +1,16 @@
{ lib, stdenv, nixosTests, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }:
{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }:
rustPlatform.buildRustPackage rec {
pname = "agate";
version = "3.2.3";
version = "3.2.4";
src = fetchFromGitHub {
owner = "mbrubeck";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nkWk/0TIAHcYQjxbg0HnT+4S4Cinl22WfqHb9U6u5eI=";
sha256 = "sha256-NyHs/9kRBGqmh44MSRzYb7CSvEB0RlmL9l5QpGEwDhY=";
};
cargoSha256 = "sha256-aF86QpizJ+lMNmN9DQKA9o1QZWZObyQ3v3+HmT/s02g=";
patches = [
# https://github.com/mbrubeck/agate/pull/143
(fetchpatch {
name = "fix-port-collision.patch";
url = "https://github.com/mbrubeck/agate/commit/2f5d7878ec9d0dd51762c4c7680fc9f825d8ecd5.patch";
sha256 = "sha256-NEFmfb0y97O2W96YggD+MgcN7tlFEi9T4FNzLCND77s=";
})
];
cargoSha256 = "sha256-V0MLXOLLmKnk4Iyhbu+EomsxOX6RLYHIsi/IwWiqmcg=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, makeWrapper
, pkg-config
@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
patches = [
./hardcode_mtab.patch
# Pull upstream fix for -fno-common toolchains:
# https://github.com/lcdproc/lcdproc/pull/148
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/lcdproc/lcdproc/commit/fda5302878692da933dc03cd011f8ddffefa07a4.patch";
sha256 = "0ld6p1r4rjsnjr63afw3lp5lx25jxjs07lsp9yc3q96r91r835cy";
})
];
# we don't need to see the GPL every time we launch lcdd in the foreground

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiki-js";
version = "2.5.279";
version = "2.5.282";
src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
sha256 = "sha256-4QYNKvAEeRSJS9lO30bI/SnM9rLmuvRMR/LsGT77wvY=";
sha256 = "sha256-cXNO8ChZ2FGAmTmcQDqnZrJpFynmdoocqFy59VCy1RE=";
};
sourceRoot = ".";

@ -78,13 +78,13 @@ let
in stdenv.mkDerivation rec {
pname = "zoneminder";
version = "1.36.10";
version = "1.36.15";
src = fetchFromGitHub {
owner = "ZoneMinder";
repo = "zoneminder";
rev = version;
sha256 = "sha256-MmBnbVDitKOctPe2dNe1sMNNs/qEYGVq3UMJxAkLlCc=";
sha256 = "1qlsg7gd9kpjdbq9d5yrjmc7g1pbscrg4sws7xrdln1z8509sv50";
fetchSubmodules = true;
};

@ -331,8 +331,8 @@ else let
# This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
configureFlags = let inherit (lib) optional elem; in
(/**/ if lib.isString configureFlags then [configureFlags]
else if configureFlags == null then []
(/**/ if lib.isString configureFlags then lib.warn "String 'configureFlags' is deprecated and will be removed in release 23.05. Please use a list of strings. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" [configureFlags]
else if configureFlags == null then lib.warn "Null 'configureFlags' is deprecated and will be removed in release 23.05. Please use a empty list instead '[]'. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" []
else configureFlags)
++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}"
++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"

@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
buildInputs = [ openldap ];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: ../../src/lib/libactive_directory.a(active_directory.o):/build/adtool-1.3.3/src/lib/active_directory.h:31:
# multiple definition of `system_config_file'; adtool.o:/build/adtool-1.3.3/src/tools/../../src/lib/active_directory.h:31: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
enableParallelBuilding = true;
postInstall = ''

@ -2,14 +2,14 @@
, fetchFromGitHub, glib, pkg-config }:
stdenv.mkDerivation rec {
version = "unstable-2016-12-12";
version = "unstable-2020-10-24";
pname = "bluez-tools";
src = fetchFromGitHub {
owner = "khvzak";
repo = "bluez-tools";
rev = "97efd293491ad7ec96a655665339908f2478b3d1";
sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6";
rev = "f65321736475429316f07ee94ec0deac8e46ec4a";
sha256 = "0xk39lz3hm8lcnb5fdbfz4ldbbq8gswg95vilzdwxzrglcr6xnqq";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libuuid ];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: extract.o:/build/jfsutils-1.1.15/fscklog/extract.c:67: multiple definition of
# `xchklog_buffer'; display.o:/build/jfsutils-1.1.15/fscklog/display.c:57: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; {
description = "IBM JFS utilities";
homepage = "http://jfs.sourceforge.net";

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.17.1";
version = "2.17.5";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "sha256-58l0E5wwRKbF/ja3fmMMBIONjuwVOxlwdKRT5BeO9MQ=";
sha256 = "sha256-dpkUbZz/bIiTMhZalXHGct77qMzYB6LATs7MPVyW1GY=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@ -18,13 +18,14 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-nft0wrgTMrI8Tav6NcqPwSF8Q367twIOr1voBsW2488=";
cargoSha256 = "sha256-xBiabY0aGPxrAHypuSg3AF/EcChDgtIK9cJDCeTNkm0=";
doCheck = false;
meta = with lib; {
description = "A tool to conveniently learn about the disk usage of directories, fast!";
homepage = "https://github.com/Byron/dua-cli";
changelog = "https://github.com/Byron/dua-cli/raw/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ killercup ];
};

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "esphome-dashboard";
version = "20220309.0";
version = "20220508.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-J/T3Av0jwT0CJSwc0j+YjaiKFqs9soLf7ctpiz5rmm4=";
sha256 = "sha256-nBVVNe6Qwo72ws6G8WAO99f2ftbxoixOB0eiLuILyeg=";
};
# no tests

@ -15,14 +15,14 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
version = "2022.4.0";
version = "2022.5.0";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-/IMiUMtWFouAjOlyq+BXvqQ1IddBXvua7y0i4J1cktM=";
sha256 = "sha256-ys4oGYZvOxKOLyeIFPR33L2uCAB1lybSo6nCIYFuA/0=";
};
postPatch = ''

@ -4,7 +4,7 @@
stdenvNoCC.mkDerivation rec {
pname = "neofetch";
version = "unstable-2020-12-10";
version = "unstable-2021-12-10";
src = fetchFromGitHub {
owner = "dylanaraps";
@ -19,8 +19,16 @@ stdenvNoCC.mkDerivation rec {
sha256 = "1fapdg9z79f0j3vw7fgi72b54aw4brn42bjsj48brbvg3ixsciph";
name = "avoid_overwriting_gio_extra_modules_env_var.patch";
})
# https://github.com/dylanaraps/neofetch/pull/2114
(fetchpatch {
url = "https://github.com/dylanaraps/neofetch/commit/c4eb4ec7783bb94cca0dbdc96db45a4d965956d2.patch";
sha256 = "sha256-F6Q4dUtfmR28VxLbITiLFJ44FjG4T1Cvuz3a0nLisMs=";
name = "update_old_nixos_logo.patch";
})
];
outputs = [ "out" "man" ];
strictDeps = true;
buildInputs = [ bash ];
nativeBuildInputs = [ makeWrapper ];

@ -1,5 +1,5 @@
{ buildPythonApplication
, drawio
, drawio-headless
, fetchFromGitHub
, lib
, pandoc
@ -21,32 +21,13 @@ let
sha256 = "sha256-2XJSAfxqEmmamWIAM3vZqi0mZjUUugmR3zWw8Imjadk=";
};
wrappedDrawio = writeScriptBin "drawio" ''
#!${runtimeShell}
# Electron really wants a configuration directory to not die with:
# "Error: Failed to get 'appData' path"
# so we give it some temp dir as XDG_CONFIG_HOME
tmpdir=$(mktemp -d)
function cleanup {
rm -rf "$tmpdir"
}
trap cleanup EXIT
# Drawio needs to run in a virtual X session, because Electron
# refuses to work and dies with an unhelpful error message otherwise:
# "The futex facility returned an unexpected error code."
XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run ${drawio}/bin/drawio $@
'';
pandoc-drawio-filter = buildPythonApplication {
pname = "pandoc-drawio-filter";
inherit src version;
propagatedBuildInputs = [
wrappedDrawio
drawio-headless
pandocfilters
];

@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
description = "Windows Imaging Format bootloader";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ das_j ajs124 ];
platforms = platforms.x86; # Fails on aarch64
platforms = [ "x86_64-linux" ];
};
}

@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
url = "https://github.com/Yubico/yubikey-personalization/commit/0aa2e2cae2e1777863993a10c809bb50f4cde7f8.patch";
sha256 = "1wnigf3hbq59i15kgxpq3pwrl1drpbj134x81mmv9xm1r44cjva8";
})
# Pull upstream fix for -fno-common toolchain support:
# https://github.com/Yubico/yubikey-personalization/issues/155
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/Yubico/yubikey-personalization/commit/09ea16d9e2030e4da6ad00c1e5147e962aa7ff84.patch";
sha256 = "0n3ka8n7f3ndbxv3k0bi77d850kr2ypglkw81gqycpqyaciidqwa";
})
];
nativeBuildInputs = [ pkg-config ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libpcap, withTcl ? true, tcl }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, libpcap, withTcl ? true, tcl }:
stdenv.mkDerivation rec {
pname = "hping";
@ -10,6 +10,15 @@ stdenv.mkDerivation rec {
rev = "3547c7691742c6eaa31f8402e0ccbb81387c1b99"; # there are no tags/releases
sha256 = "0y0n1ybij3yg9lfgzcwfmjz1sjg913zcqrv391xx83dm0j80sdpb";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchain
# support: https://github.com/antirez/hping/pull/64
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/antirez/hping/pull/64/commits/d057b9309aec3a5a53aaee1ac3451a8a5b71b4e8.patch";
sha256 = "0bqr7kdlziijja588ipj8g5hv2109wq01c6x2qadbhjfnsps1b6l";
})
];
buildInputs = [ libpcap ] ++ lib.optional withTcl tcl;

@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
buildInputs = [ncurses libpcap];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: tui.o:/build/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash';
# iftop.o:/build/iftop-1.0pre4/ui_common.h:41: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
passthru.tests = { inherit (nixosTests) iftop; };
meta = with lib; {

@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
buildInputs = [ bison flex ];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: netmap.o:(.bss+0x20): multiple definition of `sizecheck'; iouyap.o:(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
installPhase = ''
install -D -m555 iouyap $out/bin/iouyap;
'';

@ -31,7 +31,12 @@ stdenv.mkDerivation rec {
export lsh_cv_sys_unix98_ptys=yes
'';
NIX_CFLAGS_COMPILE = "-std=gnu90";
# -fcommon: workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: liblsh.a(unix_user.o):/build/lsh-2.0.4/src/server_userauth.h:108: multiple definition of
# `server_userauth_none_preauth'; lshd.o:/build/lsh-2.0.4/src/server_userauth.h:108: first defined here
# Should be present in upcoming 2.1 release.
NIX_CFLAGS_COMPILE = "-std=gnu90 -fcommon";
buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ];

@ -54,11 +54,11 @@ let
in
stdenv.mkDerivation rec {
pname = "networkmanager";
version = "1.36.4";
version = "1.38.0";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "YTBOk33ZJkcdVnFb3t57q3zKyCc1bmfycA00MxfNPFk=";
sha256 = "sha256-gqTPB93+sIFnh7Z8D1BYrmxQ1iWcCwVBok41FWBisu8=";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "alejandra";
version = "1.2.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "kamadorueda";
repo = "alejandra";
rev = version;
sha256 = "sha256-35hEJuMvRswOPKb9lbB9ZuHVe0eJN6WJc4T8Frn0hYQ=";
sha256 = "sha256-0AolxQtKj3Oek0WSbODDpPVO5Ih8PXHOA3qXEKPB4dQ=";
};
cargoSha256 = "sha256-SsIpggbRQPjpCYgCG4sSJ022MmMV4bJJ8UAHcJR74O8=";
cargoSha256 = "sha256-USI98hozlTaTj07tMbCQEWDgRkHsd4PFW1HUpKsNZJA=";
passthru.tests = {
version = testers.testVersion { package = alejandra; };

@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: ../readelf-mini/libreadelf-mini.a(dwarf.o):/build/source/readelf-mini/dwarf.c:64:
# multiple definition of `do_wide'; ../readelf-mini/libreadelf-mini.a(readelf-mini.o):/build/source/readelf-mini/readelf-mini.c:170: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
installPhase = ''
install -d $out/bin
install -t $out/bin cde cde-exec
@ -36,7 +42,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = [ maintainers.rlupton20 ];
platforms = platforms.linux;
# error: architecture aarch64 is not supported by strace
# error: architecture aarch64 is not supported by bundled strace
badPlatforms = [ "aarch64-linux" ];
};
}

@ -9,13 +9,13 @@
buildPythonApplication rec {
pname = "nix-update";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
sha256 = "sha256-D1N7ISLZJ3A8G9X5dvtCbRse5h0MRJoeZM3CHkFpqlE=";
sha256 = "sha256-d2S18cBkFJOIGFKrwj9U4bRvdPjrbuWfRUVug1JEw0s=";
};
makeWrapperArgs = [

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-05-13";
version = "2022-05-18";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-hSsVgH6iyfTrHwu/fNc00zhheys8mYYmuDAKJqSWGqo=";
sha256 = "sha256-E2QPeSlsJCRhnwgxr1NerLkSFbLLaTSLl8oeYsHQM+U=";
};
nativeBuildInputs = [ makeWrapper ];

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, bison, flex, pkg-config
, curl, geoip, libmaxminddb, libxml2, lmdb, lua, pcre
, ssdeep, valgrind, yajl
, ssdeep, yajl
, nixosTests
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];
buildInputs = [ curl geoip libmaxminddb libxml2 lmdb lua pcre ssdeep valgrind yajl ];
buildInputs = [ curl geoip libmaxminddb libxml2 lmdb lua pcre ssdeep yajl ];
outputs = [ "out" "dev" ];

@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
substituteInPlace makefile --replace /usr/local ""
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: /build/ccltHly5.o:(.bss+0x119f8): multiple definition of `start_time'; /build/cc9evx3L.o:(.bss+0x10978): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
makeFlags = [ "DESTDIR=$(out)" ];
meta = with lib; {

@ -2,6 +2,7 @@
, buildPythonApplication
, fetchFromGitHub
, lxml
, setuptools
, six
}:
@ -16,8 +17,9 @@ buildPythonApplication rec {
hash = "sha256-xqudHYfwOce2C0pcFzId0JDIIC6R5bllmVKsH+CvTdE=";
};
buildInputs = [
propagatedBuildInputs = [
lxml
setuptools
six
];
@ -36,6 +38,6 @@ buildPythonApplication rec {
readable diffs in those situations.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres anpryl ];
};
}

@ -170,6 +170,7 @@ mapAliases ({
cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22
cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11
ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22
cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
# these are for convenience, not for backward compat and shouldn't expire

@ -7767,6 +7767,10 @@ with pkgs;
mtail = callPackage ../servers/monitoring/mtail { };
mujmap = callPackage ../applications/networking/mujmap {
inherit (darwin.apple_sdk.frameworks) Security;
};
multitail = callPackage ../tools/misc/multitail { };
mx-puppet-discord = callPackage ../servers/mx-puppet-discord { };
@ -16883,7 +16887,7 @@ with pkgs;
cpp-hocon = callPackage ../development/libraries/cpp-hocon { };
cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { };
cpp-ipfs-http-client = callPackage ../development/libraries/cpp-ipfs-http-client { };
cpp-netlib = callPackage ../development/libraries/cpp-netlib {
boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found
@ -20292,6 +20296,8 @@ with pkgs;
rinutils = callPackage ../development/libraries/rinutils { };
rtrlib = callPackage ../development/libraries/rtrlib { };
kissfft = callPackage ../development/libraries/kissfft { };
lambdabot = callPackage ../development/tools/haskell/lambdabot {
@ -21587,6 +21593,8 @@ with pkgs;
bird = callPackage ../servers/bird { };
bloat = callPackage ../servers/bloat { };
bosun = callPackage ../servers/monitoring/bosun { };
cayley = callPackage ../servers/cayley { };
@ -23659,6 +23667,8 @@ with pkgs;
rtkit = callPackage ../os-specific/linux/rtkit { };
rt-tests = callPackage ../os-specific/linux/rt-tests { };
rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };
rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { };
@ -25818,6 +25828,7 @@ with pkgs;
drawing = callPackage ../applications/graphics/drawing { };
drawio = callPackage ../applications/graphics/drawio {};
drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { };
drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { };
drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile {

Loading…
Cancel
Save