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

Jump to bottom

libstrophe: 0.10.0 -> 0.10.1 #107644

Merged
merged 1 commit into from Jan 17, 2021
Merged

libstrophe: 0.10.0 -> 0.10.1 #107644

merged 1 commit into from Jan 17, 2021

Conversation

devhell
Copy link
Contributor

@devhell devhell commented Dec 26, 2020

Motivation for this change
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.

@ofborg ofborg bot requested a review from flosse December 26, 2020 16:57
@rmcgibbo
Copy link
Contributor

Result of nixpkgs-review pr 107644 1

1 package built:
  • libstrophe

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107644 run on x86_64-darwin 1

1 package failed to build:
  • libstrophe
/nix/store/r913a0b23i21r8y4x8kgx024gms9lvx9-Libsystem-osx-10.12.6/include/secure/_stdio.h:57:39: note: expanded from macro 'snprintf'
  __builtin___snprintf_chk (str, len, 0, __darwin_obsz(str), __VA_ARGS__)
                                      ^
tests/test_rand.c:37:5: note: to match this '('
./src/snprintf.h:23:23: note: expanded from macro 'xmpp_snprintf'
#define xmpp_snprintf snprintf
                      ^
/nix/store/r913a0b23i21r8y4x8kgx024gms9lvx9-Libsystem-osx-10.12.6/include/secure/_stdio.h:57:28: note: expanded from macro 'snprintf'
  __builtin___snprintf_chk (str, len, 0, __darwin_obsz(str), __VA_ARGS__)
                           ^
tests/test_rand.c:37:5: error: conflicting types for '__builtin___snprintf_chk'
int xmpp_snprintf(char *str, size_t count, const char *fmt, ...)
    ^
./src/snprintf.h:23:23: note: expanded from macro 'xmpp_snprintf'
#define xmpp_snprintf snprintf
                      ^
/nix/store/r913a0b23i21r8y4x8kgx024gms9lvx9-Libsystem-osx-10.12.6/include/secure/_stdio.h:57:3: note: expanded from macro 'snprintf'
  __builtin___snprintf_chk (str, len, 0, __darwin_obsz(str), __VA_ARGS__)
  ^
tests/test_rand.c:37:5: note: '__builtin___snprintf_chk' is a builtin with type 'int (char *, unsigned long, int, unsigned long, const char *, ...)'
./src/snprintf.h:23:23: note: expanded from macro 'xmpp_snprintf'
#define xmpp_snprintf snprintf
                      ^
/nix/store/r913a0b23i21r8y4x8kgx024gms9lvx9-Libsystem-osx-10.12.6/include/secure/_stdio.h:57:3: note: expanded from macro 'snprintf'
  __builtin___snprintf_chk (str, len, 0, __darwin_obsz(str), __VA_ARGS__)
  ^
tests/test_rand.c:37:5: error: definition of builtin function '__builtin___snprintf_chk'
int xmpp_snprintf(char *str, size_t count, const char *fmt, ...)
    ^
./src/snprintf.h:23:23: note: expanded from macro 'xmpp_snprintf'
#define xmpp_snprintf snprintf
                      ^
/nix/store/r913a0b23i21r8y4x8kgx024gms9lvx9-Libsystem-osx-10.12.6/include/secure/_stdio.h:57:3: note: expanded from macro 'snprintf'
  __builtin___snprintf_chk (str, len, 0, __darwin_obsz(str), __VA_ARGS__)
  ^
tests/test_rand.c:41:11: error: use of undeclared identifier 'fmt'
    (void)fmt;
          ^
5 errors generated.
make[1]: *** [Makefile:1832: tests/test_rand-test_rand.o] Error 1
make[1]: Leaving directory '/private/tmp/nix-build-libstrophe-0.10.1.drv-0/source'
make: *** [Makefile:2654: check-am] Error 2

SuperSandro2000
SuperSandro2000 requested changes Dec 26, 2020
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gpl3 is a deprecated license, check if project uses gpl3Plus or gpl3Only and change meta.license accordingly.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107644 run on x86_64-linux 1

1 package built:
  • libstrophe

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107644 run on x86_64-linux 1

1 package built:
  • libstrophe

devhell
devhell commented Dec 27, 2020
View reviewed changes
Copy link
Contributor Author

@devhell devhell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @SuperSandro2000, hope this suffices.

@devhell
Copy link
Contributor Author

devhell commented Jan 3, 2021

@SuperSandro2000 does this need more work or can it be merged?

@devhell
Copy link
Contributor Author

devhell commented Jan 8, 2021

Bump?

@devhell
Copy link
Contributor Author

devhell commented Jan 10, 2021

@SuperSandro2000 could you please let me know if this can be merged or if there's anything left to do? Thank you :)

@SuperSandro2000
Copy link
Member

@devhell please solve the merge conflict.

@devhell
Copy link
Contributor Author

devhell commented Jan 15, 2021

@SuperSandro2000 Let me know if this is okay now, please. Thank you

SuperSandro2000
SuperSandro2000 reviewed Jan 15, 2021
View reviewed changes
pkgs/development/libraries/libstrophe/default.nix Outdated
maintainers = with maintainers; [ devhell flosse ];
};
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the final new line back.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

pkgs/development/libraries/libstrophe/default.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jan 15, 2021 •
edited

@SuperSandro2000 Let me know if this is okay now, please. Thank you

Merging master into a PR is big no go and I can't merge something that does it. Please use rebase instead.

@devhell devhell force-pushed the libstrophe branch 2 times, most recently from ea0243b to 8005bd8 Compare January 17, 2021 18:40
@devhell
Copy link
Contributor Author

devhell commented Jan 17, 2021

@SuperSandro2000 Let me know if this is okay now, please. Thank you

Merging master into a PR is big no go and I can't merge something that does it. Please use rebase instead.

Dammit. That was unintentional, sorry.

@SuperSandro2000 SuperSandro2000 merged commit d8736c2 into NixOS:master Jan 17, 2021
@devhell devhell deleted the libstrophe branch January 18, 2021 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flosse flosse Awaiting requested review from flosse

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@devhell @rmcgibbo @SuperSandro2000