Commit Graph

256 Commits

Author SHA1 Message Date
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
Will Dietz
447d625edc networkmanager,modemmanager: fix service symlinks for systemd v243
Fixes problems such as:

systemd[1]: Failed to put bus name to hashmap: File exists
systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation.

Problem is that systemd treats symlinks to files outside the service
path differently, causing our old workaround to look like two separate services.

These symlinks are intended to be a means for manually emulating
the behavior of the `Alias=` directive in these services.
Unfortunately even making these symlinks relative isn't enough,
since they don't make it to where it matters--
that only makes the links in /etc/static/systemd/system/*
relative, with systemd still being shown non-relative links
in /etc/systemd/system/*.

To fix this, drop all of this at the package level
and instead simply specify the aliases in the NixOS modules.

Also handle the same for modemmanager,
since the networkmanager NixOS module also handles that.
2019-09-14 08:05:27 -04:00
Will Dietz
6654b52c8b
networkmanager-openconnect: 1.2.4 -> 1.2.6 2019-09-13 23:11:26 -05:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
worldofpeace
7bb8f05f12 treewide: use glib.{getSchemaPath, makeSchemaPath} 2019-08-26 21:28:17 -04:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Paul TREHIOU
1e2ad9e6bc networkmanager: hardcode parts of the source URL (#67100)
Broke the build as the pname variable was used to create the URL
Introduced by 46420bbaa3
2019-08-20 17:05:19 -04:00
Rickard Nilsson
225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk
8fa3fb092e
Merge pull request #65624 from worldofpeace/bump-networkmanager
networkmanager: 1.18.1 -> 1.18.2
2019-08-03 08:02:35 +02:00
Will Dietz
de3bbbf46c networkmanager: libaudit yes but disabled by default 2019-07-31 02:55:25 -04:00
Will Dietz
ee409c1cc1 networkmanager: disable dhcpcanon instead of assuming in /usr/* 2019-07-31 02:55:15 -04:00
worldofpeace
3c77163d46 networkmanager: 1.18.1 -> 1.18.2
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.18.2/NEWS
2019-07-31 02:54:59 -04:00
worldofpeace
f4b9195e36
Merge pull request #62919 from dtzWill/update/networkmanager_strongswan-1.4.5
networkmanager_strongswan: 1.4.4 -> 1.4.5
2019-07-31 02:38:51 -04:00
R. RyanTM
6daac686c5 networkmanager: 1.18.0 -> 1.18.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/network-manager/versions
2019-06-18 11:16:20 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Will Dietz
e69a999095
networkmanager_strongswan: 1.4.4 -> 1.4.5 2019-06-09 21:54:55 -05:00
Will Dietz
b5f80fdd4c
networkmanagerapplet: 1.8.20 -> 1.8.22 2019-06-04 15:10:49 -05:00
Will Dietz
666bcbeb5a
Merge pull request #60903 from dtzWill/fix/networkmanager-sed-path
networkmanager: sed from gnused, not coreutils! fix bad path
2019-05-07 22:50:58 -05:00
Jan Tojnar
e99ff9b98d
networkmanager: Stop using libredirect for building introspection (#60909)
networkmanager: Stop using libredirect for building introspection
2019-05-05 16:10:38 +02:00
Jan Tojnar
6f7e06bd5a
networkmanager: Stop using libredirect for building docs
Our gobject-introspection patches make the shared library paths absolute
in the GIR files. When building docs, the library is not yet installed,
though, so we need to replace the absolute path with a local one during build.

Previously we used LD_PRELOAD to load libredirect and rewrite the installed paths
to ones in the build directory. That was unnecessary complicated and many people
spent whole night trying to figure out why it breaks some programs.

Using a symlink from the installed location to the build directory fixes
the issue as well, while having much less moving parts, thus being easier to grasp.
The symlink will be overridden during installation.
2019-05-04 05:47:04 +02:00
Will Dietz
5ce6bfea53 networkmanager: sed from gnused, not coreutils! fix bad path 2019-05-03 19:58:00 -05:00
Jan Tojnar
47bf62c0c9
networkmanager: no need for parallel building flag, drop
Per reviewer feedback, thanks!

Co-Authored-By: dtzWill <github@wdtz.org>
2019-04-26 14:56:27 -05:00
Will Dietz
b0537770d9 networkmanager: 1.16.0 -> 1.18.0
* build w/iwd support since it's free (no dep required!)
* move to iputils for minor utilities, instead of inetutils
* parallel building :)

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/raw/1.18.0/NEWS
2019-04-22 22:12:53 -05:00
Jan Tojnar
a961a289a9
networkmanager: port to Meson
All hail Meson!

One serious issue is that building docs does not work.

We patch gobject-introspection to use absolute paths for shared libraries
in GIR files. Building the NetworkManager docs relies on the produced
introspection data but since the library is not yet installed
at the time the docs are generated, the build will fail.

It works in Autotools for some reason; they probably use
the pregenerated GIRs from the tarball.

Disabling the docs completely is not possible at the moment either,
since nmc [depends on them][1].

I have decided to fix this by pointing the installed location to the one
in the build directory using libredirect. Unfortunately, we cannot just set
the environment variables directly, since the build system runs
the documentation generator in a clean environment.

I have also added man, doc and devdoc outputs so the generated files have
somewhere to go.

Secondly, since Nix store is immutable, we also cannot use the package prefix
for configuration and mutable state data. At the same time, we cannot write
to the appropriate global directories during build. Autotools allowed to change
this in installFlags but Meson lacks similar mechanism so we need to patch
the build files.

Finally, I also removed the at_console patch since the permission has been
removed in 0.9.10.

[1]: https://bugzilla.gnome.org/show_bug.cgi?id=796755
2019-04-22 12:10:10 +02:00
worldofpeace
cc97412a26
Merge pull request #59339 from worldofpeace/elementary-updates-etcs
pantheon updates, etc.
2019-04-18 12:01:18 -04:00
worldofpeace
cb3579d8c4 networkmanagerapplet: hardcode for eap gschema
This is needed for the networking plug in pantheon.switchboard
and the related indicator in pantheon.wingpanel
2019-04-18 11:28:18 -04:00
Bob van der Linden
15d239fa2c
network-manager: /var/run -> /run 2019-04-11 20:05:34 +02:00
Jan Tojnar
3486f5357e
networkmanager-fortisslvpn: 1.2.8 → 1.2.10
https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/blob/1.2.10/NEWS
2019-04-05 12:14:00 +02:00
Tor Hedin Brønner
99d4472db2
networkmanager: 1.14.4 -> 1.16.0
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.16.0/NEWS
2019-04-05 12:13:28 +02:00
Jan Tojnar
cb1a20499a
Merge branch 'master' into staging 2019-04-05 11:37:15 +02:00
Will Dietz
cdf96e8a08 networkmanager-l2tp: 1.2.10 -> 1.2.12
Same patchups but moved to new file.
2019-04-02 17:57:00 +01:00
John Ericson
4ccb74011f Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
2019-04-01 00:40:03 -04:00
volth
2be90ccb4f gnome3.gtk -> gtk3
fix evaluation when config.allowAliases == false

(regression after #55735)
2019-03-24 14:34:39 -04:00
Florian Klink
69cd72b3e1 network-manager: add legacy service name as fallback
This prevents NetworkManager from not starting back up while switching
configurations.

This can be removed once 19.10 is released.
2019-03-20 00:36:33 +01:00
Jörg Thalheim
b488c60cdb network-manager: rename systemd service back to match upstream
Compatibility with other distributions/software and expectation
of users coming from other systems should have higher priority over consistency.
In particular this fixes #51375, where the NetworkManager-wait-online.service
broke as a result of this.
2019-03-19 23:48:08 +01:00
Will Dietz
c39fb495dd
networkmanager: 1.14.4 -> 1.14.6 (#56253)
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.14.6/NEWS
2019-02-23 23:21:36 -06:00
Matthew Bauer
b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
R. RyanTM
ec3525b652 gnome3.networkmanagerapplet: 1.8.18 -> 1.8.20
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/network-manager-applet/versions
2019-02-16 00:54:28 -08:00
Frederik Rietdijk
fd48a94b62 Merge staging-next into staging 2019-02-16 09:30:46 +01:00
Jan Tojnar
606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
Will Dietz
97fdd97121 networkmanager-openvpn: 1.8.8 -> 1.8.10 2019-02-11 17:29:59 -06:00
Will Dietz
e66e24e000 networkmanager: leave thunderbolt rule alone, it's builtin 2019-01-13 17:25:44 -06:00
worldofpeace
36c5f30d24 networkmanager: cleanup using more placeholder 2019-01-02 02:07:27 -05:00
Jan Tojnar
f748cc85bd network-manager: fix paths 2019-01-02 02:07:27 -05:00
Will Dietz
be14e9fa29 networkmanager: 1.12.2 -> 1.14.4 2019-01-02 02:07:27 -05:00