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

lumo 1.10.1: fix missing dependency #80655

Merged
merged 1 commit into from May 6, 2020
Merged

lumo 1.10.1: fix missing dependency #80655

merged 1 commit into from May 6, 2020

Conversation

@hlolli
Copy link
Member

hlolli commented Feb 20, 2020

Motivation for this change

Lumo is currently failing on linux https://hydra.nixos.org/build/112812334 and a fix was merged today

this merge includes darwin support https://hydra.nixos.org/build/113308416 which is failing, I hope darwin can safely be left out here without affecting the linux support?

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 nixpkgs-review --run "nixpkgs-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.
@worldofpeace
Copy link
Member

worldofpeace commented Feb 20, 2020

Can you please cherry-pick the actual commit ad56672, and not the merge commit?

@hlolli hlolli force-pushed the hlolli:release/fix-lumo branch from a904869 to 138d09f Feb 20, 2020
@hlolli
Copy link
Member Author

hlolli commented Feb 20, 2020

@worldofpeace I've been in the habit of squashing commits on the gihub.com ui, so I messed up a bit by not squashing, so I thought the merge would make sense in this case as it would encompass the changes from 2 commits. Now I've cherry picked the 2 commits, the other one titled terribly "cleanup". It's a small mess, I hope I'm forgiven :)

@worldofpeace
Copy link
Member

worldofpeace commented Feb 20, 2020

@hlolli You can do an interactive rebase and squash that cleanup commit into the first, and make sure the first commit has the

(cherry picked from commit ef712ff)
(cherry picked from commit ad56672)

in the body.

@hlolli hlolli force-pushed the hlolli:release/fix-lumo branch from 138d09f to c2b663d Feb 20, 2020
@hlolli
Copy link
Member Author

hlolli commented Feb 20, 2020

@worldofpeace worldofpeace changed the title release-20.03-cherry-pick: lumo Merge pull request #59414 from hlolli/lumo-bump [20.03] lumo 1.9.0 -> 1.10.1 plus darwin support Feb 21, 2020
@worldofpeace
Copy link
Member

worldofpeace commented Feb 21, 2020

@GrahamcOfBorg build lumo

"google-closure-compiler-js": "20170910.0.1",
"glob": "^7.1.3",
"gunzip-maybe": "^1.4.1",
"insert-module-globals": "^7.2.0",
"jszip": "github:anmonteiro/jszip#patch-1",

This comment has been minimized.

Copy link
@Mic92

Mic92 May 4, 2020

Contributor

This repository is no longer reachable.

@hlolli hlolli changed the base branch from release-20.03 to master May 4, 2020
@hlolli hlolli changed the title [20.03] lumo 1.9.0 -> 1.10.1 plus darwin support lumo 1.9.0 -> 1.10.1 plus darwin support May 4, 2020
@hlolli hlolli force-pushed the hlolli:release/fix-lumo branch from c2b663d to 4720129 May 4, 2020
@hlolli hlolli force-pushed the hlolli:release/fix-lumo branch from 4720129 to c759407 May 4, 2020
@hlolli hlolli force-pushed the hlolli:release/fix-lumo branch from c759407 to a8a2337 May 4, 2020
@hlolli
Copy link
Member Author

hlolli commented May 4, 2020

@Mic92 sorry about being a bit clueless, I didn't remember my changes being merged already :) so I changed the commit message to just refer to a fix. I tested locally and the binary compiles and runs fine, need to research if this patch was of any importance, but afaik, it wasn't.

@hlolli hlolli changed the title lumo 1.9.0 -> 1.10.1 plus darwin support lumo 1.10.1: fix missing dependency May 4, 2020
@Mic92 Mic92 merged commit f1eef41 into NixOS:master May 6, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
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="a8a2337"; rev="a8a2337c15f1381ed85bb00153bc4e31cdaaaefa"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a8a2337"; rev="a8a2337c15f1381ed85bb00153bc4e31cdaaaefa"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a8a2337"; rev="a8a2337c15f1381ed85bb00153bc4e31cdaaaefa"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a8a2337"; rev="a8a2337c15f1381ed85bb00153bc4e31cdaaaefa"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a8a2337"; rev="a8a2337c15f1381ed85bb00153bc4e31cdaaaefa"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a8a2337"; rev="a8a2337c15f1381ed85bb00153bc4e31cdaaaefa"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="a8a2337"; rev="a8a2337c15f1381ed85bb00153bc4e31cdaaaefa"; } ./pkgs/t
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
@Mic92
Copy link
Contributor

Mic92 commented May 6, 2020

Thanks!

@hlolli hlolli deleted the hlolli:release/fix-lumo branch May 6, 2020
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.