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.

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

nixos/murmur: Add overrideable package switch #108966

Merged
merged 1 commit into from Jan 14, 2021
Merged

Conversation

@pstn
Copy link
Contributor

@pstn pstn commented Jan 10, 2021

Motivation for this change

I introduced an overrideable package switch for murmur, mainly because it can be build with ice or grpc support and different users might want to use different builds on their servers. This makes it easy for everybody to choose.

Tested with the mumble test in nixos.

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.
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Jan 10, 2021

different users might want to use different builds on their servers.

You mean you want to use a different version?

@pstn
Copy link
Contributor Author

@pstn pstn commented Jan 10, 2021

murmur has overrides, with this switch they are easy to use in the package. Also there is umurmur, an alternative mumble server that works with similar configuration files.

@pstn pstn force-pushed the pstn:murmurPswitch branch 2 times, most recently from b82ef2d to a1db542 Jan 10, 2021
@pstn pstn force-pushed the pstn:murmurPswitch branch from a1db542 to 06c0f16 Jan 10, 2021
@rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Jan 13, 2021

@GrahamcOfBorg test mumble

@rnhmjoj rnhmjoj requested a review from thoughtpolice Jan 13, 2021
Copy link
Contributor

@thiagokokada thiagokokada left a comment

Diff wise LGTM.

@Infinisil Infinisil merged commit ffdefb6 into NixOS:master Jan 14, 2021
20 checks passed
20 checks passed
nixos
Details
tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="06c0f16"; rev="06c0f165556950665b83e41209f611ddeed4de26"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="06c0f16"; rev="06c0f165556950665b83e41209f611ddeed4de26"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="06c0f16"; rev="06c0f165556950665b83e41209f611ddeed4de26"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="06c0f16"; rev="06c0f165556950665b83e41209f611ddeed4de26"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="06c0f16"; rev="06c0f165556950665b83e41209f611ddeed4de26"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="06c0f16"; rev="06c0f165556950665b83e41209f611ddeed4de26"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="06c0f16"; rev="06c0f165556950665b83e41209f611ddeed4de26"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.mumble on aarch64-linux Success
Details
tests.mumble on x86_64-linux Success
Details
@pstn
Copy link
Contributor Author

@pstn pstn commented Jan 14, 2021

@Infinisil is there a chance to get this merged into 20.09? Are there some formal criterion's except that it would save me a deal of pain and I don't see how it could break anything for anyone?

@Infinisil
Copy link
Member

@Infinisil Infinisil commented Jan 14, 2021

No problem, pushed it to 20.09 in 6d06166 :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.