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

Commits on Oct 19, 2019

  1. gnome3.gpaste: 3.34.0 → 3.34.1 

    Fixes build with new appstream-glib.
    @jtojnar
    jtojnar committed Oct 19, 2019
    Copy the full SHA
    05c0114 View commit details

  2. Revert "fish: switch to fetchFromGitHub" 

    This reverts commit cc997f2.

I confused the URLs. The files have the same contents but the former URL is recommended by upstream.
    @jtojnar
    jtojnar committed Oct 19, 2019
    Copy the full SHA
    7ba4279 View commit details

  3. gnome3.gpaste: general improvements 

    * Port to Meson (builds much faster)
   * needed a patch to install systemd units
   * soversion does not match but we do not care (Keruspe/GPaste#285)
* Format with nixpkgs-format
* Updated license (BSD since 3.20)
* Drop dbus dependency (we are setting the paths manually anyway)
* Switch to fetchFromGitHub
* Add comment why clutter is needed
    @jtojnar
    jtojnar committed Oct 19, 2019
    Copy the full SHA
    84eabbc View commit details
Showing with 66 additions and 22 deletions.
  1. +60 −16 pkgs/desktops/gnome-3/misc/gpaste/default.nix
  2. +6 −6 pkgs/shells/fish/default.nix
76 changes: 60 additions & 16 deletions pkgs/desktops/gnome-3/misc/gpaste/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,47 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter
, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, gobject-introspection }:
{ stdenv
, fetchFromGitHub
, fetchpatch
, appstream-glib
, clutter
, gjs
, glib
, gnome3
, gobject-introspection
, gtk3
, meson
, mutter
, ninja
, pango
, pkgconfig
, vala
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
version = "3.34.0";
version = "3.34.1";
pname = "gpaste";

src = fetchurl {
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
sha256 = "0mih07b3mb0m1bk8ng9175fgvdbmvsacl4v4kvdnnlnql6rh47gv";
src = fetchFromGitHub {
owner = "Keruspe";
repo = "GPaste";
rev = "v${version}";
sha256 = "1jcj0kgxhad8rblyqhwa2yhkf0010k80w9bm2rajanad2c3bqaxa";
};

patches = [
# Meson fixes
# https://github.com/Keruspe/GPaste/pull/283
# install systemd units
(fetchpatch {
url = "https://github.com/Keruspe/GPaste/commit/a474d8c1f2bd600476ba52dc19f517787845533b.patch";
sha256 = "19m1ar61l2n0vb5a5qfhdny8giivqlyq04l3j9i8llv16vx80rg2";
})
# apply symbol versioning
(fetchpatch {
url = "https://github.com/Keruspe/GPaste/commit/08047752e8dba9363673ddefd422c43075f08006.patch";
sha256 = "0jvcs1a17sijvb2wqyn3y8shdxrhv4kwzxs39kmh9y8nyx2dzhpf";
})

./fix-paths.patch
];

@@ -26,24 +57,37 @@ stdenv.mkDerivation rec {
'';

nativeBuildInputs = [
autoreconfHook pkgconfig vala appstream-glib wrapGAppsHook
appstream-glib
gobject-introspection
meson
ninja
pkgconfig
vala
wrapGAppsHook
];

buildInputs = [
glib gjs mutter gtk3 dbus
clutter pango gobject-introspection
clutter # required by mutter-clutter
gjs
glib
gtk3
mutter
pango
];

configureFlags = [
"--with-controlcenterdir=${placeholder "out"}/share/gnome-control-center/keybindings"
"--with-dbusservicesdir=${placeholder "out"}/share/dbus-1/services"
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
mesonFlags = [
"-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings"
"-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services"
"-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user"
];

enableParallelBuilding = true;
postInstall = ''
${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
'';

meta = with stdenv.lib; {
homepage = https://github.com/Keruspe/GPaste;
description = "Clipboard management system with GNOME3 integration";
homepage = "https://github.com/Keruspe/GPaste";
description = "Clipboard management system with GNOME 3 integration";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = gnome3.maintainers;
12 changes: 6 additions & 6 deletions pkgs/shells/fish/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, coreutils, utillinux,
{ stdenv, fetchurl, coreutils, utillinux,
which, gnused, gnugrep,
groff, man-db, getent, libiconv, pcre2,
gettext, ncurses, python3,
@@ -93,11 +93,11 @@ let

etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;

src = fetchFromGitHub {
owner = "fish-shell";
repo = "fish-shell";
rev = version;
sha256 = "1qh6dka1ayz352ihcq4529hjgnz255gyrqs3xyif6b2ycvrm4ad5";
src = fetchurl {
# There are differences between the release tarball and the tarball github packages from the tag
# Hence we cannot use fetchFromGithub
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl";
};

nativeBuildInputs = [ cmake ];