movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-06-26 00:09:07 +00:00 • committed by GitHub
commit f15360e6a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/etcd.nix
View file

@ -184,7 +184,7 @@ in {
}; };
}; };
environment.systemPackages = [ pkgs.etcdctl ]; environment.systemPackages = [ pkgs.etcd ];
users.users.etcd = { users.users.etcd = {
uid = config.ids.uids.etcd; uid = config.ids.uids.etcd;

4
pkgs/desktops/cinnamon/bulky/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bulky"; pname = "bulky";
version = "1.3"; version = "1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = "bulky"; repo = "bulky";
rev = version; rev = version;
sha256 = "sha256-jBGrfE8jYQStIs9h/b/1yBu8OEQdPOMHZ/U/KczfX+4="; sha256 = "sha256-i6OmkZGgZpfp8G2T6CDFQmIG/0V36YFbWBR7MvDi6Ew=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/libraries/drogon/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "drogon"; pname = "drogon";
version = "1.7.0"; version = "1.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "an-tao"; owner = "an-tao";
repo = "drogon"; repo = "drogon";
rev = "v${version}"; rev = "v${version}";
sha256 = "18wn9ashv3h3pal6x5za6y7byfcrd49zy3wfx4hx0ygxzplmss0r"; sha256 = "0rhwbz3m5x3vy5zllfs8r347wqprg29pff5q7i53f25bh8y0n49i";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/development/libraries/libavif/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libavif"; pname = "libavif";
version = "0.9.1"; version = "0.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AOMediaCodec"; owner = "AOMediaCodec";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-XWPB5JI4V/anvtHFGY4ejeSlBbxzK6KRG8e5vBhxL8A="; sha256 = "sha256-0/5JLynYzr7ZewBbrNoxr26UkVzpSP9RqlmH2ql8tfs=";
}; };
# reco: encode libaom slowest but best, decode dav1d fastest # reco: encode libaom slowest but best, decode dav1d fastest

6
pkgs/development/python-modules/desktop-notifier/default.nix
View file

@ -10,11 +10,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "desktop-notifier"; pname = "desktop-notifier";
version = "3.2.3"; version = "3.3.0";
disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "cf359450efc0944ac4db3106e50faa9d49dcef072307c3531e6af2c8a10cd523"; sha256 = "sha256-ROSZorkA2wAp2Ubh3B3KWIUxM/4r7cv/1aSJqeKnPqg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -34,5 +35,6 @@ buildPythonPackage rec {
description = "A Python library for cross-platform desktop notifications"; description = "A Python library for cross-platform desktop notifications";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ sfrijters ]; maintainers = with maintainers; [ sfrijters ];
platforms = platforms.linux;
}; };
} }