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

libnma: init at 1.8.28 #82699

Merged
merged 16 commits into from
Mar 21, 2020
Merged

libnma: init at 1.8.28 #82699

merged 16 commits into from
Mar 21, 2020

Conversation

hedning
Copy link
Contributor

@hedning hedning commented Mar 16, 2020 •
edited
Loading

Motivation for this change

Network-manager-applet extracted its library parts into libnma.

closes #82653

Things done

Packaged libnma, updated network-manager-applet.

Todo: update reverse dependencies.

  • 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 added the 8.has: package (new) This PR adds a new package label Mar 16, 2020
@ofborg ofborg bot requested review from jtojnar, worldofpeace and Phreedom March 16, 2020 00:11
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Mar 16, 2020
@ofborg ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: pantheon The Pantheon desktop environment labels Mar 16, 2020
@ofborg ofborg bot requested review from obadz, domenkozar, mkg20001 and abbradar March 16, 2020 00:42
@jtojnar
Copy link
Member

jtojnar commented Mar 16, 2020 •
edited
Loading

Weirdly, lot of these does not seem to have nm-applet in runtime closure on unstable:

$ for p in gnome3.gnome-control-center gnome3.gnome-shell pantheon.switchboard-plug-network networkmanager-openvpn networkmanager-iodine networkmanager_strongswan networkmanager-vpnc networkmanager-fortisslvpn networkmanager-l2tp pantheon.wingpanel-indicator-network cinnamon.cinnamon-control-center gnome3.gnome-initial-setup
                                    nix why-depends -f . $p networkmanagerapplet --all
                                end
/nix/store/1cvqg6gi2yj3mf7ix739arcrk8gpz292-gnome-control-center-3.34.4
╠═══bin/.gnome-control-center-wrapped: …etwork/net-device.c../nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/b…
║   bin/gnome-control-center: …manager-1.12.6/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
║   libexec/cc-remote-login-helper: …manager-1.12.6/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
║   libexec/gnome-control-center-search-provider: …manager-1.12.6/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
║   => /nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24
╚═══bin/.gnome-control-center-wrapped: …enter-3.34.4/bin...../nix/store/26whcw77hm04mxg4x9xa8xk6wa8gllcg-gnome-session-3.34.2/libexec/gn…
    => /nix/store/26whcw77hm04mxg4x9xa8xk6wa8gllcg-gnome-session-3.34.2
    ╚═══libexec/gnome-session-binary: …{XDG_DATA_DIRS:+':'}'/nix/store/h9x44184flvi8ywxmny79lms4qsyx39s-gnome-shell-3.34.4/share'.expor…
        => /nix/store/h9x44184flvi8ywxmny79lms4qsyx39s-gnome-shell-3.34.4
        ╚═══bin/gnome-extensions: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            bin/gnome-shell: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            bin/gnome-shell-extension-prefs: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            bin/gnome-shell-extension-tool: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            bin/gnome-shell-perf-tool: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            libexec/gnome-shell-calendar-server: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            libexec/gnome-shell-hotplug-sniffer: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            libexec/gnome-shell-overrides-migration.sh: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            libexec/gnome-shell-perf-helper: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            libexec/gnome-shell-portal-helper: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
            => /nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24
/nix/store/h9x44184flvi8ywxmny79lms4qsyx39s-gnome-shell-3.34.4
╚═══bin/gnome-extensions: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    bin/gnome-shell: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    bin/gnome-shell-extension-prefs: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    bin/gnome-shell-extension-tool: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    bin/gnome-shell-perf-tool: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    libexec/gnome-shell-calendar-server: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    libexec/gnome-shell-hotplug-sniffer: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    libexec/gnome-shell-overrides-migration.sh: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    libexec/gnome-shell-perf-helper: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    libexec/gnome-shell-portal-helper: …xk-ibus-1.5.22/share:/nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/s…
    => /nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24
/nix/store/pj6f1757r9n882ipswrcxg1wvcfvn0zh-switchboard-plug-network-2.2.0
╚═══lib/switchboard/network/libnetworking.so: …:active-connections../nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24/b…
    => /nix/store/wasgfkrqg1v36cl8isbhzfckb067s6rd-network-manager-applet-1.8.24
