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

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
+1,900 −1,530

Conversation

hlolli
Copy link
Member

@hlolli hlolli commented Feb 20, 2020 •
edited
Loading

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.

Sorry, something went wrong.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Feb 20, 2020
@worldofpeace
Copy link
Contributor

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

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

@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
Copy link
Member Author

hlolli commented Feb 20, 2020

@worldofpeace done

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

worldofpeace commented Feb 21, 2020 •
edited
Loading

@GrahamcOfBorg build lumo

Mic92
Mic92 reviewed May 4, 2020
View reviewed changes
pkgs/development/interpreters/clojurescript/lumo/package.json Outdated
"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",
Copy link
Member

Choose a reason for hiding this comment

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

This repository is no longer reachable.

@hlolli hlolli changed the base branch from release-20.03 to master May 4, 2020 17:02
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch labels 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 release/fix-lumo branch from c2b663d to 4720129 Compare May 4, 2020 20:14
@hlolli hlolli force-pushed the release/fix-lumo branch from 4720129 to c759407 Compare May 4, 2020 20:16
@hlolli
lumo 1.10.1: fix missing npm dependency

Unverified

The email in this signature doesn’t match the committer email.
GPG key ID: B2D065AD4D6E0C81
Expired
Learn about vigilant mode
a8a2337
@hlolli hlolli force-pushed the release/fix-lumo branch from c759407 to a8a2337 Compare May 4, 2020 20:17
@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
@ofborg ofborg bot removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch labels May 4, 2020
@hlolli hlolli mentioned this pull request May 4, 2020
Closed
@Mic92 Mic92 merged commit f1eef41 into NixOS:master May 6, 2020
@Mic92
Copy link
Member

Mic92 commented May 6, 2020

Thanks!

@hlolli hlolli deleted the release/fix-lumo branch May 6, 2020 08:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hlolli @worldofpeace @Mic92