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

draftsight: 2017-SP2 -> 2018-SP2, remove gstreamer #40020

Merged
merged 1 commit into from May 16, 2018

Conversation

Hodapp87
Copy link
Contributor

@Hodapp87 Hodapp87 commented May 6, 2018

Motivation for this change

This is addressing #39975. In addition, since the same URL is always used for Draftsight while the versions are updated, the hashes were all wrong - so the version required updating anyway.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@Hodapp87 Hodapp87 changed the title draftsight: 2017 SP2 to 2018 SP2, remove gstreamer draftsight: 2017 SP2 -> 2018 SP2, remove gstreamer May 6, 2018
@Hodapp87 Hodapp87 changed the title draftsight: 2017 SP2 -> 2018 SP2, remove gstreamer draftsight: 2017-SP2 -> 2018-SP2, remove gstreamer May 6, 2018
echo "Ignoring broken link $lib"
fi
done
# These libraries shouldn't really be here anyway:
Copy link
Contributor

Choose a reason for hiding this comment

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

A nit: It strikes me that all these paths follow a predictable pattern, is it more robust to use expansion/find here?

@@ -54,12 +85,12 @@ stdenv.mkDerivation {
src = requireFile {
name = "draftSight.deb";
url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0";
Copy link
Member

Choose a reason for hiding this comment

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

ArchLinux is using the following URL: http://dl-ak.solidworks.com/nonsecure/$pkgname/$pkgver/draftSight.rpm, see: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=draftsight#n32 might be a better choice as it includes the 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 just added this change and that URL scheme seems to work fine for the .deb, but are maintainers okay with hotlinking like this? I vaguely recall that when I did the original PR for DraftSight last year I had discussed things with people and the preference was to avoid bypassing license screens like this.

Copy link
Contributor

Choose a reason for hiding this comment

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

It seems "safer" to respect the screen, in general anyway. Maybe check with upstream first? It's kind of annoying & user unfriendly but if that's the way upstream intends it, that should be respected.

Also, fixed URL scheme to link directly.

Addressing NixOS#39975
@jtojnar jtojnar merged commit 685d60c into NixOS:master May 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants