commit 0ad54e43dfcd9a111459637edadf7d77e38203f7 · pyrox.dev/nixpkgs

+3 -5

pkgs/applications/version-management/gitlab-shell/default.nix

···

       1
       1
        
       { stdenv, ruby, bundler, fetchFromGitLab, go }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "5.9.3";

     

       4
       4
       +
         version = "5.10.2";

     

       5
       5
        
         name = "gitlab-shell-${version}";

     

       6
       6
        
       

     

       7
       7
        
         srcs = fetchFromGitLab {

     

       8
       8
        
           owner = "gitlab-org";

     

       9
       9
        
           repo = "gitlab-shell";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p";

     

       11
       11
       +
           sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [

     

       15
       15
       -
           ruby bundler go

     

       16
       16
       -
         ];

     

       14
       14
       +
         buildInputs = [ ruby bundler go ];

     

       17
       15
        
       

     

       18
       16
        
         patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ];

     

       19
       17

+13

pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch

···

       25
       25
        
          end

     

       26
       26
        
        

     

       27
       27
        
          def api

     

       28
       28
       +
       diff --git a/go/internal/config/config.go b/go/internal/config/config.go

     

       29
       29
       +
       index c57b4de..88cfc95 100644

     

       30
       30
       +
       --- a/go/internal/config/config.go

     

       31
       31
       +
       +++ b/go/internal/config/config.go

     

       32
       32
       +
       @@ -27,7 +27,7 @@ func New() (*Config, error) {

     

       33
       33
       +
        	}

     

       34
       34
       +
        	cfg.RootDir = dir

     

       35
       35
       +
        

     

       36
       36
       +
       -	configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile))

     

       37
       37
       +
       +	configBytes, err := ioutil.ReadFile(os.Getenv("GITLAB_SHELL_CONFIG_PATH"))

     

       38
       38
       +
        	if err != nil {

     

       39
       39
       +
        		return nil, err

     

       40
       40
       +
        	}