Remove Clang workaround as clangStdenv is now at least 17

dblsaiko

Nov 3, 2024, 2:58 PM

O5ZJE5FMSLMEBSYH7IXLRDU5TVL37474C3TVP4OC5DRRSMHMLC6QC

Dependencies

• [2] KEPVL66D Partially fix build on Mac
• [3] UZYI7CB2 Fix compile errors on macOS in dev shell
• [4] 3KEFKH5F Import existing code
• [5] 4OTS5CAK Version 0.1.2
• [6] 72KPLIMX Store version in central file
• [7] ZZW47X5H Version 0.1.1

Change contents

• edit in package.nix at line 4
  [3.13355]→[2.97:114](∅→∅)
  − clang17Stdenv,
• replacement in package.nix at line 10
  [3.83]→[2.115:301](∅→∅)
  − }: let

  − stdenv' =

  − if stdenv.cc.isClang

  − then clang17Stdenv

  − else stdenv;

  − in

  − stdenv'.mkDerivation {

  − pname = "nix-plugin-pijul";

  − version = lib.fileContents ./VERSION;
  [3.83]

  [3.13493]
  + }: stdenv.mkDerivation {

  + pname = "nix-plugin-pijul";

  + version = lib.fileContents ./VERSION;
• replacement in package.nix at line 14
  [3.13494]→[2.302:317](∅→∅)
  − src = ./.;
  [3.13494]

  [3.13507]
  + src = ./.;
• replacement in package.nix at line 16
  [3.13508]→[2.318:380](∅→∅)
  − nativeBuildInputs = [

  − cmake

  − pkg-config

  − ];
  [3.13508]

  [3.13562]
  + nativeBuildInputs = [

  + cmake

  + pkg-config

  + ];
• replacement in package.nix at line 21
  [3.13563]→[2.381:480](∅→∅)
  − buildInputs = [

  − boost

  − howard-hinnant-date

  − nix

  − nlohmann_json

  − ];

  − }
  [3.13563]
  + buildInputs = [

  + boost

  + howard-hinnant-date

  + nix

  + nlohmann_json

  + ];

  + }