Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump korthout/backport-action from 1.2.0 to 1.4.0 #1098

Closed
wants to merge 4 commits into from
Closed

build(deps): bump korthout/backport-action from 1.2.0 to 1.4.0 #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2db26dc
gitlab: make Git package configurable
dpausp Feb 15, 2023
b4bd296
pam_tty_audit: fix missing newline after config
dpausp Feb 22, 2023
9a23ab5
pyslurm: 22.5.1 -> 23.2.0
dpausp Apr 8, 2023
b03895c
build(deps): bump korthout/backport-action from 1.2.0 to 1.4.0
dependabot[bot] Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs
uses: korthout/backport-action@v1.2.0
uses: korthout/backport-action@v1.4.0
with:
# Config README: https://github.com/korthout/backport-action#backport-action
copy_labels_pattern: 'severity:\ssecurity'
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/security/pam.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ let
] ++ optional cfg.ttyAudit.openOnly "open_only"
++ optional (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}"
++ optional (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}"
)) +
) + "\n") +
optionalString config.services.homed.enable ''
session required ${config.systemd.package}/lib/security/pam_systemd_home.so
'' +
Expand Down
12 changes: 10 additions & 2 deletions nixos/modules/services/misc/gitlab.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let
prometheus_listen_addr = "localhost:9236"

[git]
bin_path = "${pkgs.git}/bin/git"
bin_path = "${cfg.packages.git}/bin/git"

[gitlab-shell]
dir = "${cfg.packages.gitlab-shell}"
Expand Down Expand Up @@ -258,6 +258,14 @@ in {
'';
};

packages.git = mkOption {
type = types.package;
default = pkgs.git;
defaultText = literalExpression "pkgs.git";
description = lib.mdDoc "Reference to the git package";
example = literalExpression "pkgs.git";
};

packages.gitlab = mkOption {
type = types.package;
default = pkgs.gitlab;
Expand Down Expand Up @@ -1125,7 +1133,7 @@ in {
}
];

environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ];
environment.systemPackages = [ cfg.packages.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ];

systemd.targets.gitlab = {
description = "Common target for all GitLab services.";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyslurm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

buildPythonPackage rec {
pname = "pyslurm";
version = "22.5.1";
version = "23.2.0";
format = "setuptools";

disabled = pythonOlder "3.6";
Expand All @@ -17,7 +17,7 @@ buildPythonPackage rec {
repo = "pyslurm";
owner = "PySlurm";
rev = "refs/tags/v${version}";
hash = "sha256-sPZELCxe2e7/gUmRxvP2aOwqsbaR/x+0grHwuDdx0Dg=";
hash = "sha256-HIidm53pV8A7pwrl6k6/B3GpzXaIxKQiB3L4s7/dqHY=";
};

buildInputs = [ cython slurm ];
Expand Down