Skip to content

nixos/gitlab: fix module after #94454#94837

Merged
flokli merged 1 commit intoNixOS:masterfrom
aanderse:gitlab
Aug 7, 2020
Merged

nixos/gitlab: fix module after #94454#94837
flokli merged 1 commit intoNixOS:masterfrom
aanderse:gitlab

Conversation

@aanderse
Copy link
Copy Markdown
Member

@aanderse aanderse commented Aug 7, 2020

Motivation for this change

#94454 broke this module.

cc @kloenk for more possible testing.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@aanderse aanderse requested review from flokli and talyz August 7, 2020 02:41
@aanderse
Copy link
Copy Markdown
Member Author

aanderse commented Aug 7, 2020

@GrahamcOfBorg test gitlab

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Aug 7, 2020
@flokli flokli merged commit 38724d8 into NixOS:master Aug 7, 2020
@flokli
Copy link
Copy Markdown
Member

flokli commented Aug 7, 2020

Thanks!

@aanderse aanderse deleted the gitlab branch August 7, 2020 11:31
jtojnar added a commit to jtojnar/nixfiles that referenced this pull request Aug 9, 2020
@jtojnar
modules.postgres: fix after NixOS/nixpkgs#94454
83465e5 
Fixes the following issues:

	The option `systemd.services.postgresql.serviceConfig.ExecStartPost' has conflicting definitions, in `/nix/store/l4fkkw4436ndn06pd80dnkdvqyzns3ww-source/nixos/modules/system/boot/systemd.nix' and `/nix/store/l4fkkw4436ndn06pd80dnkdvqyzns3ww-source/nixos/modules/services/databases/postgresql.nix'.

Inspired by NixOS/nixpkgs#94837
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@talyz talyz Awaiting requested review from talyz

@flokli flokli Awaiting requested review from flokli

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@aanderse @flokli