commit 77a1993b46c13ffd68c03ee19fa3088d8071a011 · pyrox.dev/nixpkgs

+8

nixos/modules/services/misc/gitweb.nix

···

       32
       32
        
             '';

     

       33
       33
        
           };

     

       34
       34
        
       

     

       35
       35
       +
           gitwebTheme = mkOption {

     

       36
       36
       +
             default = false;

     

       37
       37
       +
             type = types.bool;

     

       38
       38
       +
             description = ''

     

       39
       39
       +
               Use an alternative theme for gitweb, strongly inspired by GitHub.

     

       40
       40
       +
             '';

     

       41
       41
       +
           };

     

       42
       42
       +
       

     

       35
       43
        
           gitwebConfigFile = mkOption {

     

       36
       44
        
             default = pkgs.writeText "gitweb.conf" ''

     

       37
       45
        
               # path to git projects (<project>.git)

+5 -2

nixos/modules/services/web-servers/lighttpd/gitweb.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.gitweb;

     

       7
       7
       +
         package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme {

     

       8
       8
       +
           gitwebTheme = true;

     

       9
       9
       +
         });

     

       7
       10
        
       

     

       8
       11
        
       in

     

       9
       12
        
       {

     
···

       34
       37
        
                     "^/gitweb$" => "/gitweb/"

     

       35
       38
        
                 )

     

       36
       39
        
                 alias.url = (

     

       37
       37
       -
                     "/gitweb/static/" => "${pkgs.git}/share/gitweb/static/",

     

       38
       38
       -
                     "/gitweb/"        => "${pkgs.git}/share/gitweb/gitweb.cgi"

     

       40
       40
       +
                     "/gitweb/static/" => "${package}/static/",

     

       41
       41
       +
                     "/gitweb/"        => "${package}/gitweb.cgi"

     

       39
       42
        
                 )

     

       40
       43
        
                 setenv.add-environment = (

     

       41
       44
        
                     "GITWEB_CONFIG" => "${cfg.gitwebConfigFile}",

+7 -5

nixos/modules/services/web-servers/nginx/gitweb.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.gitweb;

     

       7
       7
       +
         package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme {

     

       8
       8
       +
           gitwebTheme = true;

     

       9
       9
       +
         });

     

       7
       10
        
       

     

       8
       11
        
       in

     

       9
       12
        
       {

     
···

       24
       27
        
       

     

       25
       28
        
           systemd.services.gitweb = {

     

       26
       29
        
             description = "GitWeb service";

     

       27
       27
       -
             script = "${pkgs.git}/share/gitweb/gitweb.cgi --fastcgi --nproc=1";

     

       30
       30
       +
             script = "${package}/gitweb.cgi --fastcgi --nproc=1";

     

       28
       31
        
             environment  = {

     

       29
       32
        
               FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock";

     

       30
       33
        
             };

     
···

       38
       41
        
       

     

       39
       42
        
           services.nginx = {

     

       40
       43
        
             virtualHosts.default = {

     

       41
       41
       -
               locations."/gitweb/" = {

     

       42
       42
       -
                 root = "${pkgs.git}/share";

     

       43
       43
       -
                 tryFiles = "$uri @gitweb";

     

       44
       44
       +
               locations."/gitweb/static/" = {

     

       45
       45
       +
                 alias = "${package}/static/";

     

       44
       46
        
               };

     

       45
       45
       -
               locations."@gitweb" = {

     

       47
       47
       +
               locations."/gitweb/" = {

     

       46
       48
        
                 extraConfig = ''

     

       47
       49
        
                   include ${pkgs.nginx}/conf/fastcgi_params;

     

       48
       50
        
                   fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile};

-1

pkgs/applications/version-management/git-and-tools/default.nix

···

       15
       15
        
             perlPackages.MIMEBase64 perlPackages.AuthenSASL

     

       16
       16
        
             perlPackages.DigestHMAC

     

       17
       17
        
           ];

     

       18
       18
       -
           gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];

     

       19
       18
        
         };

     

       20
       19
        
       

     

       21
       20
        
       in

+6 -11

pkgs/applications/version-management/git-and-tools/git/default.nix

···

       1
       1
        
       { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio

     

       2
       2
        
       , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc

     

       3
       3
       -
       , gzip, openssh, pcre2

     

       3
       3
       +
       , openssh, pcre2

     

       4
       4
        
       , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45

     

       5
       5
        
       , libxslt, tcl, tk, makeWrapper, libiconv

     

       6
       6
       -
       , svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs

     

       6
       6
       +
       , svnSupport, subversionClient, perlLibs, smtpPerlLibs

     

       7
       7
        
       , guiSupport

     

       8
       8
        
       , withManual ? true

     

       9
       9
        
       , pythonSupport ? true

     
···

       24
       24
        
           url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";

     

       25
       25
        
           sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";

     

       26
       26
        
         };

     

       27
       27
       +
       

     

       28
       28
       +
         outputs = [ "out" "gitweb" ];

     

       27
       29
        
       

     

       28
       30
        
         hardeningDisable = [ "format" ];

     

       29
       31
        
       

     
···

       131
       133
        
             substituteInPlace $out/libexec/git-core/git-sh-i18n \

     

       132
       134
        
                 --subst-var-by gettext ${gettext}

     

       133
       135
        
       

     

       134
       134
       -
             # gzip (and optionally bzip2, xz, zip) are runtime dependencies for

     

       135
       135
       -
             # gitweb.cgi, need to patch so that it's found

     

       136
       136
       -
             sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \

     

       137
       137
       -
                 $out/share/gitweb/gitweb.cgi

     

       138
       138
       -
             # Give access to CGI.pm and friends (was removed from perl core in 5.22)

     

       139
       139
       -
             for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do

     

       140
       140
       -
                 sed -i -e "/use CGI /i use lib \"$p/lib/perl5/site_perl\";" \

     

       141
       141
       -
                     "$out/share/gitweb/gitweb.cgi"

     

       142
       142
       -
             done

     

       136
       136
       +
             # put in separate package for simpler maintenance

     

       137
       137
       +
             mv $out/share/gitweb $gitweb/

     

       143
       138
        
       

     

       144
       139
        
             # Also put git-http-backend into $PATH, so that we can use smart

     

       145
       140
        
             # HTTP(s) transports for pushing

+37

pkgs/applications/version-management/git-and-tools/gitweb/default.nix

···

       1
       1
       +
       { stdenv, git, gzip, perlPackages, fetchFromGitHub

     

       2
       2
       +
       , gitwebTheme ? false }:

     

       3
       3
       +
       

     

       4
       4
       +
       let

     

       5
       5
       +
         gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];

     

       6
       6
       +
         gitwebThemeSrc = fetchFromGitHub {

     

       7
       7
       +
           owner = "kogakure";

     

       8
       8
       +
           repo = "gitweb-theme";

     

       9
       9
       +
           rev = "049b88e664a359f8ec25dc6f531b7e2aa60dd1a2";

     

       10
       10
       +
           sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p";

     

       11
       11
       +
         };

     

       12
       12
       +
       in stdenv.mkDerivation {

     

       13
       13
       +
         name = "gitweb";

     

       14
       14
       +
       

     

       15
       15
       +
         src = git.gitweb;

     

       16
       16
       +
       

     

       17
       17
       +
         installPhase = ''

     

       18
       18
       +
             mkdir $out

     

       19
       19
       +
             mv * $out

     

       20
       20
       +
       

     

       21
       21
       +
             # gzip (and optionally bzip2, xz, zip) are runtime dependencies for

     

       22
       22
       +
             # gitweb.cgi, need to patch so that it's found

     

       23
       23
       +
             sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \

     

       24
       24
       +
                 $out/gitweb.cgi

     

       25
       25
       +
             # Give access to CGI.pm and friends (was removed from perl core in 5.22)

     

       26
       26
       +
             for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do

     

       27
       27
       +
                 sed -i -e "/use CGI /i use lib \"$p/lib/perl5/site_perl\";" \

     

       28
       28
       +
                     "$out/gitweb.cgi"

     

       29
       29
       +
             done

     

       30
       30
       +
       

     

       31
       31
       +
             ${stdenv.lib.optionalString gitwebTheme "cp ${gitwebThemeSrc}/* $out/static"}

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         meta = git.meta // {

     

       35
       35
       +
           maintainers = with stdenv.lib.maintainers; [ gnidorah ];

     

       36
       36
       +
         };

     

       37
       37
       +
       }

+2

pkgs/top-level/all-packages.nix

···

       15636
       15636
        
       

     

       15637
       15637
        
         ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };

     

       15638
       15638
        
       

     

       15639
       15639
       +
         gitweb = callPackage ../applications/version-management/git-and-tools/gitweb/default.nix { };

     

       15640
       15640
       +
       

     

       15639
       15641
        
         gksu = callPackage ../applications/misc/gksu { };

     

       15640
       15642
        
       

     

       15641
       15643
        
         gnss-sdr = callPackage ../applications/misc/gnss-sdr { };