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 unstable #110910

Closed
wants to merge 213 commits into from
Closed

Nixos unstable #110910

wants to merge 213 commits into from

Conversation

polyrtm
Copy link

@polyrtm polyrtm commented Jan 27, 2021

Motivation for this change

A new discord canary version came out, so I figured I should update them.

Things done

I just ran the update-discord.sh file. I'm pretty new to nixos so I'm not sure how to test it.

  • 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.

primeos and others added 30 commits October 12, 2020 15:27
This is a convenience option that can be used to quickly obtain the
configured FQDN.
The dynamic loader on powerpc64 is called ld64.so.2 rather than
ld-linux.so.*, and was not matched by the existing pattern.

We reuse the dynamicLinker name from binutils to match a wider set
of platforms and to avoid specifying this information in two places.
qemu_full enables samba and ceph support because otherwise enabling
them triggers recompilation of qemu package that takes a long time.
Similar options can be enabled later on. qemu_full is based on complete
qemu package, so hostCpuOnly is not enabled.
this allows to pass relative paths to appimages as argument

fixes #108426
`PANDOC_LUA_FILTERS_DIR` is set in `makeFlags` in `doc/default.nix`,
and needs to be explicitely passed to `make` when called manually.

Signed-off-by: Pamplemousse <xav.maso@gmail.com>
Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
This was inconsistent with the rest of the module.
bash is needed to run the new binfmt shell script.

Fixes #110540
Merge generic.nix and 2.x.nix into default.nix.
openjpeg_2 is now an alias
It is actually referring to version 2.4.
@polyrtm
Copy link
Author

polyrtm commented Jan 27, 2021

I'm just going to close this because I clearly did something wrong here.

@cole-h
Copy link
Member

cole-h commented Jan 27, 2021

When you do try again: PRs meant for unstable go to the master branch. nixos-* branches are read-only mirrors of the channel it's named after.

@jonringer
Copy link
Contributor

for unstable, please target master

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

Successfully merging this pull request may close these issues.

None yet