commit 86fc7533fb29f3d04493c2e28d186e14a6d94169 · pyrox.dev/nixpkgs

+39 -13

pkgs/by-name/gi/gitaly/git.nix

···

       6
       6
        
         curl,

     

       7
       7
        
         pcre2,

     

       8
       8
        
         zlib,

     

       9
       9
       +
         git,

     

       10
       10
       +
         pkg-config,

     

       11
       11
       +
         openssl,

     

       9
       12
        
       }:

     

       10
       13
        
       

     

       11
       14
        
       stdenv.mkDerivation rec {

     
···

       17
       20
        
           owner = "gitlab-org";

     

       18
       21
        
           repo = "git";

     

       19
       22
        
           rev = "v${version}";

     

       20
       20
       -
           hash = "sha256-1y94T5UBG7s76ENsUmaXRXngSKmqIAT0nq1u+QjSWaY=";

     

       23
       23
       +
           hash = "sha256-VFqUz79RvkOE4CS8GUZTPhah2AbvrlyHr4iYhWqh61Y=";

     

       24
       24
       +
           leaveDotGit = true;

     

       25
       25
       +
           # The build system clones the repo from the store (since it always expects

     

       26
       26
       +
           # to be able to clone in the makefiles) and it looks like nix doesn't leave

     

       27
       27
       +
           # the tag so we re-add it.

     

       28
       28
       +
           postFetch = ''

     

       29
       29
       +
             git -C $out tag v${version};

     

       30
       30
       +
           '';

     

       21
       31
        
         };

     

       22
       32
        
       

     

       23
       23
       -
         # we actually use the gitaly build system

     

       33
       33
       +
         # Use gitaly and their build system as source root

     

       24
       34
        
         unpackPhase = ''

     

       25
       35
        
           cp -r ${gitaly.src} source

     

       26
       36
        
           chmod -R +w source

     

       37
       37
       +
           git config --global --add safe.directory '*'

     

       38
       38
       +
         '';

     

       27
       39
        
       

     

       28
       28
       -
           mkdir -p source/_build/deps

     

       29
       29
       -
       

     

       30
       30
       -
           cp -r ${src} source/_build/deps/git-distribution

     

       31
       31
       -
           chmod -R +w source/_build/deps/git-distribution

     

       32
       32
       -
       

     

       33
       33
       -
           # FIXME? maybe just patch the makefile?

     

       34
       34
       -
           echo -n 'v${version} DEVELOPER=1 DEVOPTS=no-error USE_LIBPCRE=YesPlease NO_PERL=YesPlease NO_EXPAT=YesPlease NO_TCLTK=YesPlease NO_GETTEXT=YesPlease NO_PYTHON=YesPlease' > source/_build/deps/git-distribution.version

     

       35
       35
       -
           echo -n 'v${version}' > source/_build/deps/git-distribution/version

     

       36
       36
       -
         '';

     

       37
       40
        
         sourceRoot = src.name;

     

       38
       41
        
       

     

       39
       42
        
         buildFlags = [ "git" ];

     

       43
       43
       +
         GIT_REPO_URL = src;

     

       44
       44
       +
         HOME = "/build";

     

       40
       45
        
       

     

       46
       46
       +
         nativeBuildInputs = [

     

       47
       47
       +
           git # clones our repo from the store

     

       48
       48
       +
           pkg-config

     

       49
       49
       +
         ];

     

       50
       50
       +
         # git inputs

     

       41
       51
        
         buildInputs = [

     

       42
       42
       -
           curl

     

       52
       52
       +
           openssl

     

       53
       53
       +
           zlib

     

       43
       54
        
           pcre2

     

       44
       44
       -
           zlib

     

       55
       55
       +
           curl

     

       45
       56
        
         ];

     

       46
       57
        
       

     

       58
       58
       +
         # required to support pthread_cancel()

     

       59
       59
       +
         NIX_LDFLAGS =

     

       60
       60
       +
           lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"

     

       61
       61
       +
           + lib.optionalString stdenv.isFreeBSD "-lthr";

     

       62
       62
       +
       

     

       47
       63
        
         # The build phase already installs it all

     

       48
       64
        
         GIT_PREFIX = placeholder "out";

     

       49
       65
        
         dontInstall = true;

     

       66
       66
       +
       

     

       67
       67
       +
         doInstallCheck = true;

     

       68
       68
       +
         installCheckPhase = ''

     

       69
       69
       +
           runHook preInstallCheck

     

       70
       70
       +
       

     

       71
       71
       +
           HOME=/build PAGER=cat $out/bin/git config -l

     

       72
       72
       +
           file $out/bin/git | grep -qv 'too large section header'

     

       73
       73
       +
       

     

       74
       74
       +
           runHook postInstallCheck

     

       75
       75
       +
         '';

     

       50
       76
        
       

     

       51
       77
        
         meta = {

     

       52
       78
        
           homepage = "https://git-scm.com/";

+24 -2

pkgs/by-name/gi/gitaly/package.nix

···

       33
       33
        
       

     

       34
       34
        
           tags = [ "static" ];

     

       35
       35
        
       

     

       36
       36
       +
           nativeBuildInputs = [ pkg-config ];

     

       37
       37
       +
       

     

       36
       38
        
           doCheck = false;

     

       37
       39
        
         };

     

       38
       40
        
       

     
