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

Jump to bottom

edbrowse: 3.7.4 -> 3.7.6 #75087

Merged
merged 3 commits into from Dec 12, 2019
Merged

edbrowse: 3.7.4 -> 3.7.6 #75087

merged 3 commits into from Dec 12, 2019

Conversation

equirosa
Copy link
Contributor

@equirosa equirosa commented Dec 6, 2019

Motivation for this change

Newest version has a bunch of bug fixes, latest version within nixpkgs is from over a year ago.
https://github.com/CMB/edbrowse/releases/tag/v3.7.6

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 nix-review --run "nix-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.
Notify maintainers

cc @

@ofborg ofborg bot requested a review from vrthra December 6, 2019 08:47
jonringer
jonringer approved these changes Dec 6, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM
executable still shows usage

[2 built, 4 copied (7.0 MiB), 1.1 MiB DL]
https://github.com/NixOS/nixpkgs/pull/75087
1 package were built:
edbrowse

@jonringer
Copy link
Contributor

@GrahamcOfBorg build edbrowse

c0bw3b
c0bw3b requested changes Dec 7, 2019
View reviewed changes
Copy link
Contributor

@c0bw3b c0bw3b left a comment •
edited

Choose a reason for hiding this comment

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

The commit fetched as a patch is now part of the version so it isn't needed anymore

@equirosa
Copy link
Contributor Author

The commit fetched as a patched is now part of the version so it isn't needed anymore

Ok so this means that it isn't necessary to update it? (A bit confused here 😅 )

@c0bw3b
Copy link
Contributor

c0bw3b commented Dec 11, 2019

No, I just meant that you could remove the following block:

  patches = [
    # Fix build against recent libcurl
    (fetchpatch {
      url = https://github.com/CMB/edbrowse/commit/5d2b9e21fdf019f461ebe62738d615428d5db963.diff;
      sha256 = "167q8n0syj3iv6lxrbpv4kvb63j4byj4qxrxayy08bah3pss3gky";
    })
  ];

because that patch isn't needed with the newer 3.7.6 version.

(also remove fetchpatch from the inputs at the top)

@equirosa
Copy link
Contributor Author

No, I just meant that you could remove the following block:

  patches = [
    # Fix build against recent libcurl
    (fetchpatch {
      url = https://github.com/CMB/edbrowse/commit/5d2b9e21fdf019f461ebe62738d615428d5db963.diff;
      sha256 = "167q8n0syj3iv6lxrbpv4kvb63j4byj4qxrxayy08bah3pss3gky";
    })
  ];

because that patch isn't needed with the newer 3.7.6 version.

(also remove fetchpatch from the inputs at the top)

Ohhhhhh... Got it! Will ammend ASAP 😄

@c0bw3b
edbrowse: update source hash for v3.7.6
d496637 
+ turn makeFlags into a list
+ update meta.homepage
@c0bw3b
Copy link
Contributor

c0bw3b commented Dec 12, 2019

@equirosa just added a commit to update the hash of the source archive.
Without it, we were still building the v3.7.4 with the sources available from the cache and matching the give SHA256 hash.

c0bw3b
c0bw3b approved these changes Dec 12, 2019
View reviewed changes
Copy link
Contributor

@c0bw3b c0bw3b left a comment

Choose a reason for hiding this comment

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

Result of nix-review pr 75087

1 package were build:
  • edbrowse
$ ./results/edbrowse/bin/edbrowse -v
3.7.6

@c0bw3b c0bw3b merged commit 7689430 into NixOS:master Dec 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@c0bw3b c0bw3b c0bw3b approved these changes

@vrthra vrthra Awaiting requested review from vrthra

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@equirosa @jonringer @c0bw3b