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

vassal: 3.3.2 -> 3.14.12 #107897

Merged
merged 1 commit into from Jan 11, 2021
Merged

vassal: 3.3.2 -> 3.14.12 #107897

merged 1 commit into from Jan 11, 2021

Conversation

samuelrivas
Copy link
Contributor

Motivation for this change
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.

@ofborg ofborg bot requested a review from tvestelind December 29, 2020 18:48
SuperSandro2000
SuperSandro2000 requested changes Dec 29, 2020
View reviewed changes
pkgs/games/vassal/default.nix Outdated
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, jre, makeWrapper }:

stdenv.mkDerivation rec {
name = "VASSAL-3.3.2";
name = "VASSAL-3.4.12";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
name = "VASSAL-3.4.12";
pname = "VASSAL";
version = "3.4.12";

pkgs/games/vassal/default.nix Outdated

src = fetchurl {
url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2";
sha256 = "1abhlkl27gyfa1lghvv76xa6ks5hiwv2s9wb9ddadm0m07f87n1w";
url = "https://github.com/vassalengine/vassal/releases/download/3.4.12/VASSAL-3.4.12-linux.tar.bz2";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
url = "https://github.com/vassalengine/vassal/releases/download/3.4.12/VASSAL-3.4.12-linux.tar.bz2";
url = "https://github.com/vassalengine/vassal/releases/download/${version}/VASSAL-${version}-linux.tar.bz2";

@wishfort36
Copy link
Contributor

Result of nixpkgs-review pr 107897 run on x86_64-linux 1

1 package built:
  • vassal

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107897 run on x86_64-linux 1

1 package built:
  • vassal

lgpl21 is a deprecated license, check if project uses lgpl21Plus or lgpl21Only and change meta.license accordingly.

@samuelrivas samuelrivas force-pushed the update-vassal-to-3-14 branch 2 times, most recently from 34d4042 to 5171ba7 Compare December 30, 2020 08:30
bennyandresen
bennyandresen reviewed Dec 31, 2020
View reviewed changes
pkgs/games/vassal/default.nix Outdated
url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2";
sha256 = "1abhlkl27gyfa1lghvv76xa6ks5hiwv2s9wb9ddadm0m07f87n1w";
src = fetchzip {
url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-linux.tar.bz2";

This comment was marked as outdated.

Sign in to view

Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't see that it's using the prebuilt linux, so the above comment is not relevant.

However the ${pname}-linux.tar.bz2 should be ${name}-linux.tar.bz2

Also the whole thing doesn't builds for me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Uh, sorry. This worked for me because I had the source already in the store and the sha didn't change when I rewrote the URL to use variables.

I have deleted the source and the package from the store and rebuilt, now seems to work.

SuperSandro2000
SuperSandro2000 requested changes Dec 31, 2020
View reviewed changes
pkgs/games/vassal/default.nix Outdated
name = "VASSAL-3.3.2";
pname = "VASSAL";
version = "3.4.12";
name = "${pname}-${version}";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
name = "${pname}-${version}";

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Doesn't the derivation need a name argument?

Copy link
Contributor

Choose a reason for hiding this comment

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

According to this: http://blog.ielliott.io/nix-docs/stdenv-mkDerivation.html

name is set to "${pname}-${version}"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't know that. Updated

bennyandresen
bennyandresen approved these changes Jan 3, 2021
View reviewed changes
Copy link
Contributor

@bennyandresen bennyandresen left a comment

Choose a reason for hiding this comment

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

LGTM, builds and runs on my end.

@samuelrivas
vassal: 3.3.2 -> 3.14.12
63faa12 
Extra changes:

  - use variables to avoid repetition
  - update licence
  - use fetczip
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 107897 run on x86_64-linux 1

1 package built:
  • vassal

@SuperSandro2000 SuperSandro2000 merged commit 08ca817 into NixOS:master Jan 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bennyandresen bennyandresen bennyandresen approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@tvestelind tvestelind Awaiting requested review from tvestelind

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@samuelrivas @wishfort36 @SuperSandro2000 @bennyandresen