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

Merge release-21.05 into staging-next-21.05

This commit is contained in:
github-actions[bot] 2021-08-25 00:03:07 +00:00 committed by GitHub
parent f90cf6b7f8 ba6124b621
commit 97b39a6dc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/acpi-call/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "acpi-call";
version = "1.2.1";
version = "1.2.2";
name = "${pname}-${version}-${kernel.version}";
src = fetchFromGitHub {
owner = "nix-community";
repo = "acpi_call";
rev = "v${version}";
sha256 = "0mr4rjbv6fj4phf038addrgv32940bphghw2v9n1z4awvw7wzkbg";
sha256 = "1s7h9y3adyfhw7cjldlfmid79lrwz3vqlvziw9nwd6x5qdj4w9vp";
};
hardeningDisable = [ "pic" ];

7
pkgs/servers/mautrix-telegram/default.nix
View File

@ -12,6 +12,13 @@ let
sha256 = "ffbc4e29eb56089539b408f8e4c12a5d5a5d11d7fe7d40f8c6279784c618b869";
};
});
telethon = super.telethon.overridePythonAttrs (oldAttrs: rec {
version = "1.21.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-mTyDfvdFrd+XKifXv7oM5Riihj0aUOBzclW3ZNI+DvI=";
};
});
};
};