Merge master into staging-next

Changed files
+335 -140
maintainers
nixos
modules
services
x11
desktop-managers
virtualisation
tests
pkgs
applications
editors
misc
fetchmail
gpxsee
stork
networking
cluster
development
compilers
aspectj
python-modules
python-crfsuite
tools
typos
servers
monitoring
mimir
rustypaste
tools
misc
pre-commit
security
fail2ban
virtualization
multipass
top-level
+6
maintainers/maintainer-list.nix
···
githubId = 2308444;
name = "Joshua Gilman";
};
+
jnsgruk = {
+
email = "jon@sgrs.uk";
+
github = "jnsgruk";
+
githubId = 668505;
+
name = "Jon Seager";
+
};
jo1gi = {
email = "joakimholm@protonmail.com";
github = "jo1gi";
+1
nixos/modules/module-list.nix
···
./virtualisation/lxc.nix
./virtualisation/lxcfs.nix
./virtualisation/lxd.nix
+
./virtualisation/multipass.nix
./virtualisation/nixos-containers.nix
./virtualisation/oci-containers.nix
./virtualisation/openstack-options.nix
-73
nixos/modules/services/x11/desktop-managers/plasma5.nix
···
libsForQt5 = pkgs.plasma5Packages;
inherit (libsForQt5) kdeGear kdeFrameworks plasma5;
-
inherit (pkgs) writeText;
inherit (lib)
getBin optionalString literalExpression
mkRemovedOptionModule mkRenamedOptionModule
mkDefault mkIf mkMerge mkOption mkPackageOptionMD types;
-
ini = pkgs.formats.ini { };
-
-
gtkrc2 = writeText "gtkrc-2.0" ''
-
# Default GTK+ 2 config for NixOS Plasma 5
-
include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc"
-
style "user-font"
-
{
-
font_name="Sans Serif Regular"
-
}
-
widget_class "*" style "user-font"
-
gtk-font-name="Sans Serif Regular 10"
-
gtk-theme-name="Breeze"
-
gtk-icon-theme-name="breeze"
-
gtk-fallback-icon-theme="hicolor"
-
gtk-cursor-theme-name="breeze_cursors"
-
gtk-toolbar-style=GTK_TOOLBAR_ICONS
-
gtk-menu-images=1
-
gtk-button-images=1
-
'';
-
-
gtk3_settings = ini.generate "settings.ini" {
-
Settings = {
-
gtk-font-name = "Sans Serif Regular 10";
-
gtk-theme-name = "Breeze";
-
gtk-icon-theme-name = "breeze";
-
gtk-fallback-icon-theme = "hicolor";
-
gtk-cursor-theme-name = "breeze_cursors";
-
gtk-toolbar-style = "GTK_TOOLBAR_ICONS";
-
gtk-menu-images = 1;
-
gtk-button-images = 1;
-
};
-
};
-
-
kcminputrc = ini.generate "kcminputrc" {
-
Mouse = {
-
cursorTheme = "breeze_cursors";
-
cursorSize = 0;
-
};
-
};
-
activationScript = ''
${set_XDG_CONFIG_HOME}
···
# expected to set the default themselves.
# 2. Contaminate / if $HOME is unset; do not check if $HOME is set.
XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config}
-
'';
-
-
startplasma = ''
-
${set_XDG_CONFIG_HOME}
-
mkdir -p "''${XDG_CONFIG_HOME}"
-
'' + optionalString config.hardware.pulseaudio.enable ''
-
# Load PulseAudio module for routing support.
-
# See also: http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
-
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
-
'' + ''
-
${activationScript}
-
-
# Create default configurations if Plasma has never been started.
-
kdeglobals="''${XDG_CONFIG_HOME}/kdeglobals"
-
if ! [ -f "$kdeglobals" ]; then
-
kcminputrc="''${XDG_CONFIG_HOME}/kcminputrc"
-
if ! [ -f "$kcminputrc" ]; then
-
cat ${kcminputrc} >"$kcminputrc"
-
fi
-
-
gtkrc2="$HOME/.gtkrc-2.0"
-
if ! [ -f "$gtkrc2" ]; then
-
cat ${gtkrc2} >"$gtkrc2"
-
fi
-
-
gtk3_settings="''${XDG_CONFIG_HOME}/gtk-3.0/settings.ini"
-
if ! [ -f "$gtk3_settings" ]; then
-
mkdir -p "$(dirname "$gtk3_settings")"
-
cat ${gtk3_settings} >"$gtk3_settings"
-
fi
-
fi
'';
in
···
# Update the start menu for each user that is currently logged in
system.userActivationScripts.plasmaSetup = activationScript;
-
services.xserver.displayManager.setupCommands = startplasma;
nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
})
+61
nixos/modules/virtualisation/multipass.nix
···
+
{ config
+
, lib
+
, pkgs
+
, ...
+
}:
+
+
let
+
cfg = config.virtualisation.multipass;
+
in
+
{
+
options = {
+
virtualisation.multipass = {
+
enable = lib.mkEnableOption (lib.mdDoc ''
+
Multipass, a simple manager for virtualised Ubuntu instances.
+
'');
+
+
logLevel = lib.mkOption {
+
type = lib.types.enum [ "error" "warning" "info" "debug" "trace" ];
+
default = "debug";
+
description = lib.mdDoc ''
+
The logging verbosity of the multipassd binary.
+
'';
+
};
+
+
package = lib.mkPackageOptionMD pkgs "multipass" { };
+
};
+
};
+
+
config = lib.mkIf cfg.enable {
+
environment.systemPackages = [ cfg.package ];
+
+
systemd.services.multipass = {
+
description = "Multipass orchestrates virtual Ubuntu instances.";
+
+
wantedBy = [ "multi-user.target" ];
+
wants = [ "network.target" ];
+
after = [ "network.target" ];
+
+
environment = {
+
"XDG_DATA_HOME" = "/var/lib/multipass/data";
+
"XDG_CACHE_HOME" = "/var/lib/multipass/cache";
+
"XDG_CONFIG_HOME" = "/var/lib/multipass/config";
+
};
+
+
serviceConfig = {
+
ExecStart = "${cfg.package}/bin/multipassd --logger platform --verbosity ${cfg.logLevel}";
+
SyslogIdentifer = "multipassd";
+
Restart = "on-failure";
+
TimeoutStopSec = 300;
+
Type = "simple";
+
+
WorkingDirectory = "/var/lib/multipass";
+
+
StateDirectory = "multipass";
+
StateDirectoryMode = "0750";
+
CacheDirectory = "multipass";
+
CacheDirectoryMode = "0750";
+
};
+
};
+
};
+
}
+1
nixos/tests/all-tests.nix
···
mpd = handleTest ./mpd.nix {};
mpv = handleTest ./mpv.nix {};
mtp = handleTest ./mtp.nix {};
+
multipass = handleTest ./multipass.nix {};
mumble = handleTest ./mumble.nix {};
musescore = handleTest ./musescore.nix {};
munin = handleTest ./munin.nix {};
+37
nixos/tests/multipass.nix
···
+
import ./make-test-python.nix ({ pkgs, lib, ... }:
+
+
let
+
multipass-image = import ../release.nix {
+
configuration = {
+
# Building documentation makes the test unnecessarily take a longer time:
+
documentation.enable = lib.mkForce false;
+
};
+
};
+
+
in
+
{
+
name = "multipass";
+
+
meta.maintainers = [ lib.maintainers.jnsgruk ];
+
+
nodes.machine = { lib, ... }: {
+
virtualisation = {
+
cores = 1;
+
memorySize = 1024;
+
diskSize = 4096;
+
+
multipass.enable = true;
+
};
+
};
+
+
testScript = ''
+
machine.wait_for_unit("sockets.target")
+
machine.wait_for_unit("multipass.service")
+
machine.wait_for_file("/var/lib/multipass/data/multipassd/network/multipass_subnet")
+
+
# Wait for Multipass to settle
+
machine.sleep(1)
+
+
machine.succeed("multipass list")
+
'';
+
})
+57 -45
pkgs/applications/editors/vim/plugins/generated.nix
···
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
-
version = "2023-02-03";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
-
rev = "bb952ae19d2b227b549133a3b0ed69a3436d208e";
-
sha256 = "0lg5ibn3q1kw951k7j11f7c24qmf4sy9y3y2pqlpvk9bvc095jyl";
+
rev = "5c5723bd464fd048f5d62fcf20c41495d3386a33";
+
sha256 = "1vpay869faixkxpvxlwpk44pidjgnrhkchnchfsbd6c2brhgzz11";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
···
aurora = buildVimPluginFrom2Nix {
pname = "aurora";
-
version = "2023-02-02";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "ray-x";
repo = "aurora";
-
rev = "ef44f07a563d59b23c3f17792f4ff3b5fb4280a1";
-
sha256 = "14w830fnr19rnjqwg5yqns4xf27nhvc169qrmkjn8y054i6yjsg2";
+
rev = "f7b2df980aa0518a1a208974dfcbc51ff91b531e";
+
sha256 = "1d0p7d7kicqy4bbh3kaxn9as71afjljp38lhcc595l2b8nlaf2hc";
};
meta.homepage = "https://github.com/ray-x/aurora/";
};
···
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
-
version = "2023-02-01";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
-
rev = "80858aa01d57ed2f93c6bc388bad373810d41a21";
-
sha256 = "0rcikmjdhcw39kngx93snpnn0sh780drqnn342gg9ifnysbva3d9";
+
rev = "9f702344b9550800e9ca928cd21fd6dcc8dffaef";
+
sha256 = "10s0nqhybry6m6p13gvmchmc6in7zn7pgi1930svy7czqblcg6rw";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
···
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
-
version = "2023-02-03";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
-
rev = "67b7623184406dda85ae0ea678cb82a6f2a509d0";
-
sha256 = "0gzna1qyialp6b4iap9jnfhf3w7anp7xlg6hdal2r0i60h9f0igm";
+
rev = "d11f4eb12d73c5dcf5d6691378b18447446ec919";
+
sha256 = "08kkp57k4138cb4jgv3q3x3h2qx7f29kr914lzqzrb7q4ybzm6b8";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
···
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
-
version = "2023-02-03";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
-
rev = "5d7b14dfa88a32040647649b1e714051235bfd32";
-
sha256 = "1iknwbwiq2rykf36vr3agdzlyb54mkppjywh4qdgqgach71016l3";
+
rev = "d69d20170e12a20fa305e90870d6016e636cc328";
+
sha256 = "18i9rjjv7g5hr1gyb98w3mh50m1iwk643rb93z1n7f38ln55xzw8";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
···
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
+
indent-o-matic = buildVimPluginFrom2Nix {
+
pname = "indent-o-matic";
+
version = "2023-01-24";
+
src = fetchFromGitHub {
+
owner = "Darazaki";
+
repo = "indent-o-matic";
+
rev = "3103dde7a47f2855097558ab52162bbbdbe8dc40";
+
sha256 = "1nfwzqki00x5vv75iawyky122v68qcajihfcdqxixlqln3srrmi4";
+
};
+
meta.homepage = "https://github.com/Darazaki/indent-o-matic/";
+
};
+
indentLine = buildVimPluginFrom2Nix {
pname = "indentLine";
version = "2022-09-07";
···
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
-
version = "2023-02-03";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
-
rev = "a16d133b426fe5ddfd97d30e3658772d403847f3";
-
sha256 = "03dbdllmvp68cfzf8m3sz8v9795h4mp28gd27bcvxyfjiif7r5lj";
+
rev = "de8dbd4ba6583619ed02323dbde737d586ba572f";
+
sha256 = "1ms7chmmilq8slf659m8d45i39pllgng7a95fc20ykwbakhi8m9b";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
···
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
-
version = "2023-02-03";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
-
rev = "d9a8d651501cd2f287742472af4b3103d991cd68";
-
sha256 = "1pi2b2j647cwc58cp5iwgrrfls7lfwh7573r092k3c42i2x9k8cd";
+
rev = "70cab52c9d19e982f306716534e90c37a254b046";
+
sha256 = "13xrc45s5fx8y2dl1ds155r5w0yrivq2b1aqvqjk7ywgyyq2wr5l";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
···
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
-
version = "2023-02-03";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
-
rev = "dcd316d381c5768cd6a11d53a3331e92c3943f3b";
-
sha256 = "06cd6hyckmp2jvrh8k2sp465yarkznk6adwh0lmd95i6wrb1zhky";
+
rev = "9e3f9160360117276c6c1b795426b7be897cbb24";
+
sha256 = "1rw742ck7d8h6akqcskqxpxw41wakwg0nagb82fgq4blisjppgid";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
···
nvim-nonicons = buildVimPluginFrom2Nix {
pname = "nvim-nonicons";
-
version = "2022-12-22";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "yamatsum";
repo = "nvim-nonicons";
-
rev = "68ecb6476f1b96d03c702dce6cf3ef1e5171c9a8";
-
sha256 = "1vmzl5b3a07kh8b4wqqxd05sygvlyxq9vkrsshn2lrxmpbdg6227";
+
rev = "ceda07dc7339f35444b5f4c4016f76a9eb42ac16";
+
sha256 = "0kcagkzgvib0jg9aywfvrk4bx7pdyk7zj5b5i4wzacdcyx5yb7mx";
};
meta.homepage = "https://github.com/yamatsum/nvim-nonicons/";
};
···
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
-
version = "2023-01-31";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
-
rev = "215b29bfad74518442621b9d0483a621483b066b";
-
sha256 = "00rvb70s9wg9vqnsm6a63vakpjyznvpc4yplbmqjqa4dnfwp9kl2";
+
rev = "7eb33d2a6d5d574a43159da90e0eac2445367393";
+
sha256 = "0x6lji8s86vgih7fv9yvvjkyh9bqlzrsmn04im1zif087wa1dcw1";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
···
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2";
-
version = "2023-02-03";
+
version = "2023-02-04";
src = fetchgit {
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
-
rev = "b915c4d4926f723c0a424e1a639384018e7d9efc";
-
sha256 = "0sllv769q0v73alcxs1r8dpij8kp9f771sq93z9c413c35wwmcnz";
+
rev = "7d33fb4402676723b0d7ca4d95717f5e020cd123";
+
sha256 = "0h4kfmh75p6c00f1xa6609y7zq9nm3p0r8yj17bwy30hpi51vnqv";
};
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
};
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
-
version = "2023-01-28";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-web-devicons";
-
rev = "a421d183ef37dfa13f51a5805bed2381aebf9080";
-
sha256 = "0754m29aizcav7ynqflpbv3kzz2n7mw2xx8aliay3slzq18kix8d";
+
rev = "2b96193abe4372e18e4f4533895a42a466d53c17";
+
sha256 = "18vh5xpyzlmfwdz2n30fi7a6v7w5mnami857cczqy2bk5bc1xdvd";
};
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
};
···
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
-
version = "2023-02-03";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
-
rev = "7bf2074f340447c10b3af4ace96cc61e5f325693";
-
sha256 = "0ry67a7g0dpgaiwfcr79pgpw54x5v8dmfg4pypyd039ini0l0w46";
+
rev = "eec8223171cca6e662dfca22ddde93c3a81f66d0";
+
sha256 = "1fm1l1am2hf7j95cf51q9i5l1sr5zh2y4r0xp78cm3bcwjyhnf7a";
meta.homepage = "https://github.com/fatih/vim-go/";
···
chad = buildVimPluginFrom2Nix {
pname = "chad";
-
version = "2023-02-02";
+
version = "2023-02-03";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
-
rev = "e82eb7f40313a52f80e2e14e6d8b5d014c83b053";
-
sha256 = "02p7fvbampijqbkbjfq74hjm7h1ak6p5m6w5pv9askfc4vw0mcnj";
+
rev = "baae8d0a8afb062f5be6d83189e626dd74f41f98";
+
sha256 = "024iis733yvvkqil2m0wxh7lpkz0j7ij2if4yds07izbyyrpdxg6";
meta.homepage = "https://github.com/ms-jpq/chadtree/";
···
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
-
version = "2023-02-03";
+
version = "2023-02-04";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
-
rev = "2afe6de953b76d43822cf8377c019ff831a7c73b";
-
sha256 = "1japfd2f7yw2vbyk7mh1qr0x6dnnra1k7frl3k077spc3nanh57r";
+
rev = "e1920ebe46e3f22dbfa2dc3633f5d2539302c8f3";
+
sha256 = "125zmsr09rglj0q4lhbvpvkhwm684rgwzcdlps9pbqzk88h2cl94";
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
+1
pkgs/applications/editors/vim/plugins/vim-plugin-names
···
https://github.com/haya14busa/incsearch-easymotion.vim/,,
https://github.com/haya14busa/incsearch.vim/,,
https://github.com/lukas-reineke/indent-blankline.nvim/,,
+
https://github.com/Darazaki/indent-o-matic/,,
https://github.com/Yggdroot/indentLine/,,
https://github.com/ciaranm/inkpot/,,
https://github.com/jbyuki/instant.nvim/,HEAD,
+2 -2
pkgs/applications/misc/fetchmail/default.nix
···
stdenv.mkDerivation rec {
pname = "fetchmail";
-
version = "6.4.35";
+
version = "6.4.36";
src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
-
sha256 = "sha256-ewtWy8D8qFRQTxZ3lfq1MtWlTVp9O24+NqM/NKCWCgE=";
+
sha256 = "sha256-cA1DODjT4p4wRFKuxWshh09TjsJBE/3LslE5xfLtwjo=";
};
buildInputs = [ openssl python3 ];
+2 -2
pkgs/applications/misc/gpxsee/default.nix
···
in
stdenv.mkDerivation rec {
pname = "gpxsee";
-
version = "11.11";
+
version = "11.12";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
-
hash = "sha256-5kT1vcbCc0Fa3ylrcQetth50IQu57upiWRRpub93jlE=";
+
hash = "sha256-W35KBPYvTKrSi7UnzcUz8MsUwoq8rY5g/+hL1/gVpbI=";
};
patches = (substituteAll {
+8 -3
pkgs/applications/misc/stork/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "stork";
-
version = "1.5.0";
+
version = "1.6.0";
src = fetchFromGitHub {
owner = "jameslittle230";
repo = "stork";
rev = "v${version}";
-
sha256 = "sha256-4aNY66y4dY+/MsZZGb5GBIlpZI+bAySff9+BEQUlx9M=";
+
sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw=";
};
-
cargoSha256 = "sha256-XyFZSQylBetf9tJLaV97oHbpe0aBadEZ60NyyxK8lfo=";
+
cargoSha256 = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4=";
+
+
checkFlags = [
+
# Fails for 1.6.0, but binary works fine
+
"--skip=pretty_print_search_results::tests::display_pretty_search_results_given_output"
+
];
nativeBuildInputs = [ pkg-config ];
+2 -2
pkgs/applications/networking/cluster/werf/default.nix
···
buildGoModule rec {
pname = "werf";
-
version = "1.2.198";
+
version = "1.2.199";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
-
hash = "sha256-fJDcVqHVN+2KXoqFCTACDevFtOllEGDMcQO/oDb6GMI=";
+
hash = "sha256-oUdqaoIvYTpJXWzfmgCwDJza5mTQItHgf2p9/HBMc/g=";
};
vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk=";
+2 -2
pkgs/development/compilers/aspectj/default.nix
···
stdenv.mkDerivation rec {
pname = "aspectj";
-
version = "1.9.9.1";
+
version = "1.9.19";
builder = ./builder.sh;
src = let
versionSnakeCase = builtins.replaceStrings ["."] ["_"] version;
in fetchurl {
url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar";
-
sha256 = "sha256-kiMQuEPXoSpHUiInkfYsrfCAcSc6mX42TRIBbeIQhWs=";
+
sha256 = "sha256-Oujyg05yvtcyfLmqonc++GX9AyFKwfIzITOHDz0px0M=";
};
inherit jre;
+2 -2
pkgs/development/python-modules/python-crfsuite/default.nix
···
buildPythonPackage rec {
pname = "python-crfsuite";
-
version = "0.9.8";
+
version = "0.9.9";
format = "setuptools";
src = fetchPypi {
inherit pname version;
-
sha256 = "sha256-DgPPbro2KHF8zwbfoPSiuoYohgrbF0y/0lCnpGkoZaE=";
+
sha256 = "sha256-yqYmHWlVRmdW+Ya3/PvU/VBiKWPjvbXMGAwSnGKzp20=";
};
preCheck = ''
+3 -3
pkgs/development/tools/typos/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "typos";
-
version = "1.13.9";
+
version = "1.13.10";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
-
hash = "sha256-dAe19D9q5JXeWCnsfbz0NnAtnAQj0dyIy6cdyjqVxEg=";
+
hash = "sha256-+TNKHyLqW/R/YEpynr4twvQpgeOxbyIlgQjaQarSB8M=";
};
-
cargoHash = "sha256-gc3tDTsmgvMfLbWh5XALEpZuK6e8FXsomfq4U/xTPXM=";
+
cargoHash = "sha256-7D9oyQK9VWOSAI9jSYZn7t8ll4sILpugroLWlST4Eok=";
meta = with lib; {
description = "Source code spell checker";
+2 -2
pkgs/servers/monitoring/mimir/default.nix
···
{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }:
buildGoModule rec {
pname = "mimir";
-
version = "2.5.0";
+
version = "2.6.0";
src = fetchFromGitHub {
rev = "${pname}-${version}";
owner = "grafana";
repo = pname;
-
sha256 = "sha256-lyF7ugnNEJug1Vx24ISrtENk6RoIt7H1zaCPYUZbBmM=";
+
sha256 = "sha256-MOuLXtjmk9wjQMF2ez3NQ7YTKJtX/RItKbgfaANXzhU=";
};
vendorSha256 = null;
+3 -3
pkgs/servers/rustypaste/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "rustypaste";
-
version = "0.8.2";
+
version = "0.8.4";
src = fetchFromGitHub{
owner = "orhun";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-EKW/Cik4La66bI7EVbFnhivk1o0nIudJdBW7F5dbQaI=";
+
sha256 = "sha256-tx2ipgvYDdCwcWFeZ/qgGXyKe+kHLuOgDAz/8vf2zEs=";
};
-
cargoSha256 = "sha256-zIrvBHPthPAzReojmBLb0odDQGcGwZS10rP15qb/zgs=";
+
cargoHash = "sha256-/zji2sFaOweBo666LqfNRpO/0vi1eAGgOReeuvQIaEQ=";
# Some tests need network
checkFlags = [
+2 -1
pkgs/tools/misc/pre-commit/default.nix
···
libiconv
];
-
doCheck = true;
+
# i686-linux: dotnet-sdk not available
+
doCheck = stdenv.buildPlatform.system != "i686-linux";
postPatch = ''
substituteInPlace pre_commit/resources/hook-tmpl \
+7
pkgs/tools/security/fail2ban/default.nix
···
{ lib, stdenv, fetchFromGitHub
, python3
, fetchpatch
+
, installShellFiles
}:
python3.pkgs.buildPythonApplication rec {
···
rev = version;
sha256 = "q4U9iWCa1zg8sA+6pPNejt6v/41WGIKN5wITJCrCqQE=";
};
+
+
outputs = [ "out" "man" ];
+
+
nativeBuildInputs = [ installShellFiles ];
pythonPath = with python3.pkgs;
lib.optionals stdenv.isLinux [
···
''
# see https://github.com/NixOS/nixpkgs/issues/4968
rm -r "${sitePackages}/etc"
+
+
installManPage man/*.[1-9]
'' + lib.optionalString stdenv.isLinux ''
# see https://github.com/NixOS/nixpkgs/issues/4968
rm -r "${sitePackages}/usr"
+128
pkgs/tools/virtualization/multipass/default.nix
···
+
{ cmake
+
, dnsmasq
+
, fetchFromGitHub
+
, git
+
, gtest
+
, iproute2
+
, iptables
+
, lib
+
, libapparmor
+
, libvirt
+
, libxml2
+
, nixosTests
+
, openssl
+
, OVMF
+
, pkg-config
+
, qemu
+
, qemu-utils
+
, qtbase
+
, qtx11extras
+
, slang
+
, stdenv
+
, wrapQtAppsHook
+
, xterm
+
}:
+
+
let
+
pname = "multipass";
+
version = "1.11.0";
+
in
+
stdenv.mkDerivation {
+
inherit pname version;
+
+
src = fetchFromGitHub {
+
owner = "canonical";
+
repo = "multipass";
+
rev = "refs/tags/v${version}";
+
sha256 = "sha256-2d8piIIecoSI3BfOgAVlXl5P2UYDaNlxUgHXWbnSdkg=";
+
fetchSubmodules = true;
+
};
+
+
preConfigure = ''
+
substituteInPlace ./CMakeLists.txt \
+
--replace "determine_version(MULTIPASS_VERSION)" "" \
+
--replace 'set(MULTIPASS_VERSION ''${MULTIPASS_VERSION})' 'set(MULTIPASS_VERSION "v${version}")'
+
+
substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \
+
--replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \
+
--replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd"
+
'';
+
+
postPatch = ''
+
# Patch all of the places where Multipass expects the LXD socket to be provided by a snap
+
substituteInPlace ./src/network/network_access_manager.cpp \
+
--replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket"
+
+
substituteInPlace ./src/platform/backends/lxd/lxd_virtual_machine.cpp \
+
--replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket"
+
+
substituteInPlace ./src/platform/backends/lxd/lxd_request.h \
+
--replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket"
+
+
substituteInPlace ./tests/CMakeLists.txt \
+
--replace "FetchContent_MakeAvailable(googletest)" ""
+
+
cat >> tests/CMakeLists.txt <<'EOF'
+
add_library(gtest INTERFACE)
+
target_include_directories(gtest INTERFACE ${gtest.dev}/include)
+
target_link_libraries(gtest INTERFACE ${gtest}/lib/libgtest.so ''${CMAKE_THREAD_LIBS_INIT})
+
add_dependencies(gtest GMock)
+
+
add_library(gtest_main INTERFACE)
+
target_include_directories(gtest_main INTERFACE ${gtest.dev}/include)
+
target_link_libraries(gtest_main INTERFACE ${gtest}/lib/libgtest_main.so gtest)
+
+
add_library(gmock INTERFACE)
+
target_include_directories(gmock INTERFACE ${gtest.dev}/include)
+
target_link_libraries(gmock INTERFACE ${gtest}/lib/libgmock.so gtest)
+
+
add_library(gmock_main INTERFACE)
+
target_include_directories(gmock_main INTERFACE ${gtest.dev}/include)
+
target_link_libraries(gmock_main INTERFACE ${gtest}/lib/libgmock_main.so gmock gtest_main)
+
EOF
+
'';
+
+
buildInputs = [
+
gtest
+
libapparmor
+
libvirt
+
libxml2
+
openssl
+
qtbase
+
qtx11extras
+
];
+
+
nativeBuildInputs = [
+
cmake
+
git
+
pkg-config
+
slang
+
wrapQtAppsHook
+
];
+
+
nativeCheckInputs = [ gtest ];
+
+
postInstall = ''
+
wrapProgram $out/bin/multipassd --prefix PATH : ${lib.makeBinPath [
+
dnsmasq
+
iproute2
+
iptables
+
OVMF.fd
+
qemu
+
qemu-utils
+
xterm
+
]}
+
'';
+
+
passthru.tests = {
+
multipass = nixosTests.multipass;
+
};
+
+
meta = with lib; {
+
description = "Ubuntu VMs on demand for any workstation.";
+
homepage = "https://multipass.run";
+
license = licenses.gpl3Plus;
+
maintainers = with maintainers; [ jnsgruk ];
+
platforms = [ "x86_64-linux" ];
+
};
+
}
+8
pkgs/top-level/all-packages.nix
···
mubeng = callPackage ../tools/networking/mubeng { };
+
multipass = libsForQt5.callPackage ../tools/virtualization/multipass { };
+
multitime = callPackage ../tools/misc/multitime { };
sta = callPackage ../tools/misc/sta {};
···
(if stdenv.targetPlatform.isStatic
then haskell.compiler.native-bignum.ghc92
else haskell.compiler.ghc92);
+
+
alex = haskell.lib.compose.justStaticExecutables haskellPackages.alex;
+
+
happy = haskell.lib.compose.justStaticExecutables haskellPackages.happy;
+
+
hscolour = haskell.lib.compose.justStaticExecutables haskellPackages.hscolour;
cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install;