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

rivet: fix hash broken by upstream #45141

Merged
merged 1 commit into from Aug 16, 2018
Merged

rivet: fix hash broken by upstream #45141

merged 1 commit into from Aug 16, 2018

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Aug 16, 2018

Motivation for this change
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)
  • Fits CONTRIBUTING.md.

@veprbl veprbl mentioned this pull request Aug 16, 2018
Merged
9 tasks
@veprbl
Copy link
Member Author

veprbl commented Aug 16, 2018

The diff between tarballs:

diff -aru ../Rivet-2.6.1/analyses/pluginATLAS/ATLAS_2018_I1646686.cc Rivet-2.6.1/analyses/pluginATLAS/ATLAS_2018_I1646686.cc
--- ../Rivet-2.6.1/analyses/pluginATLAS/ATLAS_2018_I1646686.cc	2018-07-19 18:45:21.000000000 -0400
+++ Rivet-2.6.1/analyses/pluginATLAS/ATLAS_2018_I1646686.cc	2018-08-14 12:16:10.000000000 -0400
@@ -12,11 +12,11 @@
 namespace Rivet {


+  /// @brief All-hadronic ttbar at 13 TeV
   class ATLAS_2018_I1646686 : public Analysis {
+  public:

-    public:
       /// Constructor
-      /// @brief all-hadronic ttbar at 13 TeV
       DEFAULT_RIVET_ANALYSIS_CTOR(ATLAS_2018_I1646686);

       /// Book histograms and initialise projections before the run
Only in ../Rivet-2.6.1: result
diff -aru ../Rivet-2.6.1/src/Core/Particle.cc Rivet-2.6.1/src/Core/Particle.cc
--- ../Rivet-2.6.1/src/Core/Particle.cc	2018-08-13 18:29:23.000000000 -0400
+++ Rivet-2.6.1/src/Core/Particle.cc	2018-08-15 11:02:01.000000000 -0400
@@ -107,7 +107,7 @@
     if (genParticle() == nullptr) return rtn;
     if (isStable()) return rtn;
     /// @todo Remove this const mess crap when HepMC doesn't suck
-    cout << genParticle()->end_vertex() << endl;
+    //cout << genParticle()->end_vertex() << endl;
     GenVertexPtr gv = const_cast<GenVertexPtr>( genParticle()->end_vertex() );
     if (gv == nullptr) return rtn;
     /// @todo Would like to do this, but the range objects are broken
diff -aru ../Rivet-2.6.1/src/Projections/FastJets.cc Rivet-2.6.1/src/Projections/FastJets.cc
--- ../Rivet-2.6.1/src/Projections/FastJets.cc	2018-05-20 16:26:27.000000000 -0400
+++ Rivet-2.6.1/src/Projections/FastJets.cc	2018-08-14 12:28:45.000000000 -0400
@@ -198,6 +198,7 @@
   }


+  /// @todo "Automate" trimming as part of project() with pre-registered Filters
   Jet FastJets::trimJet(const Jet& input, const fastjet::Filter& trimmer) const {
     if (input.pseudojet().associated_cluster_sequence() != clusterSeq().get())
       throw Error("To trim a Rivet::Jet, its associated PseudoJet must have come from this FastJets' ClusterSequence");

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: rivet

Partial log (click to expand)

/nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1/bin/.make-pgfplots-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1/bin/.rivet-which-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1/bin/.rivet-mkhtml-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1/bin/.rivet-config-wrapped: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/56nrxy58wbhvs2sy3rir1jqa68p0kkm5-bash-4.4-p23/bin/bash"
/nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1/bin/.rivet-mkanalysis-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1/bin/.rivet-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1/bin/.rivet-cmphistos-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
/nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1/bin/.rivet-findid-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/9qjc0d5557h3dkpsvfq98b2k96lnb6pw-python-2.7.15/bin/python"
checking for references to /build in /nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1...
/nix/store/ynx1i4wy5ik9qsiqnal4r0kd55785vck-rivet-2.6.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: rivet

Partial log (click to expand)

/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1/bin/.rivet-buildplugin-wrapped: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hp9yq2m1i066irvasv20zr2lmj54fk9h-bash-4.4-p23/bin/bash"
/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1/bin/.rivet-config-wrapped: interpreter directive changed from " /usr/bin/env bash" to "/nix/store/hp9yq2m1i066irvasv20zr2lmj54fk9h-bash-4.4-p23/bin/bash"
/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1/bin/.rivet-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1/bin/.rivet-findid-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1/bin/.rivet-which-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1/bin/.make-plots-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1/bin/.make-pgfplots-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1/bin/.rivet-mkanalysis-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1/bin/.rivet-cmphistos-wrapped: interpreter directive changed from " /usr/bin/env python" to "/nix/store/lcb5fjx5qind424zfx8adrd3f1rn5xar-python-2.7.15/bin/python"
/nix/store/z4ipwxcmdq8lwpxp9wn93qsndvr32jir-rivet-2.6.1

@timokau
Copy link
Member

timokau commented Aug 16, 2018

Is there some issue tracker where you could tell them that changing tarballs after release is very painful for distros? Probably they don't mean harm, they just don't know.

@veprbl
Copy link
Member Author

veprbl commented Aug 16, 2018

@timokau I already tried asking on mailinglist.

@timokau timokau merged commit 255608b into NixOS:master Aug 16, 2018
@GrahamcOfBorg
Copy link

Timed out, unknown build status on aarch64-linux (full log)

Attempted: rivet

Partial log (click to expand)

  CXX      FinalPartons.lo
  CXX      FastJets.lo
  CXX      DressedLeptons.lo
  CXX      DISLepton.lo
  CXX      DISKinematics.lo
  CXX      DISFinalState.lo
  CXX      CentralEtHCM.lo
  CXX      ChargedLeptons.lo
building of '/nix/store/2m6s346j5jb9sakz7fbl08mh55jk2b82-rivet-2.6.1.drv' timed out after 3600 seconds
error: build of '/nix/store/2m6s346j5jb9sakz7fbl08mh55jk2b82-rivet-2.6.1.drv' failed

@veprbl veprbl deleted the pr/rivet_271_bump branch December 1, 2020 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@veprbl @GrahamcOfBorg @timokau