diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-15 00:02:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-15 00:02:50 +0000 |
| commit | 58cfebde3eede0e9c2748c5bed37214bfbc9fe6f (patch) | |
| tree | b9d168d1652129d38f70a1237f1bc1f404a7c867 /pkgs/tools/networking/networkmanager | |
| parent | 09d09e98283d7258e6b199b7ab363f34b004dc6a (diff) | |
| parent | 7eb730a25d36b1aaf6ce0e1bb9a8fb306c06a44e (diff) | |
| download | nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.gz nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.bz2 nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.lz nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.xz nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.zst nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking/networkmanager')
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index f7e98b2b92f..1ade86eb5d0 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "NetworkManager-fortisslvpn"; version = "1.4.0"; - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index 8c8d0dd6a32..8d09977b4e5 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -5,7 +5,7 @@ let pname = "NetworkManager-iodine"; version = "unstable-2019-11-05"; in stdenv.mkDerivation { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index 11a414a8a6a..cef05f11610 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -20,7 +20,7 @@ }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; pname = "NetworkManager-l2tp"; version = "1.20.4"; diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index 6b05dcdcd85..3e4fbb36513 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "NetworkManager-sstp"; version = "1.3.1"; - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; |