alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-11-25 06:01:06 +00:00 committed by GitHub
parent b244d0edca 2d461423f7
commit fa1a61b8a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 180 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -11688,6 +11688,12 @@
fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B";
}];
};
tmarkovski = {
email = "tmarkovski@gmail.com";
github = "tmarkovski";
githubId = 1280118;
name = "Tomislav Markovski";
};
tmountain = {
email = "tinymountain@gmail.com";
github = "tmountain";

2
pkgs/applications/version-management/git-and-tools/delta/default.nix
View file

@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec {
description = "A syntax-highlighting pager for git";
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ marsam zowoq ];
maintainers = with maintainers; [ marsam zowoq SuperSandro2000 ];
};
}

4
pkgs/desktops/pantheon/apps/appcenter/default.nix
View file

@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "appcenter";
version = "3.8.2";
version = "3.9.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-NHKP1vzb8qu+EkUWDvLWLl4U4pW9ZxbE7YFI6Vwesfg=";
sha256 = "sha256-+r19n42FPoBArZNDF4ZAdUBZqsSxpLwpeBoyaRJBCrg=";
};
passthru = {

4
pkgs/desktops/pantheon/apps/elementary-camera/default.nix
View file

@ -25,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "elementary-camera";
version = "6.0.1";
version = "6.0.2";
repoName = "camera";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "sha256-OdBinryF6XTcvtY4A1wdDVazjf/VritEGF97ts6d4RY=";
sha256 = "sha256-uVeV+LKA/W7WVUAvVWaSNRzeh1MUrhRjvS0HuhZZJ04=";
};
nativeBuildInputs = [

9
pkgs/desktops/pantheon/apps/elementary-dock/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, vala
, atk
@ -28,7 +29,7 @@
stdenv.mkDerivation rec {
pname = "elementary-dock";
version = "unstable-2021-07-16";
version = "unstable-2021-11-08";
outputs = [ "out" "dev" ];
@ -37,8 +38,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = "05fd6fccdf1a769f6737a0d7e57e092825348660";
sha256 = "0lqqq5cx0kk8y7qyjx7z2k3v1kw2xxzns968ianarcji19wzcns4";
rev = "51e8d3ddfbed0dfce3158d80f997ab183e92567b";
sha256 = "sha256-w6HGxEAXNod/uMEEfSz9nRNTRrCbcEqJCP9EFkVbX1U=";
};
nativeBuildInputs = [

14
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pantheon
@ -8,32 +9,35 @@
, pkg-config
, vala
, libgee
, gnome-settings-daemon
, granite
, gsettings-desktop-schemas
, gtk3
, libhandy
, libxml2
, libgnomekbd
, libxklavier
, ibus
, onboard
, switchboard
}:
stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard";
version = "2.5.1";
version = "2.6.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y";
sha256 = "sha256-Bl0T+8upTdBnLs03UIimcAg0LO40KwuMZRNSM+y/3Hc=";
};
patches = [
./0001-Remove-Install-Unlisted-Engines-function.patch
(substituteAll {
src = ./fix-paths.patch;
ibus = ibus;
inherit ibus onboard;
})
];
@ -52,7 +56,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gnome-settings-daemon # media-keys
granite
gsettings-desktop-schemas
gtk3
ibus
libgee

17
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
View file

