diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-05 18:41:32 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-05 18:41:32 -0400 |
commit | 52fa0c2cc50ab8c2ff75565250f1507957af8f95 (patch) | |
tree | 31b06a214fe877ae3a745ae8543cc08f999e30ab /pkgs/desktops | |
parent | 57d65085125df25b980e63bd51fa5cb39ed3857d (diff) |
pantheon: use repoName
Now these expressions don't look so weird.
Diffstat (limited to 'pkgs/desktops')
24 files changed, 115 insertions, 117 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 4a4850a0824e5..2c46466b3a607 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 9f684c22767d5..f079f7120e8c0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 90f326fb82691..67c7241c3ccec 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index a869ff24e920d..50e4cb95f7799 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index ad4cfa86c279f..825f663b51e02 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index cba593e4c9600..b0ca0e9584658 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 1704db78c5e9e..b4807c6cf3a9d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 74af15e27879e..5cdff0b0ecb20 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 2479d999e8fb6..fa80c41a8ce0f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 2d978d966b93a..5f72b9534ff0b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index e30252bb71c29..3c5e3390605b5 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index d8fa143686ecb..fee5485bb2983 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index 430acfd9ac1a2..c01652f97e998 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 898d5f7b454f0..4d6d38cf37915 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index e7aea3be91efe..01af6c507c0d6 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index a71736887bb1e..8ef85b90a3b1a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index d8634b48570d4..61afde4d82fa2 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 5fe22f0db8161..0485dda94a92f 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index ca0ab888f149b..eafe3b4aa2050 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix index 4e19a65b58d48..ad67007e529d8 100644 --- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "extra-elementary-contracts"; version = "2018-08-21"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "worldofpeace"; repo = pname; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 0d00ee2072dd7..3a497a23b9bbf 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 055706b1521a0..4f8d3e9db4293 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 54f556e3a92ec..f0ba319d32eb5 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -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; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d8514c51f4f70..8381796c45617 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -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}"; }; }; |