Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 108f790054a1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 92be262e9d74
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 21, 2019

  1. networkmanager-fortisslvpn: 1.2.8 → 1.2.10 

    https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/blob/1.2.10/NEWS
    @jtojnar
    jtojnar committed Mar 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    afreakk Hans
    GPG key ID: 8B980523664C3A52
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2522305 View commit details

  2. squash! gnome3.epiphany: 3.30.3 -> 3.32.0 

    gnome3.epiphany: 3.30.3 -> 3.32.1.1
    @jtojnar
    jtojnar committed Mar 21, 2019
    Copy the full SHA
    92be262 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/desktops/gnome-3/core/epiphany/default.nix
  2. +4 −4 pkgs/tools/networking/network-manager/fortisslvpn/default.nix
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/epiphany/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

stdenv.mkDerivation rec {
name = "epiphany-${version}";
version = "3.32.1";
version = "3.32.1.1";

src = fetchurl {
url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0ywhyaal2xlx3safcxp3ys1asy9zmnvxj17ng1l6q2f5nfz963gv";
sha256 = "1b4rxi6v26dwr9m1ifdjrg35yksm6m518mikdrq3m8gb17c46adr";
};

# Tests need an X display
8 changes: 4 additions & 4 deletions pkgs/tools/networking/network-manager/fortisslvpn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3,
{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3,
networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:

let
pname = "NetworkManager-fortisslvpn";
version = "1.2.8";
version = "1.2.10";
in stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w";
sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s";
};

patches = [
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ openfortivpn networkmanager ppp ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];

nativeBuildInputs = [ intltool pkgconfig ];
nativeBuildInputs = [ intltool pkgconfig file ];

configureFlags = [
"--without-libnm-glib"