diff options
98 files changed, 1350 insertions, 302 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 53d84118bd30..270be3a43cd3 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -78,7 +78,7 @@ rec { isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; isEfi = map (family: { cpu.family = family; }) - [ "x86" "arm" "aarch64" ]; + [ "x86" "arm" "aarch64" "riscv" ]; }; matchAnyAttrs = patterns: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cb621e5762b0..99f620877b05 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9425,6 +9425,12 @@ githubId = 1776903; name = "Andrew Abbott"; }; + mislavzanic = { + email = "mislavzanic3@gmail.com"; + github = "mislavzanic"; + githubId = 48838244; + name = "Mislav Zanic"; + }; misterio77 = { email = "eu@misterio.me"; github = "Misterio77"; diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index 8de527fceb26..4562e5a2c29b 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -7,7 +7,7 @@ let runtime' = filter (f: f.enable) (attrValues cfg.runtime); - runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = x.target; path = x.source; }) runtime'); + runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = "etc/${x.target}"; path = x.source; }) runtime'); in { options.programs.neovim = { diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index aacc584c5b84..b57f4a4986ce 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gstreamer ] ++ lib.optionals (withGstPlugins) [ + gst-libav gst-plugins-bad gst-plugins-good gst-plugins-ugly diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index d8e57fdb508f..50eacf97bf85 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -44,6 +44,7 @@ in buildFHSUserEnv rec { xorg.libXext xorg.libXrender libudev0-shim + libxcrypt ]; passthru = { inherit unwrapped; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6481c992e229..68afc4812068 100644 --- a/pkgs/applica |