pantheon: use repoName

Now these expressions don't look so weird.
This commit is contained in:
worldofpeace 2019-08-05 18:41:32 -04:00
parent 57d6508512
commit 52fa0c2cc5
24 changed files with 115 additions and 117 deletions

View file

@ -4,22 +4,22 @@
, appstream, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "calculator";
pname = "elementary-calculator";
version = "1.5.2";
name = "elementary-${pname}-${version}";
repoName = "calculator";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "1vdgl89hdf9q1ya6as7310hlr0xls3w7js2gzsd9z8arb6037ccl";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -5,22 +5,22 @@
, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "calendar";
pname = "elementary-calendar";
version = "5.0";
name = "elementary-${pname}-${version}";
repoName = "calendar";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "0yiis5ig98gjw4s2qh8lppkdmv1cgi6qchxqncsjdki7yxyyni35";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -3,22 +3,22 @@
, libcanberra, clutter-gtk, clutter-gst, elementary-icon-theme, appstream, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "camera";
pname = "elementary-camera";
version = "1.0.4";
name = "elementary-${pname}-${version}";
repoName = "camera";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "1p532f961cjdg7szmxw7hw3av9v342hv5rx7in3bbhlc7adxflyc";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -4,22 +4,22 @@
, vte, webkitgtk, zeitgeist, ctags, libgit2-glib, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "code";
pname = "elementary-code";
version = "3.1.1";
name = "elementary-${pname}-${version}";
repoName = "code";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "0l469fi5vbcazwfhy320nr8wrzz96jbrqn4hag0kdm16wvf5x1yc";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -4,22 +4,22 @@
, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "files";
pname = "elementary-files";
version = "4.1.9";
name = "elementary-${pname}-${version}";
repoName = "files";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "12p1li9a7kqdlgkq20svaly5kr661ww93qngaiic6zv1bdw2bpmv";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -6,22 +6,22 @@
, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "music";
pname = "elementary-music";
version = "5.0.4";
name = "elementary-${pname}-${version}";
repoName = "music";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "02qjsf9xnfh043xbls9mll2r1wcdvclw60x8wysv12rhbm90gwvp";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -4,22 +4,22 @@
, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, elementary-icon-theme }:
stdenv.mkDerivation rec {
pname = "photos";
pname = "elementary-photos";
version = "2.6.4";
name = "elementary-${pname}-${version}";
repoName = "photos";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -3,22 +3,22 @@
, libcanberra, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
version = "1.6.2";
name = "elementary-${pname}-${version}";
repoName = "screenshot";
src = fetchFromGitHub {
owner = "elementary";
repo = "screenshot";
repo = repoName;
rev = version;
sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = "screenshot";
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -3,22 +3,22 @@
, elementary-icon-theme, appstream, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "terminal";
pname = "elementary-terminal";
version = "5.3.6";
name = "elementary-${pname}-${version}";
repoName = "terminal";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "0jp21sy8k3jq3ycvng9yy2hbhcvfgiknxxa8vcg3c06vqhadmnc3";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -3,22 +3,22 @@
, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "videos";
pname = "elementary-videos";
version = "2.6.3";
name = "elementary-${pname}-${version}";
repoName = "videos";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja }:
stdenv.mkDerivation rec {
pname = "stylesheet";
pname = "elementary-gtk-theme";
version = "5.2.5";
name = "elementary-gtk-theme-${version}";
repoName = "stylesheet";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "0934rfdwkn4315mhayzba8a3b6i1xczp66gl6n45hh5c81gb2p65";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-gtk-theme";
inherit repoName;
attrPath = pname;
};
};

View file

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, pantheon, meson, python3,ninja, hicolor-icon-theme, gtk3 }:
stdenv.mkDerivation rec {
pname = "icons";
pname = "elementary-icon-theme";
version = "5.0.4";
name = "elementary-icon-theme-${version}";
repoName = "icons";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "0ha7biqvmkv68x1gi9bfcn5z0ld067pa5czx0pyf053pa86lg3hx";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-icon-theme";
inherit repoName;
attrPath = pname;
};
};

