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

devenv: fix build with lowdown 3.0 (#506656)

parents 4f56956c 68e77efe

pkgs/by-name/de/devenv/package.nix

+22 −8
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  applyPatches,

  gitMinimal,

  makeBinaryWrapper,

  installShellFiles,
@@ -27,14 +29,26 @@ let 
  devenvNixVersion = "2.32";

  devenvNixRev = "e127c1c94cefe02d8ca4cca79ef66be4c527510e";



  nix_components =

    (nixVersions.nixComponents_git.overrideSource (fetchFromGitHub {

  devenvNixSrc = applyPatches {

    name = "devenv-nix-${devenvNixVersion}-source";

    src = fetchFromGitHub {

      owner = "cachix";

      repo = "nix";

      rev = devenvNixRev;

      hash = "sha256-MRNVInSmvhKIg3y0UdogQJXe+omvKijGszFtYpd5r9k=";

    })).overrideScope

      (

    };

    patches = [

      # Lowdown 3.0 compatibility; devenv's nix fork (2.32-based) predates

      # the upstream fix.

      (fetchpatch {

        name = "nix-lowdown-3.0-support.patch";

        url = "https://github.com/NixOS/nix/commit/472c35c561bd9e8db1465e0677f1efe2cb88c568.patch";

        hash = "sha256-ZCQgI/euBN8t9rgdCsGRgrcEWG3T5MUc+bQc4tIcHuI=";

      })

    ];

  };



  nix_components = (nixVersions.nixComponents_git.overrideSource devenvNixSrc).overrideScope (

    finalScope: prevScope: {

      version = devenvNixVersion;

    }