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

discount: 2.2.7b -> 3.0.0d #289126

Merged
merged 1 commit into from
Apr 13, 2024
Merged

discount: 2.2.7b -> 3.0.0d #289126

merged 1 commit into from
Apr 13, 2024

Conversation

arkivm
Copy link
Contributor

@arkivm arkivm commented Feb 15, 2024

Description of changes

Update discount to the latest upstream version. Fixes #281530

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 21, 2024
@pbsds
Copy link
Member

pbsds commented Apr 13, 2024

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

1 package marked as broken and skipped:
  • calligra
3 packages failed to build:
  • haskellPackages.discount
  • haskellPackages.discount.doc
  • pdfpc
16 packages built:
  • discount
  • ejson
  • jsduck
  • kile
  • labplot
  • libsForQt5.discover (plasma5Packages.discover)
  • libsForQt5.kdepim-addons (plasma5Packages.kdepim-addons)
  • libsForQt5.kmail (plasma5Packages.kmail)
  • libsForQt5.kmail.doc (plasma5Packages.kmail.doc)
  • libsForQt5.kontact (plasma5Packages.kontact)
  • libsForQt5.okular (plasma5Packages.okular)
  • minder
  • mpd-notification
  • notes-up
  • peruse
  • thiefmd

the two build failures are new

Running phase: buildPhase
Preprocessing library for discount-0.1.1..
compiling dist/build/Text/Discount_hsc_make.c failed (exit code 1)
rsp file was: "dist/build/Text/hsc2hscall215-0.rsp"
command was: /nix/store/ac1hb5dc2z4biwgy8mjrhlifffkkrvdq-gcc-wrapper-13.2.0/bin/gcc -c dist/build/Text/Discount_hsc_make.c -o dist/build/Text/Discount_hsc_make.o -fuse-ld=gold -D__GLASGOW_HASKELL__=906 -Dlinux_BUILD_OS=1 -Dx86_64_BUILD_ARCH=1 -Dlinux_HOST_OS=1 -Dx86_64_HOST_ARCH=1 -I/nix/store/0j1iji9dbg07ff82z50k1f1svc09w3cn-discount-3.0.0d/include -I/nix/store/0j1iji9dbg07ff82z50k1f1svc09w3cn-discount-3.0.0d/include -Idist/build/autogen -Idist/build/global-autogen -include dist/build/autogen/cabal_macros.h -I/nix/store/p64ngk1v9d63lnrnyq0cynjd8jdk5jfa-ghc-9.6.4/lib/ghc-9.6.4/lib/../lib/x86_64-linux-ghc-9.6.4/bytestring-0.11.5.3/include -I/nix/store/p64ngk1v9d63lnrnyq0cynjd8jdk5jfa-ghc-9.6.4/lib/ghc-9.6.4/lib/../lib/x86_64-linux-ghc-9.6.4/base-4.18.2.0/include -I/nix/store/vyfa79pccinnfgz3ggrlp1m4hjpvrvz5-gmp-with-cxx-6.3.0-dev/include -I/nix/store/p64ngk1v9d63lnrnyq0cynjd8jdk5jfa-ghc-9.6.4/lib/ghc-9.6.4/lib/../lib/x86_64-linux-ghc-9.6.4/ghc-bignum-1.3/include -I/nix/store/s70sxxwsbn30cl4ayn7s0kwssg3mcfrk-elfutils-0.191-dev/include -I/nix/store/g3m9mvzid3x524il0c3g44l23848ar5j-libffi-3.4.6-dev/include -I/nix/store/p64ngk1v9d63lnrnyq0cynjd8jdk5jfa-ghc-9.6.4/lib/ghc-9.6.4/lib/../lib/x86_64-linux-ghc-9.6.4/rts-1.0.2/include -I/nix/store/p64ngk1v9d63lnrnyq0cynjd8jdk5jfa-ghc-9.6.4/include/
error: Discount.hsc: In function ‘main’:
Discount.hsc:80:37: error: ‘MKD_NORELAXED’ undeclared (first use in this function); did you mean ‘MKD_NOHEADER’?
Discount.hsc:22:97: note: in definition of macro ‘hsc_mkopt’
Discount.hsc:80:37: note: each undeclared identifier is reported only once for each function it appears in
Discount.hsc:22:97: note: in definition of macro ‘hsc_mkopt’
Discount.hsc:113:37: error: ‘MKD_NODLIST’ undeclared (first use in this function)
Discount.hsc:22:97: note: in definition of macro ‘hsc_mkopt’

Seems like an issue with the haskell bindings which maybe also could use a bump. Leaving it for a separate pr

@pbsds pbsds merged commit be14b2e into NixOS:master Apr 13, 2024
26 checks passed
wentasah added a commit to wentasah/nixpkgs that referenced this pull request Apr 17, 2024
markdown3 was introduced recently in NixOS#289126.

Fixes NixOS#304729
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: discount on aarch64-darwin
4 participants