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

nano: remove darwin patch #27839

Merged
merged 1 commit into from
Aug 1, 2017
Merged

nano: remove darwin patch #27839

merged 1 commit into from
Aug 1, 2017

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Aug 1, 2017

Motivation for this change

The patch does not apply anymore, but also doesn't look like it's needed anymore. /cc @copumpkin

# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))        \
         && !defined __UCLIBC__)                                            \
        || (defined __APPLE__ && defined __MACH__)                          \
        || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
                fbp[1] = '%';
                fbp[2] = 'n';
                fbp[3] = '\0';
# else
Things done

Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Aug 1, 2017
@copumpkin
Copy link
Member

Yup, as folks update their bundled gnulib, that patch will stop being necessary 😄

@LnL7
Copy link
Member Author

LnL7 commented Aug 1, 2017

Alright, just wanted to make sure I didn't misinterpret the boolean logic 😅

@LnL7 LnL7 merged commit 1431405 into NixOS:master Aug 1, 2017
@LnL7 LnL7 deleted the darwin-nano branch August 1, 2017 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants