Merge pull request #12601 from tomberek/gateone_update

Gateone: fix cacerts dependency

+7 -6
+1 -3
nixos/modules/services/networking/gateone.nix
··· 21 21 }; 22 22 config = mkIf cfg.enable { 23 23 environment.systemPackages = with pkgs.pythonPackages; [ 24 - gateone pkgs.openssh pkgs.procps pkgs.coreutils ]; 24 + gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert]; 25 25 26 26 users.extraUsers.gateone = { 27 27 description = "GateOne privilege separation user"; ··· 49 49 User = "gateone"; 50 50 Group = "gateone"; 51 51 WorkingDirectory = cfg.settingsDir; 52 - PermissionsStartOnly = true; 53 - 54 52 }; 55 53 56 54 wantedBy = [ "multi-user.target" ];
+6 -3
pkgs/top-level/python-packages.nix
··· 5130 5130 name = "gateone-1.2-0d57c3"; 5131 5131 disabled = ! isPy27; 5132 5132 src = pkgs.fetchFromGitHub { 5133 - rev = "11ed97c663b3e8c1b8eba473b5cf8362b10d57c3"; 5133 + rev = "1d0e8037fbfb7c270f3710ce24154e24b7031bea"; 5134 5134 owner= "liftoff"; 5135 5135 repo = "GateOne"; 5136 - sha256 ="0zp9vfs6sqbx4d0g45kkjinfmsl9zqwa6bhp3xd81wx3ph9yr1hq"; 5136 + sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv"; 5137 5137 }; 5138 - propagatedBuildInputs = with self; [tornado futures html5lib readline pkgs.openssl]; 5138 + propagatedBuildInputs = with self; [tornado futures html5lib readline pkgs.openssl pkgs.cacert pkgs.openssh]; 5139 5139 meta = { 5140 5140 homepage = https://liftoffsoftware.com/; 5141 5141 description = "GateOne is a web-based terminal emulator and SSH client"; 5142 5142 maintainers = with maintainers; [ tomberek ]; 5143 5143 5144 5144 }; 5145 + postInstall='' 5146 + cp -R $out/gateone/* $out/lib/python2.7/site-packages/gateone 5147 + ''; 5145 5148 }; 5146 5149 5147 5150 gcutil = buildPythonPackage rec {