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: b08b773f2435
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1180d547dafb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 26, 2020

  1. surf: 2.0 -> unstable-2019-02-08

    @SuperSandro2000
    SuperSandro2000 committed Nov 26, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    80c78cc View commit details

  2. Merge pull request #101430 from SuperSandro2000/81629-surf 

    surf: 2.0 -> 2019-02-08-unstable
    @SuperSandro2000
    SuperSandro2000 authored Nov 26, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1180d54 View commit details
Showing with 10 additions and 9 deletions.
  1. +10 −9 pkgs/applications/networking/browsers/surf/default.nix
19 changes: 10 additions & 9 deletions pkgs/applications/networking/browsers/surf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{ lib, stdenv, fetchurl
{ lib, stdenv, fetchgit
, pkgconfig, wrapGAppsHook
, glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
, xorg, dmenu, findutils, gnused, coreutils
, patches ? null
}:

stdenv.mkDerivation rec {
pname = "surf";
version = "2.0";
version = "unstable-2019-02-08";

src = fetchurl {
url = "https://dl.suckless.org/surf/surf-${version}.tar.gz";
sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps";
src = fetchgit {
url = "git://git.suckless.org/surf";
rev = "d068a3878b6b9f2841a49cd7948cdf9d62b55585";
sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m";
};

nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ glib glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ];
buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ];

inherit patches;

@@ -32,9 +33,9 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
description = "A simple web browser based on WebKit/GTK";
description = "A simple web browser based on WebKitGTK";
longDescription = ''
Surf is a simple web browser based on WebKit/GTK. It is able to display
surf is a simple web browser based on WebKitGTK. It is able to display
websites and follow links. It supports the XEmbed protocol which makes it
possible to embed it in another application. Furthermore, one can point
surf to another URI by setting its XProperties.