JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-20 06:06:25 +00:00 committed by GitHub
commit e605a07cc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/ephemeral/default.nix
View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "ephemeral";
version = "7.0.5";
version = "7.1.0";
src = fetchFromGitHub {
owner = "cassidyjames";
repo = "ephemeral";
rev = version;
sha256 = "sha256-dets4YoTUgFCDOrvzNuAwJb3/MsnjOSBx9PBZuT0ruk=";
sha256 = "sha256-07HO8nC2Pwz2EAea4ZzmqyMfQdgX8FVqDepdA6j/NT8=";
};
nativeBuildInputs = [

6
pkgs/applications/networking/irc/glowing-bear/default.nix
View File

@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "glowing-bear";
version = "0.7.2";
version = "0.9.0";
src = fetchFromGitHub {
rev = version;
owner = "glowing-bear";
repo = "glowing-bear";
sha256 = "14a3fqsmi28g7j3lzk4l4m47p2iml1aaf3514wazn2clw48lnqhw";
sha256 = "0lf0j72m6rwlgqssdxf0m9si99lah08lww7q7i08p5i5lpv6zh2s";
};
installPhase = ''
mkdir $out
cp index.html min.js serviceworker.js webapp.manifest.json $out
cp index.html serviceworker.js webapp.manifest.json $out
cp -R 3rdparty assets css directives js $out
'';

12
pkgs/applications/office/elementary-planner/default.nix
View File

@ -12,22 +12,24 @@
, libgee
, json-glib
, glib
, glib-networking
, sqlite
, libsoup
, gtk3
, pantheon /* granite, icons, maintainers */
, webkitgtk
, libpeas
}:
stdenv.mkDerivation rec {
pname = "elementary-planner";
version = "2.5.7";
version = "2.6.9";
src = fetchFromGitHub {
owner = "alainm23";
repo = "planner";
rev = version;
sha256 = "0s2f9q7i31c2splflfnaiqviwnxbsp2zvibr70xafhbhnkmzlrsk";
sha256 = "17ij017x2cplqhway8376k8mmrll4w1jfwhf7ixldq9g0q2inzd8";
};
nativeBuildInputs = [
@ -43,10 +45,12 @@ stdenv.mkDerivation rec {
buildInputs = [
evolution-data-server
glib
glib-networking
gtk3
json-glib
libgee
libical
libpeas
libsoup
pantheon.elementary-icon-theme
pantheon.granite
@ -66,6 +70,10 @@ stdenv.mkDerivation rec {
)
'';
postFixup = ''
ln -s $out/bin/com.github.alainm23.planner $out/bin/planner
'';
meta = with lib; {
description = "Task manager with Todoist support designed for GNU/Linux 🚀️";
homepage = "https://planner-todo.web.app";

4
pkgs/applications/science/math/gmsh/default.nix
View File

@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "gmsh";
version = "4.8.0";
version = "4.8.1";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
sha256 = "sha256-JYd4PEsClj+divtxfJlUyu+kY+ouChLhZZMH5qDX6ms=";
sha256 = "sha256-1QOPXyWuhZc1NvsFzIhv6xvX1n4mBanYeJvMJSj6izU=";
};
buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL

4
pkgs/applications/video/shotcut/default.nix
View File

@ -25,13 +25,13 @@ assert lib.versionAtLeast mlt.version "6.24.0";
mkDerivation rec {
pname = "shotcut";
version = "21.02.27";
version = "21.03.21";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
sha256 = "bcuJz27jDAB3OPEKq3xNgfv6C31UoMKosS4YIRZNMjM=";
sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk=";
};
enableParallelBuilding = true;

4
pkgs/data/fonts/mononoki/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "1.2";
version = "1.3";
in fetchzip {
name = "mononoki-${version}";
@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile -d $out/share/fonts/mononoki
'';
sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff";
sha256 = "sha256-K2uOpJRmQ1NcDZfh6rorCF0MvGHFCsSW8J7Ue9OC/OY=";
meta = with lib; {
homepage = "https://github.com/madmalik/mononoki";

4
pkgs/development/libraries/caf/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "actor-framework";
version = "0.18.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = version;
sha256 = "1c3spd6vm1h9qhlk5c4fdwi6nbqx5vwz2zvv6qp0rj1hx6xpq3cx";
sha256 = "sha256-tRR+YFI/Ikf4rov4dzt59nDqaooALNspKEQehHP6sKU=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/matio/default.nix
View File

@ -1,9 +1,9 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "matio-1.5.19";
name = "matio-1.5.20";
src = fetchurl {
url = "mirror://sourceforge/matio/${name}.tar.gz";
sha256 = "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4";
sha256 = "sha256-XR9yofUav2qc0j6qgS+xe4YQlwWQlfSMdoxINcWqJZg=";
};
meta = with lib; {

4
pkgs/development/tools/database/liquibase/default.nix
View File

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
version = "4.3.1";
version = "4.3.2";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-hOemDLfkjjPXQErKKCIMl8c5EPZe40B1HlNfvg7IZKU=";
sha256 = "sha256-sc/W4N+pd1bhLiyQLqm0j2o/RviT8iKzBZcD0GRDqqE=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/misc/ostree/default.nix
View File

@ -41,13 +41,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
version = "2020.8";
version = "2021.1";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
sha256 = "16v73v63h16ika73kgh2cvgm0v27r2d48m932mbj3xm6s295kapx";
sha256 = "sha256-kbS9kmSDHSD/AOxELUjt5SbbVTeb2RdgaGPAX0O4WlE=";
};
patches = [

4
pkgs/tools/misc/pspg/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
sha256 = "sha256-kRKU6ynZffV17GqEArkXxz6M9xoa3kn2yNqjyLRY0rc=";
sha256 = "sha256-RWezBNqjKybMtfpxPhDg2ysb4ksKphTPdTNTwCe4pas=";
};
nativeBuildInputs = [ pkg-config ];