commit 6065d768e145ca5782e961774b5f06f0a0520729 · pyrox.dev/nixpkgs

+50 -6

pkgs/applications/version-management/sapling/default.nix

···

       1
       1
       -
       { lib, stdenv, python3Packages, fetchFromGitHub, fetchurl, sd, curl, pkg-config, openssl, rustPlatform, fetchYarnDeps, yarn, nodejs, fixup_yarn_lock, glibcLocales }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , python38Packages

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , fetchurl

     

       6
       6
       +
       , sd

     

       7
       7
       +
       , curl

     

       8
       8
       +
       , pkg-config

     

       9
       9
       +
       , openssl

     

       10
       10
       +
       , rustPlatform

     

       11
       11
       +
       , fetchYarnDeps

     

       12
       12
       +
       , yarn

     

       13
       13
       +
       , nodejs

     

       14
       14
       +
       , fixup_yarn_lock

     

       15
       15
       +
       , glibcLocales

     

       16
       16
       +
       , libiconv

     

       17
       17
       +
       , CoreFoundation

     

       18
       18
       +
       , CoreServices

     

       19
       19
       +
       , Security

     

       20
       20
       +
       }:

     

       2
       21
        
       

     

       3
       22
        
       let

     

       4
       23
        
         inherit (lib.importJSON ./deps.json) links version versionHash;

     

       24
       24
       +
         # Sapling sets a Cargo config containing lines like so:

     

       25
       25
       +
         # [target.aarch64-apple-darwin]

     

       26
       26
       +
         # rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]

     

       27
       27
       +
         #

     

       28
       28
       +
         # The default cargo config that's set by the build hook will set

     

       29
       29
       +
         # unstable.host-config and unstable.target-applies-to-host which seems to

     

       30
       30
       +
         # result in the link arguments above being ignored and thus link failures.

     

       31
       31
       +
         # All it is there to do anyway is just to do stuff with musl and cross

     

       32
       32
       +
         # compilation, which doesn't work on macOS anyway so we can just stub it

     

       33
       33
       +
         # on macOS.

     

       34
       34
       +
         #

     

       35
       35
       +
         # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295

     

       36
       36
       +
         myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: {

     

       37
       37
       +
           cargoConfig = if stdenv.isDarwin then "" else old.cargoConfig;

     

       38
       38
       +
         });

     

       5
       39
        
       

     

       6
       40
        
         src = fetchFromGitHub {

     

       7
       41
        
           owner = "facebook";

     
···

       54
       88
        
         };

     

       55
       89
        
       

     

       56
       90
        
         # Builds the main `sl` binary and its Python extensions

     

       57
       57
       -
         sapling = python3Packages.buildPythonPackage {

     

       91
       91
       +
         #

     

       92
       92
       +
         # FIXME(lf-): when next updating this package, delete the python 3.8 override

     

       93
       93
       +
         # here, since the fix for https://github.com/facebook/sapling/issues/279 that

     

       94
       94
       +
         # required it will be in the next release.

     

       95
       95
       +
         sapling = python38Packages.buildPythonPackage {

     

       58
       96
        
           pname = "sapling-main";

     

       59
       97
        
           inherit src version;

     

       60
       98
        
       

     
···

       85
       123
        
             sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py

     

       86
       124
        
           '';

     

       87
       125
        
       

     

       88
       88
       -
           postFixup = ''

     

       126
       126
       +
           postFixup = lib.optionalString stdenv.isLinux ''

     

       89
       127
        
             wrapProgram $out/bin/sl \

     

       90
       128
        
               --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"

     

       91
       129
        
           '';

     
···

       94
       132
        
             curl

     

       95
       133
        
             pkg-config

     

       96
       134
        
           ] ++ (with rustPlatform; [

     

       97
       97
       -
             cargoSetupHook

     

       135
       135
       +
             myCargoSetupHook

     

       98
       136
        
             rust.cargo

     

       99
       137
        
             rust.rustc

     

       100
       138
        
           ]);

     

       101
       139
        
       

     

       102
       140
        
           buildInputs = [

     

       141
       141
       +
             curl

     

       103
       142
        
             openssl

     

       143
       143
       +
           ] ++ lib.optionals stdenv.isDarwin [

     

       144
       144
       +
             libiconv

     

       145
       145
       +
             CoreFoundation

     

       146
       146
       +
             CoreServices

     

       147
       147
       +
             Security

     

       104
       148
        
           ];

     

       105
       149
        
       

     

       106
       150
        
           doCheck = false;

     
···

       124
       168
        
       

     

       125
       169
        
           cp -r ${sapling}/* $out

     

       126
       170
        
       

     

       127
       127
       -
           sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages

     

       171
       171
       +
           sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages

     

       128
       172
        
           chmod +w $sitepackages

     

       129
       173
        
           cp -r ${isl} $sitepackages/edenscm-isl

     

       130
       174
        
       

     
···

       145
       189
        
           homepage = "https://sapling-scm.com";

     

       146
       190
        
           license = licenses.gpl2Only;

     

       147
       191
        
           maintainers = with maintainers; [ pbar thoughtpolice ];

     

       148
       148
       -
           platforms = platforms.linux;

     

       192
       192
       +
           platforms = platforms.unix;

     

       149
       193
        
           mainProgram = "sl";

     

       150
       194
        
         };

     

       151
       195
        
       }

+3 -1

pkgs/top-level/all-packages.nix

···

       30435
       30435
        
           inherit (darwin.apple_sdk.frameworks) ApplicationServices;

     

       30436
       30436
        
         };

     

       30437
       30437
        
       

     

       30438
       30438
       -
         sapling = callPackage ../applications/version-management/sapling { };

     

       30438
       30438
       +
         sapling = callPackage ../applications/version-management/sapling {

     

       30439
       30439
       +
           inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;

     

       30440
       30440
       +
         };

     

       30439
       30441
        
       

     

       30440
       30442
        
         mercurialFull = mercurial.override { fullBuild = true; };

     

       30441
       30443