View file

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig }:
stdenv.mkDerivation rec {
pname = "sound-theme";
pname = "elementary-sound-theme";
version = "1.0";
name = "elementary-${pname}-${version}";
repoName = "sound-theme";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "1dc583lq61c361arjl3s44d2k72c46bqvcqv1c3s69f2ndsnxjdz";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, pantheon }:
stdenv.mkDerivation rec {
pname = "wallpapers";
pname = "elementary-wallpapers";
version = "5.3";
name = "elementary-${pname}-${version}";
repoName = "wallpapers";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "1i0zf9gzhwm8hgq5cp1xnxipqjvgzd9wfiicz612hgp6ivc0z0ag";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, pantheon }:
stdenv.mkDerivation rec {
pname = "default-settings";
pname = "elementary-default-settings";
version = "5.1.0";
name = "elementary-${pname}-${version}";
repoName = "default-settings";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -5,22 +5,22 @@
, clutter-gtk, libGL, dbus, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "greeter";
pname = "elementary-greeter";
version = "3.3.1";
name = "elementary-${pname}-${version}";
repoName = "greeter";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, gtk3 }:
stdenv.mkDerivation rec {
pname = "print";
pname = "elementary-print-shim";
version = "0.1.3";
name = "elementary-print-shim-${version}";
repoName = "print";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "1w3cfap7j42x14mqpfqdm46hk5xc0v5kv8r6wxcnknr3sfxi8qlp";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}-shim";
inherit repoName;
attrPath = pname;
};
};

View file

@ -7,7 +7,7 @@ let
#
#
# Upstream relies on /etc/skel to initiate a new users home directory with planks dockitems.
# Upstream relies on /etc/skel to initiate a new users home directory with plank's dockitems.
#
# That is not possible within nixos, but we can achieve this easily with a simple script that copies
# them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session
@ -44,22 +44,22 @@ let
in
stdenv.mkDerivation rec {
pname = "session-settings";
pname = "elementary-session-settings";
version = "5.0.3";
name = "elementary-${pname}-${version}";
repoName = "session-settings";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "1vrjm7bklkfv0dyafm312v4hxzy6lb7p1ny4ijkn48kr719gc71k";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -2,22 +2,22 @@
, gtk3, glib, granite, libgee, elementary-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "shortcut-overlay";
pname = "elementary-shortcut-overlay";
version = "1.0.1";
name = "elementary-${pname}-${version}";
repoName = "shortcut-overlay";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "1ph4rx2l5fn0zh4fjfjlgbgskmzc0lvzqgcv7v4kr5m4rij1p4y4";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
pname = "extra-elementary-contracts";
version = "2018-08-21";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "worldofpeace";
repo = pname;

View file

@ -4,22 +4,22 @@
, bc }:
stdenv.mkDerivation rec {
pname = "applications-menu";
pname = "wingpanel-applications-menu";
version = "2.4.3";
name = "wingpanel-${pname}-${version}";
repoName = "applications-menu";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "wingpanel-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -2,22 +2,22 @@
, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "capnet-assist";
pname = "elementary-capnet-assist";
version = "2.2.3";
name = "elementary-${pname}-${version}";
repoName = "capnet-assist";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, pantheon, makeWrapper, meson, ninja, desktop-file-utils, glib, coreutils, elementary-settings-daemon, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "dpms-helper";
pname = "elementary-dpms-helper";
version = "1.0";
name = "elementary-${pname}-${version}";
repoName = "dpms-helper";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
repo = repoName;
rev = version;
sha256 = "0svfp0qyb6nx4mjl3jx4aqmb4x24m25jpi75mdis3yfr3c1xz9nh";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
attrPath = "elementary-${pname}";
inherit repoName;
attrPath = pname;
};
};

View file

@ -44,16 +44,16 @@ stdenv.mkDerivation rec {
pname = "elementary-settings-daemon";
version = "3.30.2";
projectName = "gnome-settings-daemon";
repoName = "gnome-settings-daemon";
src = fetchurl {
url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz";
url = "mirror://gnome/sources/${repoName}/${stdenv.lib.versions.majorMinor version}/${repoName}-${version}.tar.xz";
sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
};
# Source for ubuntu's patchset
src2 = fetchgit {
url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}";
url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}";
rev = "refs/tags/ubuntu/${version}-1ubuntu1";
sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c";
};
@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = projectName;
packageName = repoName;
attrPath = "pantheon.${pname}";
};
};