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

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 @

Copy link
Contributor

@jonringer jonringer left a comment

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

@jonringer jonringer commented Dec 6, 2019

@GrahamcOfBorg build edbrowse

Copy link
Contributor

@c0bw3b c0bw3b left a comment

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

@equirosa
Copy link
Contributor Author

@equirosa equirosa commented Dec 11, 2019

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 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

@equirosa equirosa commented Dec 12, 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)

Ohhhhhh... Got it! Will ammend ASAP 😄

@equirosa equirosa force-pushed the equirosa:master branch from 54a673f to 78323a7 Dec 12, 2019
+ turn makeFlags into a list
+ update meta.homepage
@c0bw3b
Copy link
Contributor

@c0bw3b 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
Copy link
Contributor

@c0bw3b c0bw3b left a comment

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
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
edbrowse on aarch64-linux Success
Details
edbrowse on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.