Unverified Commit 8c510d91 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents fb2bd8b5 64a5bece
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,8 @@

- The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.

- `services.nextcloud.notify_push.enable` now installs the notify_push app. Therefore the appstore is now disabled when using `notify_push`. See `services.nextcloud.appstoreEnable`.

- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
  If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.

+26 −0
Original line number Diff line number Diff line
@@ -131,6 +131,22 @@ in
        default = true;
        description = "Whether to whitelist the FreeIPA domain in Chromium.";
      };

      shells = lib.mkOption {
        type = lib.types.listOf lib.types.package;
        default = with pkgs; [
          bash
          zsh
        ];
        defaultText = lib.literalExpression ''
          with pkgs; [ bash zsh ];
        '';
        description = ''
          List of shells which binaries should be installed to /bin/<name>.

          FreeIPA typicly configures somesthing like /bin/bash into the users shell attribute.
        '';
      };
    };
  };

@@ -296,5 +312,15 @@ in
    networking.timeServers = lib.optional cfg.useAsTimeserver cfg.server;

    security.pki.certificateFiles = lib.singleton cfg.certificate;

    systemd.tmpfiles.settings."10-ipa-shells" = lib.foldl' (
      acc: pkg:
      (
        acc
        // {
          ${pkg.shellPath}."L+".argument = "${pkg}${pkg.shellPath}";
        }
      )
    ) { } cfg.shells;
  };
}
+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ in
        } daemon";
        Restart = "on-failure";
      };
      wantedBy = [ "default.target" ];
      wantedBy = [ "graphical-session.target" ];
    };

    environment.systemPackages = [ cfg.package ];
