Unverified Commit 2b82213a authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

Merge pull request #335232 from philiptaron/issue-208242/follow-up-on-pr-334470

parents 8dc6a073 086aa4f3

pkgs/applications/audio/gpodder/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ python311Packages.buildPythonApplication rec { 
    ./disable-autoupdate.patch

  ];



  postPatch = with lib; ''

  postPatch = ''

    sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder

  '';

pkgs/applications/display-managers/ly/deps.nix

+6 −8
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
  name ? "zig-packages",

}:



with lib;



let

  unpackZigArtifact =

    { name, artifact }:
@@ -39,9 +37,9 @@ let 
      hash,

    }:

    let

      parts = splitString "#" url;

      base = elemAt parts 0;

      rev = elemAt parts 1;

      parts = lib.splitString "#" url;

      base = lib.elemAt parts 0;

      rev = lib.elemAt parts 1;

    in

    fetchgit {

      inherit name rev hash;
@@ -56,9 +54,9 @@ let 
      hash,

    }:

    let

      parts = splitString "://" url;

      proto = elemAt parts 0;

      path = elemAt parts 1;

      parts = lib.splitString "://" url;

      proto = lib.elemAt parts 0;

      path = lib.elemAt parts 1;

      fetcher = {

        "git+http" = fetchGitZig {

          inherit name hash;

pkgs/applications/editors/eclipse/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -210,9 +210,7 @@ in rec { 
      # Gather up the desired plugins.

      pluginEnv = buildEnv {

        name = "eclipse-plugins";

        paths =

          with lib;

            filter (x: x ? isEclipsePlugin) (closePropagation plugins);

        paths = lib.filter (x: x ? isEclipsePlugin) (lib.closePropagation plugins);

      };



      # Prepare the JVM arguments to add to the ini file. We here also

pkgs/applications/editors/jupyter/kernel.nix

+5 −5
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ in 


  # Definitions is an attribute set.



  create = { definitions ?  default }: with lib; stdenv.mkDerivation {

  create = { definitions ?  default }: stdenv.mkDerivation {



    name = "jupyter-kernels";
@@ -37,14 +37,14 @@ in 
    installPhase =  ''

      mkdir kernels



      ${concatStringsSep "\n" (mapAttrsToList (kernelName: unfilteredKernel:

      ${lib.concatStringsSep "\n" (lib.mapAttrsToList (kernelName: unfilteredKernel:

        let

          allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64" "extraPaths"];

          kernel = filterAttrs (n: v: (any (x: x == n) allowedKernelKeys)) unfilteredKernel;

          kernel = lib.filterAttrs (n: v: (lib.any (x: x == n) allowedKernelKeys)) unfilteredKernel;

          config = builtins.toJSON (

            kernel

            // {display_name = if (kernel.displayName != "") then kernel.displayName else kernelName;}

            // (optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; })

            // (lib.optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; })

          );

          extraPaths = kernel.extraPaths or {}

            // lib.optionalAttrs (kernel.logo32 != null) { "logo-32x32.png" = kernel.logo32; }
@@ -64,7 +64,7 @@ in 
    meta = {

      description = "Wrapper to create jupyter notebook kernel definitions";

      homepage = "https://jupyter.org/";

      maintainers = with maintainers; [ aborsu ];

      maintainers = with lib.maintainers; [ aborsu ];

    };

  };

}

pkgs/applications/editors/kakoune/plugins/aliases.nix

+12 −14
Original line number Diff line number Diff line
@@ -2,21 +2,19 @@ 


lib: overridden:



with overridden;



let

  # Removing recurseForDerivation prevents derivations of aliased attribute

  # set to appear while listing all the packages available.

  removeRecurseForDerivations = alias: with lib;

  removeRecurseForDerivations = alias:

    if alias.recurseForDerivations or false then

      removeAttrs alias ["recurseForDerivations"]

      lib.removeAttrs alias ["recurseForDerivations"]

    else alias;



  # Disabling distribution prevents top-level aliases for non-recursed package

  # sets from building on Hydra.

  removeDistribute = alias: with lib;

    if isDerivation alias then

      dontDistribute alias

  removeDistribute = alias:

    if lib.isDerivation alias then

      lib.dontDistribute alias

    else alias;



  # Make sure that we are not shadowing something from
@@ -37,11 +35,11 @@ let 


in

mapAliases ({

  kak-auto-pairs         = auto-pairs-kak; # backwards compat, added 2021-01-04

  kak-buffers            = kakoune-buffers; # backwards compat, added 2021-01-04

  kak-byline             = byline-kak; # backwards compat, added 2023-10-22

  kak-fzf                = fzf-kak; # backwards compat, added 2021-01-04

  kak-powerline          = powerline-kak; # backwards compat, added 2021-01-04

  kak-prelude            = prelude-kak; # backwards compat, added 2021-01-04

  kak-vertical-selection = kakoune-vertical-selection; # backwards compat, added 2021-01-04

  kak-auto-pairs         = overridden.auto-pairs-kak; # backwards compat, added 2021-01-04

  kak-buffers            = overridden.kakoune-buffers; # backwards compat, added 2021-01-04

  kak-byline             = overridden.byline-kak; # backwards compat, added 2023-10-22

  kak-fzf                = overridden.fzf-kak; # backwards compat, added 2021-01-04

  kak-powerline          = overridden.powerline-kak; # backwards compat, added 2021-01-04

  kak-prelude            = overridden.prelude-kak; # backwards compat, added 2021-01-04

  kak-vertical-selection = overridden.kakoune-vertical-selection; # backwards compat, added 2021-01-04

} // deprecations)