@ -1,8 +1,8 @@
diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala
index 6d79fdc..de4276e 100644
index 7f73c1e1..1f0d6400 100644
--- a/src/Views/InputMethod.vala
+++ b/src/Views/InputMethod.vala
@@ -325,7 +325,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid {
@@ -328,7 +328,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid {
private void spawn_ibus_daemon () {
bool is_spawn_succeeded = false;
try {
@ -11,3 +11,16 @@ index 6d79fdc..de4276e 100644
} catch (GLib.SpawnError e) {
warning (e.message);
set_visible_view (e.message);
diff --git a/src/Views/Layout.vala b/src/Views/Layout.vala
index 75d2d805..b86252a4 100644
--- a/src/Views/Layout.vala
+++ b/src/Views/Layout.vala
@@ -219,7 +219,7 @@ namespace Pantheon.Keyboard {
onscreen_keyboard_settings.clicked.connect (() => {
try {
- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE);
+ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE);
appinfo.launch (null, null);
} catch (Error e) {
warning ("Unable to launch onboard-settings: %s", e.message);

29
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, meson
@ -25,28 +25,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
version = "6.0.0";
version = "6.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0349150kxdv14ald79pzn7lasiqipyc37fgchygbc8hsy62d9a32";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-pantheon-shell/pull/286
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/0c3207ffaeaa82ca3c743bc9ec772185fbd7e8cf.patch";
sha256 = "11ymzqx6has4zf8y0xy7pfhymcl128hzzjcgp46inshjf99v5kiv";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-rwneQ1bqpWDyTHULMtGqhPdpSDa4ObnVortmL0E+gHA=";
};
nativeBuildInputs = [
@ -73,6 +58,12 @@ stdenv.mkDerivation rec {
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Desktop Plug";
homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell";

33
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, meson
@ -8,8 +8,10 @@
, ninja
, pkg-config
, vala
, elementary-settings-daemon
, libgee
, granite
, gsettings-desktop-schemas
, gala
, gtk3
, glib
@ -20,28 +22,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy";
version = "2.2.5";
version = "2.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1ydr1xpbyxjcnd36c9j7a64srbz6gpbshwhcqj6591kmiqhmvknk";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-security-privacy/pull/130
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/18fe438baba651670d7f0534856c3b2433e3d75d.patch";
sha256 = "19qwm725k6h41kgg4a98i4rxx45s4bb1wxx0fzkh75gz9syfi58w";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-pkpS7BR/eXA0rWV1C5AR+FdF5OkDnV8YDBAt1ZkaVPo=";
};
nativeBuildInputs = [
@ -53,9 +40,11 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-settings-daemon # settings schema
gala
glib
granite
gsettings-desktop-schemas
gtk3
libgee
polkit
@ -68,6 +57,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Security & Privacy Plug";
homepage = "https://github.com/elementary/switchboard-plug-security-privacy";

29
pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, meson
@ -17,28 +17,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
version = "2.2.7";
version = "2.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0yjqws7ryfid9lcafgzzbfnjjwccsankscwdwqfw486qid85whzc";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-sound/pull/203
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-sound/commit/1f3b9f001ace4c457ab194158dff04ba5e25d278.patch";
sha256 = "1lmf2bbif2wkfv500nxbqxp8jdmnjg8yk8xhx3g2g55d15rc5hk4";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-yHuboDpIcioZPNgpmnrM6J2eUCJpoNDdvgu27YuN65I=";
};
nativeBuildInputs = [
@ -57,6 +42,12 @@ stdenv.mkDerivation rec {
switchboard
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Sound Plug";
homepage = "https://github.com/elementary/switchboard-plug-sound";

19
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pantheon
@ -10,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "elementary-gtk-theme";
version = "6.1.0";
version = "6.1.1";
repoName = "stylesheet";
@ -18,13 +19,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "sha256-YvBjMbC3aQtYc/jPZmGdL4VfBH/VuxQ70PD0BWg9DTg=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-gciBn5MQ5Cu+dROL5kCt2GCbNA7W4HOWXyjMBd4OP+8=";
};
nativeBuildInputs = [
@ -34,6 +29,12 @@ stdenv.mkDerivation rec {
sassc
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "GTK theme designed to be smooth, attractive, fast, and usable";
homepage = "https://github.com/elementary/stylesheet";

19
pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pantheon
@ -13,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "elementary-icon-theme";
version = "6.0.0";
version = "6.1.0";
repoName = "icons";
@ -21,13 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0k94zi8fzi0nf5q471fmrlz8jjkv8m6vav1spzv7ynkg2hik8d9b";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-WR4HV0nJKj0WeSFHXLK64O0LhX8myAJE4w0aztyhPn4=";
};
nativeBuildInputs = [
@ -57,6 +52,12 @@ stdenv.mkDerivation rec {
postFixup = "gtk-update-icon-cache $out/share/icons/elementary";
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Named, vector icons for elementary OS";
longDescription = ''

28
pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
View file

@ -1,5 +1,7 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, substituteAll
, pantheon
@ -14,6 +16,7 @@
, libgee
, elementary-icon-theme
, elementary-gtk-theme
, elementary-settings-daemon
, gettext
, libhandy
, wrapGAppsHook
@ -22,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
version = "6.0.0";
version = "6.1.0";
repoName = "onboarding";
@ -30,13 +33,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1mpw0j8ymb41py9v9qlk4nwy1lnwj7k388c7gqdv34ynck0ymfi4";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-9voy9eje3VlV4IMM664EyjKWTfSVogX5JoRCqhsUXTE=";
};
nativeBuildInputs = [
@ -52,6 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
elementary-gtk-theme
elementary-icon-theme
elementary-settings-daemon # settings schema
glib
granite
gtk3
@ -64,6 +62,12 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
appcenter = appcenter;
})
# Provides the directory where the locales are actually installed
# https://github.com/elementary/onboarding/pull/147
(fetchpatch {
url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch";
sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs=";
})
];
postPatch = ''
@ -71,6 +75,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Onboarding app for new users designed for elementary OS";
homepage = "https://github.com/elementary/onboarding";

16
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
View file

@ -18,19 +18,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-network";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-xr1ZihWK8fU8M/rXRKk5dOjoQNe3aJO8ouKC/iVZ7Sk=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-4Fg8/Gm9mUqaL3wEc8h+/pMvOfD75ILjo7LhLz6LQmo=";
};
nativeBuildInputs = [
@ -49,6 +43,12 @@ stdenv.mkDerivation rec {
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Network Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-network";

19
pkgs/desktops/pantheon/granite/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, python3
@ -18,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "granite";
version = "6.1.2";
version = "6.2.0";
outputs = [ "out" "dev" ];
@ -26,13 +27,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-d48KQH8uwkSZWQEFSq1BD+TVUi9PWVVtMjKYmleRW58=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-WM0Wo9giVP5pkMFaPCHsMfnAP6xD71zg6QLCYV6lmkY=";
};
nativeBuildInputs = [
@ -58,6 +53,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "An extension to GTK used by elementary OS";
longDescription = ''

4
pkgs/development/libraries/intel-media-driver/default.nix
View file

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "21.4.1";
version = "21.4.2";
outputs = [ "out" "dev" ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "1gf3gkxr68n8ca5bk269w469jykq90z8d3a9v0gag02cl1d6ca3i";
sha256 = "0hphpv3n2cdxmbyiwly7v9r0ijdq6hfnw604xz42jqgh9idi6h55";
};
patches = [

16
pkgs/development/libraries/physics/yoda/default.nix
View file

@ -2,22 +2,13 @@
stdenv.mkDerivation rec {
pname = "yoda";
version = "1.9.2";
version = "1.9.3";
src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
hash = "sha256-zb7j7fBMv2brJ+gUMMDTKFEJDC2embENe3wXdx0VTOA=";
hash = "sha256-XRUYL7gAoNX/ykdD+CwpXsYu5yzz5GJbZNAIP/+gR98=";
};
patches = [
# Prevent ROOT from initializing X11 or Cocoa (helps with sandboxing)
(fetchpatch {
url = "https://gitlab.com/hepcedar/yoda/-/commit/36c035f4f0385dec58702f09564ca66a14ca2c3e.diff";
sha256 = "sha256-afB+y33TVNJtxY5As18EcutJEGDE4g0UzMxzA+YgICk=";
excludes = [ "ChangeLog" ];
})
];
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
buildInputs = [ python ]
++ (with python.pkgs; [ numpy matplotlib ])
@ -41,11 +32,10 @@ stdenv.mkDerivation rec {
doInstallCheck = true;
installCheckTarget = "check";
enableParallelChecking = false; # testreader consumes output of testwriter
meta = {
description = "Provides small set of data analysis (specifically histogramming) classes";
license = lib.licenses.gpl3;
license = lib.licenses.gpl3Only;
homepage = "https://yoda.hepforge.org";
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ veprbl ];

6
pkgs/os-specific/linux/radeontop/default.nix
View file

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
pname = "radeontop";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
sha256 = "sha256-tnIxM0+RfOIt714fEUWRP/4rEPHaOuCZFit9/RPdxis=";
sha256 = "0kwqddidr45s1blp0h8r8h1dd1p50l516yb6mb4s6zsc827xzgg3";
rev = "v${version}";
repo = "radeontop";
owner = "clbr";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
postInstall = ''
wrapProgram $out/sbin/radeontop \
wrapProgram $out/bin/radeontop \
--prefix LD_LIBRARY_PATH : $out/lib
'';

26
pkgs/tools/admin/trinsic-cli/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, stdenv, rustPlatform, fetchurl, Security }:
rustPlatform.buildRustPackage rec {
pname = "trinsic-cli";
version = "1.1.2";
src = fetchurl {
url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz";
sha256 = "7e5377e8460ebb1253b9974e02d0077ffc58f2b4712cf7896f1bef7e9f580cd4";
};
cargoVendorDir = "vendor";
doCheck = false;
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Trinsic CLI";
longDescription = ''
Command line interface for Trinsic Ecosystems
'';
homepage = "https://trinsic.id/";
license = licenses.asl20;
maintainers = with maintainers; [ tmarkovski ];
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -22768,6 +22768,10 @@ with pkgs;
trinity = callPackage ../os-specific/linux/trinity { };
trinsic-cli = callPackage ../tools/admin/trinsic-cli {
inherit (darwin.apple_sdk.frameworks) Security;
};
tunctl = callPackage ../os-specific/linux/tunctl { };
twa = callPackage ../tools/networking/twa { };

10
pkgs/top-level/ruby-packages.nix
View file

@ -2955,6 +2955,16 @@
};
version = "0.6.0";
};
yaggo = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18ffl28d2wyzyq47350xas1n1fwgsqms316bb1bvfqhdqnwgmy6g";
type = "gem";
};
version = "1.5.10";
};
yard = {
groups = ["default"];
platforms = [];