+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ let
  # https://github.com/systemd/systemd/blob/main/units/systemd-networkd.service.in
  commonServiceConfig = {
    after = [
      "systemd-udevd.service"
      "systemd-udev-settle.service"
      "network-pre.target"
      "systemd-sysusers.service"
      "systemd-sysctl.service"
+26 −24
Original line number Diff line number Diff line
@@ -36,24 +36,21 @@ in
mapAliases (
  with prev;
  {
    # keep-sorted start case=no
    "sourcemap.vim" = sourcemap-vim;
    airline = vim-airline;
    alternative = a-vim; # backwards compat, added 2014-10-21
    bats = bats-vim;
    blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17
    BufOnly = BufOnly-vim;
    calendar = calendar-vim;
    caw = caw-vim;
    chad = chadtree;
    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
    coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01
    coffee-script = vim-coffee-script;
    coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18
    Solarized = vim-colors-solarized;
    solarized = vim-colors-solarized;
    spacevim = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27
    SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
    sparkup = throw "the upstream repository got deleted"; # added 2025-08-06
    colors-solarized = vim-colors-solarized;
    caw = caw-vim;
    chad = chadtree;
    colorsamplerpack = Colour-Sampler-Pack;
    Colour_Sampler_Pack = Colour-Sampler-Pack;
    command_T = command-t; # backwards compat, added 2014-10-18
@@ -62,8 +59,8 @@ mapAliases (
    concealedyank = concealedyank-vim;
    context-filetype = context_filetype-vim;
    Cosco = cosco-vim;
    css_color_5056 = vim-css-color;
    CSApprox = csapprox;
    css_color_5056 = vim-css-color;
    csv = csv-vim;
    ctrlp = ctrlp-vim;
    cute-python = vim-cute-python;
@@ -76,25 +73,25 @@ mapAliases (
    ethersync = lib.warnOnInstantiate "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
    extradite = vim-extradite;
    feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
    fugitive = vim-fugitive;
    floating-nvim = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26
    fruzzy = throw "vimPlugins.fruzzy did not update since 2019-10-28 and uses EOL version of Nim"; # Added 2025-11-12
    fugitive = vim-fugitive;
    fzfWrapper = fzf-wrapper;
    ghc-mod-vim = ghcmod-vim;
    ghcmod = ghcmod-vim;
    gleam-vim = throw "gleam.vim has been removed: its code was merged into vim."; # Added 2025-06-10
    goyo = goyo-vim;
    Gist = vim-gist;
    gitgutter = vim-gitgutter;
    gleam-vim = throw "gleam.vim has been removed: its code was merged into vim."; # Added 2025-06-10
    goyo = goyo-vim;
    gundo = gundo-vim;
    Gundo = gundo-vim; # backwards compat, added 2015-10-03
    haskellconceal = vim-haskellconceal;
    haskellConceal = vim-haskellconceal; # backwards compat, added 2014-10-18
    haskellConcealPlus = vim-haskellConcealPlus;
    haskellconceal = vim-haskellconceal;
    hier = vim-hier;
    hlint-refactor = hlint-refactor-vim;
    hoogle = vim-hoogle;
    Hoogle = vim-hoogle;
    hoogle = vim-hoogle;
    indent-blankline-nvim-lua = indent-blankline-nvim; # backwards compat, added 2021-07-05
    ipython = vim-ipython;
    latex-live-preview = vim-latex-live-preview;
@@ -109,8 +106,6 @@ mapAliases (
    neuron-nvim = throw "neuron.nvim has been removed: archived repository 2023-02-19"; # Added 2025-09-10
    nvim-ts-rainbow = throw "nvim-ts-rainbow has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
    nvim-ts-rainbow2 = throw "nvim-ts-rainbow2 has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
    The_NERD_Commenter = nerdcommenter;
    The_NERD_tree = nerdtree;
    open-browser = open-browser-vim;
    pathogen = vim-pathogen;
    peskcolor-vim = throw "peskcolor-vim has been removed: abandoned by upstream"; # Added 2024-08-23
@@ -120,39 +115,45 @@ mapAliases (
    quickrun = vim-quickrun;
    rainbow_parentheses = rainbow_parentheses-vim;
    repeat = vim-repeat;
    riv = riv-vim;
    rhubarb = vim-rhubarb;
    riv = riv-vim;
    rust-tools-nvim = lib.warnOnInstantiate "rust-tools-nvim is abandoned by upstream; you should use rustaceanvim" rust-tools-nvim;
    sensible = vim-sensible;
    signature = vim-signature;
    sleuth = vim-sleuth;
    snipmate = vim-snipmate;
    Solarized = vim-colors-solarized;
    solarized = vim-colors-solarized;
    solidity = vim-solidity;
    sourcemap = sourcemap-vim;
    "sourcemap.vim" = sourcemap-vim;
    Spacegray-vim = throw "Spacegray-vim has been removed: abandoned by upstream"; # Added 2025-03-24
    surround = vim-surround;
    sleuth = vim-sleuth;
    solidity = vim-solidity;
    SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
    spacevim = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27
    sparkup = throw "the upstream repository got deleted"; # added 2025-08-06
    ssr = ssr-nvim; # Added 2025-08-31
    stylish-haskell = vim-stylish-haskell;
    stylishHaskell = vim-stylish-haskell; # backwards compat, added 2014-10-18
    suda-vim = vim-suda; # backwards compat, added 2024-05-16
    Supertab = supertab;
    surround = vim-surround;
    Syntastic = syntastic;
    SyntaxRange = vim-SyntaxRange;
    table-mode = vim-table-mode;
    taglist = taglist-vim;
    tabpagebuffer = tabpagebuffer-vim;
    tabpagecd = vim-tabpagecd;
    Tabular = tabular;
    Tagbar = tagbar;
    taglist = taglist-vim;
    The_NERD_Commenter = nerdcommenter;
    The_NERD_tree = nerdtree;
    thumbnail = thumbnail-vim;
    tlib = tlib_vim;
    tmux-navigator = vim-tmux-navigator;
    tmuxNavigator = vim-tmux-navigator; # backwards compat, added 2014-10-18
    todo-nvim = throw "todo-nvim has been removed: abandoned by upstream"; # Added 2023-08-23
    tslime = tslime-vim;
    unite = unite-vim;
    UltiSnips = ultisnips;
    unite = unite-vim;
    vim-addon-vim2nix = vim2nix;
    vim-sourcetrail = throw "vim-sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14
    vimproc = vimproc-vim;
@@ -161,10 +162,11 @@ mapAliases (
    watchdogs = vim-watchdogs;
    WebAPI = webapi-vim;
    wombat256 = wombat256-vim; # backwards compat, added 2015-7-8
    yankring = YankRing-vim;
    Yankring = YankRing-vim;
    xterm-color-table = xterm-color-table-vim;
    Yankring = YankRing-vim;
    yankring = YankRing-vim;
    zeavim = zeavim-vim;
    # keep-sorted end
  }
  // deprecations
)
Loading