···

       41
       43
        
             pname = "gitaly-aux";

     

       42
       44
        
       

     

       43
       45
        
             subPackages = [

     

       46
       46
       +
               # Can be determined by looking at the `go:embed` calls in https://gitlab.com/gitlab-org/gitaly/-/blob/master/packed_binaries.go

     

       44
       47
        
               "cmd/gitaly-hooks"

     

       45
       48
        
               "cmd/gitaly-ssh"

     

       46
       49
        
               "cmd/gitaly-lfs-smudge"

     
···

       59
       62
        
             "cmd/gitaly-backup"

     

       60
       63
        
           ];

     

       61
       64
        
       

     

       65
       65
       +
           dontStrip = true;

     

       66
       66
       +
       

     

       62
       67
        
           preConfigure = ''

     

       68
       68
       +
             rm -r tools

     

       69
       69
       +
       

     

       63
       70
        
             mkdir -p _build/bin

     

       64
       71
        
             cp -r ${auxBins}/bin/* _build/bin

     

       65
       65
       -
             for f in ${git}/bin/git-*; do

     

       66
       66
       -
               cp "$f" "_build/bin/gitaly-$(basename $f)";

     

       72
       72
       +
       

     

       73
       73
       +
             # Add git that will be embedded

     

       74
       74
       +
             echo 'print-%:;@echo $($*)' >> Makefile

     

       75
       75
       +
             sed -i 's:/usr/bin/env ::g' Makefile

     

       76
       76
       +
             for bin in $(make print-GIT_PACKED_EXECUTABLES); do

     

       77
       77
       +
               from="$(basename "$bin")"

     

       78
       78
       +
               from="''${from#gitaly-}"

     

       79
       79
       +
               from="${git}/libexec/git-core/''${from%-*}"

     

       80
       80
       +
               cp "$from" "$bin"

     

       67
       81
        
             done

     

       82
       82
       +
       

     

       83
       83
       +
           '';

     

       84
       84
       +
       

     

       85
       85
       +
           doInstallCheck = true;

     

       86
       86
       +
           installCheckPhase = ''

     

       87
       87
       +
             runHook preInstallCheck

     

       88
       88
       +
             HOME=/build PAGER=cat ${git}/bin/git config -l

     

       89
       89
       +
             runHook postInstallCheck

     

       68
       90
        
           '';

     

       69
       91
        
       

     

       70
       92
        
           outputs = [ "out" ];

pkgs/by-name/gi/gitlab-pages/package.nix

···

       19
       19
        
         vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";

     

       20
       20
        
         subPackages = [ "." ];

     

       21
       21
        
       

     

       22
       22
       +
         ldflags = [

     

       23
       23
       +
           "-X"

     

       24
       24
       +
           "main.VERSION=${version}"

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       22
       27
        
         meta = {

     

       23
       28
        
           description = "Daemon used to serve static websites for GitLab users";

     

       24
       29
        
           mainProgram = "gitlab-pages";