nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #139821 from bobby285271/pantheon

Browse Source
This commit is contained in:
Sandro 2021-09-29 11:36:28 +02:00 committed by GitHub
commit efb77effd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/pantheon/apps/elementary-code/default.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, pkg-config
@ -31,7 +30,7 @@
stdenv.mkDerivation rec {
pname = "elementary-code";
version = "6.0.0";
version = "6.0.1";
repoName = "code";
@ -39,18 +38,9 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1w1m52mq3zr9alkxk1c0s4ncscka1km5ppd0r6zm86qan9cjwq0f";
sha256 = "120328pprzqj4587yj54yya9v2mv1rfwylpmxyr5l2qf80cjxi9d";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/code/pull/1090
(fetchpatch {
url = "https://github.com/elementary/code/commit/88dc40d7bbcc2288ada6673eb8f4fab345d97882.patch";
sha256 = "16y20bvslcm390irlib759703lvf7w6rz4xzaiazjj1r1njwinvv";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";

4
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -32,7 +32,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "6.0.2";
version = "6.0.3";
repoName = "files";
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1i514r3adypmcwinmv4c1kybims16xi4i3akx0yy04dib92hbk7c";
sha256 = "10hgj5rrqxzk4q8jlhkwwrs4hgyavlhz3z1pqf36y663bq3h0izv";
};
passthru = {

4
pkgs/desktops/pantheon/apps/elementary-mail/default.nix
View File

@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "elementary-mail";
version = "6.1.1";
version = "6.2.0";
repoName = "mail";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "15ai0x9236pjx76m0756nyc1by78v0lg1dgdiifk868krdvipzzx";
sha256 = "1ab620zhwqqjq1bs1alvpcw9jmdxjij0ywczvwbg8gqvcsc80lkn";
};
passthru = {

4
pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
View File

@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "elementary-tasks";
version = "6.0.3";
version = "6.0.4";
repoName = "tasks";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0a6zgf7di4jyl764pn78wbanm0i5vrkk5ks3cfsvi3baprf3j9d5";
sha256 = "1gb51gm8qgd8yzhqb7v69p2f1fgm3qf534if4lc85jrjsb8hgmhl";
};
passthru = {

14
pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, meson
@ -16,24 +15,15 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-applications";
version = "6.0.0";
version = "6.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0hgvmrgg6g2sjb3sda7kzfcd3zgngd5w982drl6ll44k1mh16gsj";
sha256 = "18izmzhqp6x5ivha9yl8gyz9adyrsylw7w5p0cwm1bndgqbi7yh5";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-applications/pull/163
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-applications/commit/25db490654ab41694be7b7ba19218376f42fbb8d.patch";
sha256 = "16y8zcwnnjsh72ifpyqcdb9f5ajdj0iy8kb5sj6v77c1cxdhrv29";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";

4
pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
View File

@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts";
version = "6.2.0";
version = "6.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1lp3i31jzp21n43d1mh4d4i8zgim3q3j4inw4hmyimyql2s83cc3";
sha256 = "1q3f7zr04p2100mb255zy38il2i47l6vqdc9a9acjbk3n7q5sf92";
};
passthru = {

6
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
View File

@ -12,7 +12,6 @@
, libgee
, gettext
, gtk3
, appstream
, gnome-menus
, json-glib
, elementary-dock
@ -27,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "2.8.2";
version = "2.9.0";
repoName = "applications-menu";
@ -35,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1pm3dnq35vbvyxqapmfy4frfwhc1l2zh634annlmbjiyfp5mzk0q";
sha256 = "0mwjw2ghbdj336ax5srxbqnjprdhj1if7sm9k9idqkmifpzccs7i";
};
passthru = {
@ -45,7 +44,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
appstream
gettext
meson
ninja

14
pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
View File

@ -3,7 +3,6 @@
, nix-update-script
, pantheon
, pkg-config
, fetchpatch
, meson
, ninja
, vala
@ -17,24 +16,15 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
version = "6.0.0";
version = "6.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1pvcpk1d2zh9pvw0clv3bhf2plcww6nbxs6j7xjbvnaqs7d6i1k2";
sha256 = "1qrbg8l3ifz09jx6v5j7hmgw0hmirj6mh3z634yl1cadz45p8fc9";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-notifications/pull/218
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-notifications/commit/c7e73f0683561345935a959dafa2083b7e22fe99.patch";
sha256 = "10xiyq42bqfmih1jgqpq64nha3n0y7ra3j7j0q27rn5hhhgbyjs7";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";

4
pkgs/desktops/pantheon/desktop/wingpanel/default.nix
View File

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0ycys24y1rrz0ydpvs4mc89p4k986q1ziwbvziinxr1wsli9v1dj";
sha256 = "078yi36r452sc33mv2ck8z0icya1lhzhickllrlhc60rdri36sb8";
};
passthru = {