Commit ae744717 authored by Robert Hensing's avatar Robert Hensing
Browse files

nixVersions.nix_2_26: Drop libgit2-thin-packfile override

parent 64a95324

pkgs/tools/package-management/nix/2_26/componentized.nix

+0 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
  newScope,

  pkgs,

  stdenv,

  libgit2-thin-packfile,

  ...

}:

let
@@ -44,7 +43,6 @@ let 
          inherit pkgs;

          inherit stdenv;

          inherit src;

          inherit libgit2-thin-packfile;

        };

      };

in

pkgs/tools/package-management/nix/2_26/dependencies.nix

+0 −4
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
  pkgs,



  stdenv,

  libgit2-thin-packfile,

}:



let
@@ -139,7 +138,6 @@ let 
in

scope: {

  inherit stdenv;

  inherit libgit2-thin-packfile;



  aws-sdk-cpp =

    (pkgs.aws-sdk-cpp.override {
@@ -159,8 +157,6 @@ scope: { 
    enableLargeConfig = true;

  };



  libgit2 = libgit2-thin-packfile;



  inherit resolvePath filesetToSource;



  mkMesonDerivation = mkPackageBuilder [

pkgs/tools/package-management/nix/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -164,9 +164,7 @@ in lib.makeExtensible (self: ({ 
    self_attribute_name = "nix_2_25";

  };



  nix_2_26 = (callPackage ./2_26/componentized.nix {

    inherit libgit2-thin-packfile;

  }).overrideAttrs (this: old: {

  nix_2_26 = (callPackage ./2_26/componentized.nix { }).overrideAttrs (this: old: {

    passthru = old.passthru or {} // {

      tests =

        old.passthru.tests or {}