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

hyper: gnome2 cleanup #41170

Merged
merged 2 commits into from May 29, 2018
Merged

hyper: gnome2 cleanup #41170

merged 2 commits into from May 29, 2018

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Removed/updated gnome2 references (Part of #39976).

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.
Notes

There was this in the all-packages.nix

hyperterm = self.hyper;

Seemed uneeded to me so I removed it.

@FRidh FRidh added the 6.topic: GNOME GNOME desktop environment and its underlying platform label May 28, 2018
@GrahamcOfBorg GrahamcOfBorg added 8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 and removed 6.topic: GNOME GNOME desktop environment and its underlying platform labels May 28, 2018
jtojnar
jtojnar reviewed May 29, 2018
View reviewed changes
pkgs/applications/misc/hyper/default.nix Outdated

let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
stdenv.cc.cc gnome3.gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
Copy link
Contributor

@jtojnar jtojnar May 29, 2018 •
edited

Choose a reason for hiding this comment

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

gnome3 now no longer contains gtk2 #41209

@xeji
Copy link
Contributor

xeji commented May 29, 2018

@GrahamcOfBorg build hyper

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: hyper

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: hyper

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: hyper

Partial log (click to expand)

building
no Makefile, doing nothing
installing
post-installation fixup
strip is /nix/store/92d2ifxcni4n3zx9s8wnkcjlvnx5ajlc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/a4svrpwwsb6d84j77pqvmzfsrprklp2w-hyper-2.0.0/bin
patching script interpreter paths in /nix/store/a4svrpwwsb6d84j77pqvmzfsrprklp2w-hyper-2.0.0
/nix/store/a4svrpwwsb6d84j77pqvmzfsrprklp2w-hyper-2.0.0/opt/Hyper/resources/bin/hyper: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/bash"
checking for references to /build in /nix/store/a4svrpwwsb6d84j77pqvmzfsrprklp2w-hyper-2.0.0...
/nix/store/a4svrpwwsb6d84j77pqvmzfsrprklp2w-hyper-2.0.0

@xeji xeji merged commit 52b3f49 into NixOS:master May 29, 2018
orivej added a commit that referenced this pull request May 30, 2018
@orivej
Merge branch 'master' into staging
3576d47 
* master: (30 commits)
  bitlbee: fix build
  git: 2.17.0 -> 2.17.1
  sc-controller: 0.4.2 -> 0.4.3
  zeroc-ice: fix parallel building
  pythonPackages.bsddb3: fix build after 0fd461d
  haskellPackages.hlibgit2: fix build after #28029
  gdk-pixbuf: patch library rpath references on darwin
  virtualbox: fix build after #28029
  GHCJS darwin fixes (#41120)
  neovim-remote: 1.8.6 -> 2.0.5
  messenger-for-desktop: remove (#41224)
  typora: gnome2 cleanup (#41167)
  discord: gnome2 cleanup (#41174)
  skypeforlinux: gnome2 cleanup (#41176)
  wire-desktop: gnome2 cleanup (#41155)
  hyper: gnome2 cleanup (#41170)
  drone: 0.5 -> 0.8.5 (#41200)
  racket: use proper uname, allow for unix sockets
  kytea: fix build after #28029
  yoda: fix build after #28029
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@worldofpeace @xeji @GrahamcOfBorg @jtojnar @FRidh