'networkmanager-openvpn' does not depend on 'networkmanagerapplet'
'networkmanager-iodine' does not depend on 'networkmanagerapplet'
'networkmanager_strongswan' does not depend on 'networkmanagerapplet'
'networkmanager-vpnc' does not depend on 'networkmanagerapplet'
'networkmanager-fortisslvpn' does not depend on 'networkmanagerapplet'
'networkmanager-l2tp' does not depend on 'networkmanagerapplet'
'pantheon.wingpanel-indicator-network' does not depend on 'networkmanagerapplet'
'cinnamon.cinnamon-control-center' does not depend on 'networkmanagerapplet'
'gnome3.gnome-initial-setup' does not depend on 'networkmanagerapplet'

Edit: Never mind, they use the lib output.

jtojnar
jtojnar requested changes Mar 16, 2020
View reviewed changes
pkgs/tools/networking/network-manager/applet/default.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/network-manager/applet/default.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/network-manager/applet/default.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/network-manager/libnma/default.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/network-manager/libnma/default.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch Outdated Show resolved Hide resolved
pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch Show resolved Hide resolved
pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch Outdated Show resolved Hide resolved
pkgs/tools/networking/network-manager/libnma/default.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/network-manager/libnma/default.nix Outdated Show resolved Hide resolved
@jtojnar

This comment has been minimized.

Sign in to view
@ofborg ofborg bot requested a review from jtojnar March 16, 2020 12:38
@ofborg ofborg bot requested a review from jtojnar March 16, 2020 17:02
@hedning hedning marked this pull request as ready for review March 16, 2020 19:38
jtojnar
jtojnar approved these changes Mar 17, 2020
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

LGTM

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 21, 2020
hedning added 16 commits March 21, 2020 04:41
@hedning @jtojnar
libnma: init at 1.8.28
2b77be7 
Upstream have pulled out libnma from networkmanagerapplet.
@hedning @jtojnar
networkmanagerapplet: format
f07bad3
@hedning @jtojnar
networkmanagerapplet: 1.8.24 -> 1.16.0
50438bd 
No longer carries libnma, so we can drop a bunch of dependencies and
simplify a bit.
@hedning @jtojnar
gnome3.gnome-control-center: use libnma
691ddf1
@hedning @jtojnar
gnome3.gnome-shell: use libnma
ea4b4c4
@hedning @jtojnar
pantheon.switchboard-plug-network: use libnma
ac7d843
@hedning @jtojnar
networkmanager-openvpn: use libnma
dd48e9b
@hedning @jtojnar
networkmanager-iodine: use libnma
5e19d8a
@hedning @jtojnar
networkmanager_strongswan: use libnma
e2affc5
@hedning @jtojnar
networkmanager-vpnc: use libnma
f800083
@hedning @jtojnar
networkmanager-fortisslvpn: use libnma
59c82bc
@hedning @jtojnar
networkmanager-l2tp: use libnma
f9f5ab3
@hedning @jtojnar
pantheon.wingpanel-indicator-network: use libnma
31ffa73
@hedning @jtojnar
cinnamon.cjs: remove networkmanagerapplet
142916e 
This doesn't seem to be in use.
@hedning @jtojnar
cinnamon.cinnamon-control-center: use libnma
e0ec958
@hedning @jtojnar
gnome3.gnome-initial-setup: use libnma
b6445d3
@jtojnar jtojnar changed the title Libnma libnma: init at 1.8.28 Mar 21, 2020
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 21, 2020
@ofborg ofborg bot requested a review from jtojnar March 21, 2020 04:25
@jtojnar
Copy link
Member

jtojnar commented Mar 21, 2020

Applied the remaining cleanups and resolved the conflict with 683fa30. Will still run it but it looks ready to merge from here.

@jtojnar jtojnar merged commit cc73796 into NixOS:master Mar 21, 2020
@jtojnar
Copy link
Member

jtojnar commented Mar 21, 2020

Did not notice any issues when running this so let’s merge.

dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Mar 24, 2020
@jtojnar @dtzWill
Merge pull request NixOS#82699 from hedning/libnma
c440bcf 
 libnma: init at 1.8.28

(cherry picked from commit cc73796)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@Phreedom Phreedom Awaiting requested review from Phreedom

@obadz obadz Awaiting requested review from obadz

@domenkozar domenkozar Awaiting requested review from domenkozar

@mkg20001 mkg20001 Awaiting requested review from mkg20001

@abbradar abbradar Awaiting requested review from abbradar

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: pantheon The Pantheon desktop environment 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update network-manager-applet and package new libnma library
2 participants
@hedning @jtojnar