Unverified Commit d6339576 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 4279ffb5 e0bacc93

nixos/modules/services/continuous-integration/gitlab-runner.nix

+12 −3
Original line number Diff line number Diff line
@@ -137,8 +137,10 @@ let 
            "--builds-dir ${service.buildsDir}"

            ++ optional (service.cloneUrl != null)

            "--clone-url ${service.cloneUrl}"

            ++ optional (service.preCloneScript != null)

            "--pre-clone-script ${service.preCloneScript}"

            ++ optional (service.preGetSourcesScript != null)

            "--pre-get-sources-script ${service.preGetSourcesScript}"

            ++ optional (service.postGetSourcesScript != null)

            "--post-get-sources-script ${service.postGetSourcesScript}"

            ++ optional (service.preBuildScript != null)

            "--pre-build-script ${service.preBuildScript}"

            ++ optional (service.postBuildScript != null)
@@ -495,13 +497,20 @@ in { 
              Whitelist allowed services.

            '';

          };

          preCloneScript = mkOption {

          preGetSourcesScript = mkOption {

            type = types.nullOr types.path;

            default = null;

            description = ''

              Runner-specific command script executed before code is pulled.

            '';

          };

          postGetSourcesScript = mkOption {

            type = types.nullOr types.path;

            default = null;

            description = ''

              Runner-specific command script executed after code is pulled.

            '';

          };

          preBuildScript = mkOption {

            type = types.nullOr types.path;

            default = null;

pkgs/applications/editors/xed-editor/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 


stdenv.mkDerivation rec {

  pname = "xed-editor";

  version = "3.6.3";

  version = "3.6.4";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = "xed";

    rev = version;

    sha256 = "sha256-xsNqzicI11dM/DjY00pXaPpQdHA0ltP23g34fMWUoUA=";

    sha256 = "sha256-EwBcgFHw6Mh+eS5hfTLoywH0dVt/TpNt4y6xQxe/x/Q=";

  };



  patches = [

pkgs/applications/video/vdr/softhddevice/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
}:

stdenv.mkDerivation rec {

  pname = "vdr-softhddevice";

  version = "2.3.3";

  version = "2.3.4";



  src = fetchFromGitHub {

    owner = "ua0lnj";

    repo = "vdr-plugin-softhddevice";

    sha256 = "sha256-PvSo5qiDMVrL6ylts5leR/3YAqIpIZcmnAqnGopPG94=";

    sha256 = "sha256-pwA0LBQZ0jYXgBHhboAhyPM/kM7sboGw0O+3OIg5Nz4=";

    rev = "v${version}";

  };

pkgs/by-name/gi/gitlab-release-cli/package.nix

0 → 100644
+33 −0
Original line number Diff line number Diff line 
{

  lib,

  fetchFromGitLab,

  buildGoModule,

  stdenv,

}:



buildGoModule rec {

  pname = "gitlab-release-cli";

  version = "0.18.0";



  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "release-cli";

    rev = "v${version}";

    hash = "sha256-CCSice/uMf2OfFNEpwwhX6A0wrSsC1v9XWEhAAwQRso=";

  };



  vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU=";



  checkFlags = lib.optionals stdenv.isDarwin [

    # Skip failing test

    "-skip TestHTTPSCustomCA"

  ];



  meta = {

    description = "Toolset to create, retrieve and update releases on GitLab";

    homepage = "https://gitlab.com/gitlab-org/release-cli";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ kilimnik ];

    mainProgram = "release-cli";

  };

}

pkgs/by-name/ni/niri/package.nix

+3 −0
Original line number Diff line number Diff line 
{ lib

, rustPlatform

, fetchFromGitHub

, nix-update-script

, pkg-config

, libxkbcommon

, pango
@@ -76,6 +77,8 @@ rustPlatform.buildRustPackage rec { 
    install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/share/systemd/user

  '';



  passthru.updateScript = nix-update-script { };



  meta = with lib; {

    description = "Scrollable-tiling Wayland compositor";

    homepage = "https://github.com/YaLTeR/niri";