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

fortune: 1.99.1 -> 2.6.2 #55171

Merged
merged 3 commits into from Feb 5, 2019
Merged

Conversation

Vonfry
Copy link
Member

@Vonfry Vonfry commented Feb 4, 2019

Motivation for this change

Update fortune from 1.99.1 to 2.6.2.

Fix: #55107

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

pkgs/tools/misc/fortune/default.nix Outdated Show resolved Hide resolved
pkgs/tools/misc/fortune/default.nix Outdated Show resolved Hide resolved
pkgs/tools/misc/fortune/default.nix Outdated Show resolved Hide resolved
pkgs/tools/misc/fortune/default.nix Outdated Show resolved Hide resolved
pkgs/tools/misc/fortune/default.nix Outdated Show resolved Hide resolved
pkgs/tools/misc/fortune/default.nix Show resolved Hide resolved
pkgs/tools/misc/fortune/default.nix Outdated Show resolved Hide resolved
@markuskowa markuskowa changed the title [package update]fortune: 1.99.1 -> 2.6.2 fortune: 1.99.1 -> 2.6.2 Feb 4, 2019
@markuskowa
Copy link
Member

I changed the title of the PR. The convention is:
package_name: old_version -> new_version

@markuskowa
Copy link
Member

You checked Tested via one or more NixOS test(s) [...]. Which test did you use here (I can't find a test in nixos/tests)? How does the closure size change with the upgrade?

@Vonfry
Copy link
Member Author

Vonfry commented Feb 4, 2019

@markuskowa Thanks for your suggestion. I will edit them in several days beacse of some personal reasons. And I have unchecked the nixos test box. Sorry.

Take suggestions.
@Vonfry Vonfry force-pushed the fix/fortune-update-to-2.6.2 branch from 75fcf8f to 1fc4e2c Compare February 5, 2019 10:48
Apply version variable into src
Remove build flag in preBuild which is not needed.
@markuskowa
Copy link
Member

@GrahamcOfBorg build fortune

@markuskowa markuskowa merged commit 99bb426 into NixOS:master Feb 5, 2019
@markuskowa
Copy link
Member

Thanks for updating!

@Vonfry Vonfry deleted the fix/fortune-update-to-2.6.2 branch February 5, 2019 13:09
@Vonfry Vonfry restored the fix/fortune-update-to-2.6.2 branch March 6, 2019 06:20
@Vonfry Vonfry deleted the fix/fortune-update-to-2.6.2 branch March 6, 2019 06:22
@wmertens
Copy link
Contributor

Since this change I can no longer specify a file:

$ fortune pratchett
No fortunes found

tracing shows that it only looks for the fortune file in the FORTDIR, not the LOCFORTDIR.

@Vonfry
Copy link
Member Author

Vonfry commented Apr 25, 2019

@wmertens It's a bug on old version. And it has been fixed on 2.6.2. Please check your fortune version. It can work on my NixOS system with LOCFORTDIR.

@wmertens
Copy link
Contributor

wmertens commented Jun 7, 2019

@Vonfry I have 2.6.2 and it doesn't work. It's super weird, sometimes it works in different terminals, and I can't figure out the difference. macOS btw.

@Vonfry
Copy link
Member Author

Vonfry commented Jun 7, 2019

@wmertens
Try fortune -f [<all> | path to your local file or dir]. This will print which files can be found.

If it is failed, you may try strfile <path to your local file> which I must do for my local files on both nixos and macos.

I can run fortune on NixOS and macOS with LOCFORDIR.

@wmertens
Copy link
Contributor

wmertens commented Jun 7, 2019

found it!

$ fortune pratchett
No fortunes found
$ LANG=C fortune pratchett
The Assassin moved quietly from roof to roof until he was well away from
the excitement around the Watch House. His movements could be called
cat-like, except that he did not stop to spray urine up against things.
		-- Terry Pratchett, "Night Watch"

🤷‍♂

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.

fortune-mod update from 1.99.1 to 2.6.2
5 participants