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

Merge pull request #113156 from Mic92/libical

Browse Source
This commit is contained in:
Jörg Thalheim 2021-02-15 14:01:54 +00:00 committed by GitHub
commit 231b924910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libical/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, buildPackages , buildPackages
, cmake , cmake
, glib , glib
@ -22,7 +21,7 @@ assert introspectionSupport -> gobject-introspection != null && vala != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libical"; pname = "libical";
version = "3.0.8"; version = "3.0.9";
outputs = [ "out" "dev" ]; # "devdoc" ]; outputs = [ "out" "dev" ]; # "devdoc" ];
@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "libical"; owner = "libical";
repo = "libical"; repo = "libical";
rev = "v${version}"; rev = "v${version}";
sha256 = "0pkh74bfrgp1slv8wsv7lbmal2m7qkixwm5llpmfwaiv14njlp68"; sha256 = "sha256-efdiGktLGITaQ6VinnfYG52fMhO0Av+JKROt2kTvS1U=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -75,12 +74,6 @@ stdenv.mkDerivation rec {
# Will appear in 3.1.0 # Will appear in 3.1.0
# https://github.com/libical/libical/issues/350 # https://github.com/libical/libical/issues/350
./respect-env-tzdir.patch ./respect-env-tzdir.patch
# Export src-generator binary for use while cross-compiling
# https://github.com/libical/libical/pull/439
(fetchpatch {
url = "https://github.com/libical/libical/commit/1197d84b63dce179b55a6293cfd6d0523607baf1.patch";
sha256 = "18i1khnwmw488s7g5a1kf05sladf8dbyhfc69mbcf6dkc4nnc3dg";
})
]; ];
# Using install check so we do not have to manually set # Using install check so we do not have to manually set

2
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -252,8 +252,6 @@ let
DRM_AMDGPU_SI = whenAtLeast "4.9" yes; DRM_AMDGPU_SI = whenAtLeast "4.9" yes;
# (stable) amdgpu support for bonaire and newer chipsets # (stable) amdgpu support for bonaire and newer chipsets
DRM_AMDGPU_CIK = whenAtLeast "4.9" yes; DRM_AMDGPU_CIK = whenAtLeast "4.9" yes;
# amdgpu support for RX6000 series
DRM_AMD_DC_DCN3_0 = whenAtLeast "5.9.12" yes;
# Allow device firmware updates # Allow device firmware updates
DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes; DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes;
# amdgpu display core (DC) support # amdgpu display core (DC) support