Merge master into staging-next

2 years ago · ce95d139b7
parent 75906ed245 2d584efc06
commit ce95d139b7
14 changed files with 40 additions and 167 deletions
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@ -136,6 +136,7 @@ in
      services.colord.enable = mkDefault true;
      services.fwupd.enable = mkDefault true;
      services.packagekit.enable = mkDefault true;
+      services.power-profiles-daemon.enable = mkDefault true;
      services.touchegg.enable = mkDefault true;
      services.touchegg.package = pkgs.pantheon.touchegg;
      services.tumbler.enable = mkDefault true;
@ -167,10 +168,10 @@ in
        isSystem = true;
      };
      services.udev.packages = [
-        pkgs.gnome.gnome-settings-daemon338
+        pkgs.pantheon.gnome-settings-daemon
      ];
      systemd.packages = [
-        pkgs.gnome.gnome-settings-daemon338
+        pkgs.pantheon.gnome-settings-daemon
      ];
      programs.dconf.enable = true;
      networking.networkmanager.enable = mkDefault true;
@ -212,12 +213,10 @@ in
        elementary-capnet-assist
        elementary-notifications
        elementary-settings-daemon
+        gnome-settings-daemon
        pantheon-agent-geoclue2
        pantheon-agent-polkit
-      ]) ++ (utils.removePackagesByName [
-        gnome.gnome-font-viewer
-        gnome.gnome-settings-daemon338
-      ] config.environment.pantheon.excludePackages);
+      ]);

      programs.evince.enable = mkDefault true;
      programs.file-roller.enable = mkDefault true;
