Merge master into staging-next

2021-03-15 00:40:27 +00:00
parent c7b23f6440 4908c65935
commit 8fa4dca9b5
42 changed files with 412 additions and 220 deletions
@@ -8,13 +8,13 @@

 stdenv.mkDerivation rec {
  pname = "luna-icons";
-  version = "1.0";
+  version = "1.1";

  src = fetchFromGitHub {
    owner = "darkomarko42";
    repo = pname;
    rev = version;
-    sha256 = "1gggsd7scf15vrpgzvskx4p3jifnjdx0aqndqhvpc6ksdbh3nzqd";
+    sha256 = "11g740x1asy7jbfn52gp1zx7hzhklw6f97m469wgyi9yf954js15";
  };

  nativeBuildInputs = [
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "osinfo-db";
-  version = "20210215";
+  version = "20210312";

  src = fetchurl {
    url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    sha256 = "sha256-HIM3sq47+0nImiaw+CjjjgYnBIorwmA6UxaNefjYNZg=";
+    sha256 = "sha256-dUjsCeRFynN4xc65njntyohX+Ck4MeCzy1WPQjCHDhA=";
  };

  nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];