Merge master into staging-next
This commit is contained in:
commit
d8e4025066
|
@ -1224,6 +1224,7 @@ in
|
|||
keep = 1;
|
||||
extraConfig = ''
|
||||
create 0660 root ${config.users.groups.utmp.name}
|
||||
minsize 1M
|
||||
'';
|
||||
};
|
||||
"/var/log/wtmp" = mapAttrs (_: mkDefault) {
|
||||
|
@ -1231,6 +1232,7 @@ in
|
|||
keep = 1;
|
||||
extraConfig = ''
|
||||
create 0664 root ${config.users.groups.utmp.name}
|
||||
minsize 1M
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
@ -19,7 +19,8 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
|
|||
|
||||
# wtmp is present in default config.
|
||||
"rm -f /var/log/wtmp*",
|
||||
"echo test > /var/log/wtmp",
|
||||
# we need to give it at least 1MB
|
||||
"dd if=/dev/zero of=/var/log/wtmp bs=2M count=1",
|
||||
|
||||
# move into the future and rotate
|
||||
"date -s 'now + 1 month + 1 day'",
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
, qtgraphicaleffects
|
||||
, sqlite
|
||||
, inkscape
|
||||
, xdg-utils
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
@ -62,6 +63,7 @@ mkDerivation rec {
|
|||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
|
||||
# See also: https://bugreports.qt.io/browse/QTBUG-85967
|
||||
"--set QML_DISABLE_DISK_CACHE 1"
|
||||
"--prefix PATH : ${lib.makeBinPath [ xdg-utils ]}"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qownnotes";
|
||||
version = "22.2.7";
|
||||
version = "22.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
# Fetch the checksum of current version with curl:
|
||||
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
|
||||
sha256 = "f7c97f3dc3435ecdc740131548aacd390332c8b97c4e6fee98a3e80985786533";
|
||||
sha256 = "ced99f4b2106148c683267c2c5ccc5902dc6b98249eb7c132dde2bd6ea37bc34";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
|
|
@ -72,7 +72,7 @@ let
|
|||
|
||||
tfFeature = x: if x then "1" else "0";
|
||||
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
variant = if cudaSupport then "-gpu" else "";
|
||||
pname = "tensorflow${variant}";
|
||||
|
||||
|
@ -185,7 +185,7 @@ let
|
|||
owner = "tensorflow";
|
||||
repo = "tensorflow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n7jRDPeXsyq4pEWSWmOCas4c8VsArIKlCuwvSU/Ro/c=";
|
||||
sha256 = "1qwzbqq899swrwrwmm6z7mq9sc55gyh0r4ca0mcnchbvn7w0qbkh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ dandellion ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/randtype.x86_64-darwin
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,23 +1,36 @@
|
|||
{ lib, stdenv, fetchgit, pkg-config, libtraceevent, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, pkg-config
|
||||
, libtraceevent
|
||||
, asciidoc
|
||||
, xmlto
|
||||
, docbook_xml_dtd_45
|
||||
, docbook_xsl
|
||||
, coreutils
|
||||
, which
|
||||
, valgrind
|
||||
, sourceHighlight
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtracefs";
|
||||
version = "1.2.5";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";
|
||||
rev = "libtracefs-${version}";
|
||||
sha256 = "1rva9ysspf1wqd0zf52qwgpaasrn7jcbns4dwldc59ksk0n93qdb";
|
||||
sha256 = "sha256-Kg1mPjTZ2UCeco18Fa8GqmLo2R35XvUE/q2J1HAmtEc=";
|
||||
};
|
||||
|
||||
# Don't build and install html documentation
|
||||
postPatch = ''
|
||||
sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile
|
||||
substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd
|
||||
patchShebangs check-manpages.sh
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "devman" ];
|
||||
outputs = [ "out" "dev" "devman" "doc" ];
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
|
||||
nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl which valgrind sourceHighlight ];
|
||||
buildInputs = [ libtraceevent ];
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
|
|
Loading…
Reference in a new issue