Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d4649e2489
|
|
@ -11,6 +11,7 @@ let
|
|||
|
||||
haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != ""
|
||||
|| cfg.extraAliases != "";
|
||||
haveCanonical = cfg.canonical != "";
|
||||
haveTransport = cfg.transport != "";
|
||||
haveVirtual = cfg.virtual != "";
|
||||
haveLocalRecipients = cfg.localRecipients != null;
|
||||
|
|
@ -244,6 +245,7 @@ let
|
|||
;
|
||||
|
||||
aliasesFile = pkgs.writeText "postfix-aliases" aliases;
|
||||
canonicalFile = pkgs.writeText "postfix-canonical" cfg.canonical;
|
||||
virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
|
||||
localRecipientMapFile = pkgs.writeText "postfix-local-recipient-map" (concatMapStrings (x: x + " ACCEPT\n") cfg.localRecipients);
|
||||
checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides;
|
||||
|
|
@ -529,6 +531,15 @@ in
|
|||
";
|
||||
};
|
||||
|
||||
canonical = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Entries for the <citerefentry><refentrytitle>canonical</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry> table.
|
||||
'';
|
||||
};
|
||||
|
||||
virtual = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
|
|
@ -941,6 +952,9 @@ in
|
|||
(mkIf haveAliases {
|
||||
services.postfix.aliasFiles.aliases = aliasesFile;
|
||||
})
|
||||
(mkIf haveCanonical {
|
||||
services.postfix.mapFiles.canonical = canonicalFile;
|
||||
})
|
||||
(mkIf haveTransport {
|
||||
services.postfix.mapFiles.transport = transportFile;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "obsidian";
|
||||
version = "0.11.9";
|
||||
version = "0.11.13";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
|
||||
sha256 = "XymM3qma8H2dm2tq8Zg+oKxOzb48azqlqn701pN5gdI=";
|
||||
sha256 = "0QL1rP37pmdIdGM9eHa7PfW1GVrvn2fX4bQPqQ8FOpI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper graphicsmagick ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-review";
|
||||
version = "1.28.0";
|
||||
version = "2.0.0";
|
||||
|
||||
# Manually set version because prb wants to get it from the git
|
||||
# upstream repository (and we are installing from tarball instead)
|
||||
|
|
@ -10,7 +10,7 @@ buildPythonApplication rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://opendev.org/opendev/${pname}/archive/${version}.tar.gz";
|
||||
sha256 = "1y1jzb0hlprynwwr4q5y4x06641qrhj0k69mclabnmhfam9g8ygm";
|
||||
sha256 = "0dkyd5g2xmvsa114is3cd9qmki3hi6c06wjnra0f4xq3aqm0ajnj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pbr requests setuptools ];
|
||||
|
|
|
|||
|
|
@ -299,10 +299,11 @@ stdenv.mkDerivation {
|
|||
# vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See
|
||||
# https://clang.llvm.org/docs/Toolchain.html for all the axes one might
|
||||
# break `useLLVM` into.)
|
||||
+ optionalString (isClang && gccForLibs != null
|
||||
+ optionalString (isClang
|
||||
&& targetPlatform.isLinux
|
||||
&& !(stdenv.targetPlatform.useAndroidPrebuilt or false)
|
||||
&& !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
&& !(stdenv.targetPlatform.useLLVM or false)
|
||||
&& gccForLibs != null) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ciao";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ciao-lang";
|
||||
repo = "ciao";
|
||||
rev = "v${version}";
|
||||
sha256 = "03qzcb4ivgkiwdpw7a94dn74xqyxjwz5ilrr53rcblsh5ng299jp";
|
||||
sha256 = "sha256-Xp0ZQRi7mOO2WN/2hO6zgobDG3S0BEV+SgsaduBZ30U=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
diff --git a/include/Rivet/Tools/osdir.hh b/include/Rivet/Tools/osdir.hh
|
||||
index 05f06ca..59af7de 100644
|
||||
--- a/include/Rivet/Tools/osdir.hh
|
||||
+++ b/include/Rivet/Tools/osdir.hh
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
/// @cond OSDIR
|
||||
|
||||
-#if defined(unix) || defined(__unix) || defined(__unix__)
|
||||
+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
|
||||
#define OSLINK_OSDIR_POSIX
|
||||
#elif defined(_WIN32)
|
||||
#define OSLINK_OSDIR_WINDOWS
|
||||
@@ -32,18 +32,7 @@
|
||||
#include <string>
|
||||
|
||||
#if defined(OSLINK_OSDIR_NOTSUPPORTED)
|
||||
-
|
||||
-namespace oslink
|
||||
-{
|
||||
- class directory
|
||||
- {
|
||||
- public:
|
||||
- directory(const std::string&) { }
|
||||
- operator void*() const { return (void*)0; }
|
||||
- std::string next() { return ""; }
|
||||
- };
|
||||
-}
|
||||
-
|
||||
+#error Platform misdetected or oslink is not implemented
|
||||
#elif defined(OSLINK_OSDIR_POSIX)
|
||||
|
||||
#include <sys/types.h>
|
||||
|
|
@ -1,50 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rivet";
|
||||
version = "3.1.3";
|
||||
version = "3.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
|
||||
sha256 = "08g0f84l7r6vm4n7gn36qi3bzacscpv061m9xar2572vf10wxpak";
|
||||
sha256 = "sha256-N+3ICilozhAxWJ5DumtJKHfKeQG+o4+Lt1NqXIz4EA0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./darwin.patch # configure relies on impure sw_vers to -Dunix
|
||||
|
||||
# fix compilation errors (fails depending on number of cores filesystem ordering?)
|
||||
# https://gitlab.com/hepcedar/rivet/-/merge_requests/220
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/hepcedar/rivet/commit/3203bf12a4bef81f880789eb9cde7ff489ae5115.diff";
|
||||
sha256 = "0zn5yxlv6dk4vcqgz0syzb9mp4qc9smpmgshcqimcvii7qcp20mc";
|
||||
})
|
||||
# https://gitlab.com/hepcedar/rivet/-/merge_requests/223
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/hepcedar/rivet/commit/476f267c46b126fa163a92aa6cbcb7806c4624c3.diff";
|
||||
sha256 = "0dhkraddzp06v5z0d2wf0c8vsd50hl5pqsjgsrb8x14d0vwi8rnc";
|
||||
})
|
||||
|
||||
# fix for new python and fix transparency gs 9.52
|
||||
# gs 9.52 opacity fix
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/hepcedar/rivet/commit/25c4bee19882fc56407b0a438f86e1a11753d5e6.diff";
|
||||
sha256 = "18p2wk54r0qfq6l27z6805zq1z5jhk5sbxbjixgibzq8prj1a78v";
|
||||
})
|
||||
|
||||
# make-plots: fix wrong logic in Plot.set_xmax()
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/hepcedar/rivet/commit/d371c6c10cf67a41c0e4e27c16ff5723d6276ad2.diff";
|
||||
sha256 = "0w622rd5darj7qafbbc84blznvy5rnhsdyr2n1i1fkz19mrf5h2p";
|
||||
})
|
||||
|
||||
# fix https://gitlab.com/hepcedar/rivet/-/issues/200
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/hepcedar/rivet/commit/442dbd17dcb3bd6e30b26e54c50f6a8237f966f9.diff";
|
||||
includes = [ "bin/make-pgfplots" "bin/make-plots" "bin/make-plots-fast" ];
|
||||
sha256 = "0c3rysgcib49km1zdpgsdai3xi4s6ijqgxp4whn04mrh3qf4bmr3";
|
||||
})
|
||||
];
|
||||
|
||||
latex = texlive.combine { inherit (texlive)
|
||||
scheme-basic
|
||||
collection-pstricks
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.69.2";
|
||||
version = "0.70.0";
|
||||
pname = "jbang";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
|
||||
sha256 = "sha256-MsVmsZOupkJWGyoTxxQavcO78X4MMuIqJXaPSbd/Tgg=";
|
||||
sha256 = "sha256-Fy7TvWJVRJI5fhfZzMuW+KBLaVLWKjk/I3Kx60Wazyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfpgaloader";
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trabucayre";
|
||||
repo = "openFPGALoader";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Qbw+vmpxiZXTGM0JwpS5mGzcsSJNegsvmncm+cOVrVE=";
|
||||
sha256 = "sha256-OWRMWNOPm6flgeTKYWYE+LcG3HW6i8s2NQ1dr/oeOEw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
Loading…
Reference in New Issue