@ -272,7 +271,9 @@ in
    })

    (mkIf serviceCfg.apps.enable {
-      environment.systemPackages = with pkgs.pantheon; utils.removePackagesByName ([
+      environment.systemPackages = utils.removePackagesByName ([
+        pkgs.gnome.gnome-font-viewer
+      ] ++ (with pkgs.pantheon; [
        elementary-calculator
        elementary-calendar
        elementary-camera
@ -290,7 +291,7 @@ in
        # Only install appcenter if flatpak is enabled before
        # https://github.com/NixOS/nixpkgs/issues/15932 is resolved.
        appcenter
-      ]) config.environment.pantheon.excludePackages;
+      ])) config.environment.pantheon.excludePackages;

      # needed by screenshot
      fonts.fonts = [
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "lagrange";
-  version = "1.13.3";
+  version = "1.13.5";

  src = fetchFromGitHub {
    owner = "skyjake";
    repo = "lagrange";
    rev = "v${version}";
-    sha256 = "sha256-ZCG7i5WmhONockaTt/YCww7N+WvxCX2DIwQIFjAk+K8=";
+    sha256 = "sha256-HZGI9vWSYCDH0lW+k6hvPm3UVW6lR8Lhr3H7blNupNk=";
  };

  nativeBuildInputs = [ cmake pkg-config zip ];
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "lima";
-  version = "0.10.0";
+  version = "0.11.0";

  src = fetchFromGitHub {
    owner = "lima-vm";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-xlpNJjSBw1iL8CjbWE6v4u7Vq5PjkGv0tQKU5eRN13w=";
+    sha256 = "sha256-OqsLHxY7dZKN/zazeDASBt5UsQGieU5laIUeshtS55w=";
  };

-  vendorSha256 = "sha256-uTkCi969RQ4K0ZJ2vOgqv3OJgzVVRX7b2sXNfmR6qoA=";
+  vendorSha256 = "sha256-0Z+SAEHFJio+N7ATiviBkLPn6cNFlhE3Dsj8CxVtf7c=";

  nativeBuildInputs = [ makeWrapper installShellFiles ];

--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@ -2,8 +2,6 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, appstream-glib
-, desktop-file-utils
 , meson
 , ninja
 , pkg-config
@ -25,18 +23,16 @@

 stdenv.mkDerivation rec {
  pname = "elementary-calendar";
-  version = "6.1.0";
+  version = "6.1.1";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "calendar";
    rev = version;
-    sha256 = "sha256-LaVJ7QLc0UdSLgLIuHP4Anc7kPUelZW9PnIWuqKGtEQ=";
+    sha256 = "sha256-c2c8QNifBDzb0CelB72AIL4G694l6KCSXBjWIHrzZJo=";
  };

  nativeBuildInputs = [
-    appstream-glib
-    desktop-file-utils
    meson
    ninja
    pkg-config
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , pkg-config
 , meson
@ -10,41 +9,28 @@
 , vala
 , desktop-file-utils
 , gtk3
-, libxml2
 , granite
 , libhandy
 , libnotify
 , vte
 , libgee
-, appstream
 , pcre2
 , wrapGAppsHook
 }:

 stdenv.mkDerivation rec {
  pname = "elementary-terminal";
-  version = "6.0.1";
+  version = "6.0.2";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "terminal";
    rev = version;
-    sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0=";
+    sha256 = "sha256-glcY47E9bGVI6k9gakItN6srzMtmA4hCEz/JVD5UUmI=";
  };

-  patches = [
-    # Fix build with meson 0.61
-    # https://github.com/elementary/terminal/pull/649
-    (fetchpatch {
-      url = "https://github.com/elementary/terminal/commit/15e3ace08cb25e53941249fa1ee680a1e2f871b4.patch";
-      sha256 = "sha256-XVs+kq5qbX5KlxtkqxwJnatNYNeJiVLBec7sLjQsUxg=";
-    })
-  ];
-
  nativeBuildInputs = [
-    appstream
    desktop-file-utils
-    libxml2
    meson
    ninja
    pkg-config
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "switchboard-plug-power";
-  version = "2.6.0";
+  version = "2.7.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;
    rev = version;
-    sha256 = "006h8mrhmdrbd83vhdyahgrfk9wh6j9kjincpp7dz7sl8fsyhmcr";
+    sha256 = "sha256-8Hu2RIgA0gSc+tLNjDqGS+b/HpbsOdR4otpY4UqNzKs=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-capnet-assist";
-  version = "2.4.1";
+  version = "2.4.2";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "capnet-assist";
    rev = version;
-    sha256 = "sha256-8hhp37EBzZxEVvPaRw9PohjaPWKQZ/AfqqvwLxQCBKk=";
+    sha256 = "sha256-aA71kxu4/dwODZt+DSp3vvely3P0dL23Ykqhd84hrZw=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@ -21,13 +21,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-settings-daemon";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "settings-daemon";
    rev = version;
-    sha256 = "sha256-1Xp1uJzDFuGZlhJhKj00cYtb4Q1syMAm+82fTOtk0VI=";
+    sha256 = "sha256-5QdCj2Z31t7dxZi7ZZ5g6qLgsMyw7rM5dRw0G8uoC6o=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/sealcurses/default.nix
+++ b/pkgs/development/libraries/sealcurses/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "sealcurses";
-  version = "unstable-2022-04-28"; # No release yet
+  version = "unstable-2022-05-18"; # No release yet

  src = fetchFromGitea {
    domain = "git.skyjake.fi";
    owner = "skyjake";
    repo = pname;
-    rev = "abf27cfd2567a0765aaa115cabab0abb7f862253";
-    hash = "sha256-c4zi/orHyr1hkuEisqZ9V8SaiH1IoxIbeGMrLBEkZ0A=";
+    rev = "417d77d790ede990b4c149f21c58fd13b8f273cc";
+    hash = "sha256-yOrJYy9vBv5n8yK6u7tfMq56LBBw5rmhUjORINW8gxo=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
--- a/pkgs/development/python-modules/gcal-sync/default.nix
+++ b/pkgs/development/python-modules/gcal-sync/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "gcal-sync";
-  version = "0.8.0";
+  version = "0.8.1";

  disabled = pythonOlder "3.9";

@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "allenporter";
    repo = "gcal_sync";
    rev = version;
-    hash = "sha256-Qk4WlMVyzOK2uyrUlJw9Q8ENtNT3PZ7FKTlCtPsm2v0=";
+    hash = "sha256-JQFfTgnrNvCwKCQ4lD1gE3ZI8WhCjaJ9zDejssZ7FPs=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@ -56,5 +56,6 @@ buildPythonPackage rec {
    changelog = "https://github.com/jjjake/internetarchive/raw/v${version}/HISTORY.rst";
    license = licenses.agpl3Plus;
    maintainers = [ maintainers.marsam ];
+    mainProgram = "ia";
  };
 }
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "nats-py";
-  version = "2.1.0";
+  version = "2.1.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "nats-io";
    repo = "nats.py";
    rev = "refs/tags/v${version}";
-    hash = "sha256-OwxTcjHB1YLijEtTA+QFjEmihqXsiitIcCtdl/3uipI=";
+    hash = "sha256-i197ZePxngAhGh7xzaJoo7m8el+7t7yJrvhO2CTmajU=";
  };

  propagatedBuildInputs = [
--- a/pkgs/tools/misc/zabbixctl/default.nix
+++ b/pkgs/tools/misc/zabbixctl/default.nix
@ -1,19 +1,19 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:

-buildGoPackage rec {
+buildGoModule rec {
  pname = "zabbixctl";
-  version = "unstable-2019-07-06";
-
-  goPackagePath = "github.com/kovetskiy/zabbixctl";
+  version = "unstable-2021-05-25";

  src = fetchFromGitHub {
    owner = "kovetskiy";
    repo = pname;
-    rev = "f2e856b7ab7d8ff9f494fe9f481bbaef18ea6ff7";
-    sha256 = "1lr3g9h3aa2px2kh5b2qcpj3aqyhqwq7kj1s9wifgmri9q7fsdzy";
+    rev = "872d73b12901b143898bffe3711b93a34ca75abe";
+    sha256 = "sha256-fWT3cgIHjHcKwFDjWIf3BUUUaVZ7hyc2ibkpU+AsW0I=";
  };

-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-BphQcPPmeNU7RDtaHJQxIoW8xxD86xWgqLBsLR08Tag=";
+
+  ldflags = [ "-s" "-w" ];

  meta = with lib; {
    description = "Most effective way for operating in Zabbix Server";
--- a/pkgs/tools/misc/zabbixctl/deps.nix
+++ b/pkgs/tools/misc/zabbixctl/deps.nix
@ -1,111 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-[
-  {
-    goPackagePath = "github.com/BurntSushi/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/BurntSushi/toml";
-      rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
-      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
-    };
-  }
-  {
-    goPackagePath = "github.com/jinzhu/configor";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jinzhu/configor";
-      rev = "9064de4b2535f218bde55dc8de50a3904ef800d0";
-      sha256 = "13wd7s2kff3s0bz5mi0m2zcz1r8mwnwhd944gxymzkwij71lhasn";
-    };
-  }
-  {
-    goPackagePath = "github.com/kovetskiy/godocs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kovetskiy/godocs";
-      rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24";
-      sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j";
-    };
-  }
-  {
-    goPackagePath = "github.com/kovetskiy/lorg";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kovetskiy/lorg";
-      rev = "9c6042b7edb0c491dd0722fad91e2b5e833d6b43";
-      sha256 = "0j1cm7mni47vraxnyigc55cq0yxw8zdyjmrq2c7vnm5s4kiia8pi";
-    };
-  }
-  {
-    goPackagePath = "github.com/kovetskiy/spinner-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kovetskiy/spinner-go";
-      rev = "00597fd24fe0d8079821b68f71d73b0661401752";
-      sha256 = "19qcpnvs61fsk7xgcj5b6s3zksnkc5rk9n5hx73v9ya7m2k7xr2n";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-runewidth";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-runewidth";
-      rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
-      sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
-    };
-  }
-  {
-    goPackagePath = "github.com/olekukonko/tablewriter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/olekukonko/tablewriter";
-      rev = "cc27d85e17cec9768d2ac401ea5d619a9628f16d";
-      sha256 = "1y3pkvypkxjrhlnsv8lcyd0c2q8mn5asfny2zi9j2vs77s5bd9qm";
-    };
-  }
-  {
-    goPackagePath = "github.com/reconquest/karma-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/reconquest/karma-go";
-      rev = "1094651bd246b1685f7b368e099aba6fca9efd8f";
-      sha256 = "0jiayzxwp0h7skg86q58rh58m2imdg3ng2vzpc2bxiz67lzcpk3r";
-    };
-  }
-  {
-    goPackagePath = "github.com/simplereach/timeutils";
-    fetch = {
-      type = "git";
-      url = "https://github.com/simplereach/timeutils";
-      rev = "1a719258b86a08630289b86902ab16817ba641e9";
-      sha256 = "08mf2j0dk07c9p279ydbrjxbjf113azmq0x8vhf7jvldcgjpw3m6";
-    };
-  }
-  {
-    goPackagePath = "github.com/zazab/zhash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/zazab/zhash";
-      rev = "ad45b89afe7af57319ca32f174e4dabeb00c44e4";
-      sha256 = "16b6f70qwfyg0zvbpk0yj5jx4cv2ggkyiqc5nk8n0165z46i62hs";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/mgo.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/mgo.v2";
-      rev = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5";
-      sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
-      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
-    };
-  }
-]