dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
Fixes an issue blocking staging-next-small evaluation.
This commit is contained in:
Vladimír Čunát 2023-10-26 11:40:51 +02:00
commit 4d86c20f10
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
37 changed files with 366 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/security/acme/default.nix
View File

@ -938,13 +938,10 @@ in {
and remove the wildcard from the path.
'';
}
{
assertion = lib.length (lib.filter (x: x != null) [
data.dnsProvider
data.webroot
data.listenHTTP
data.s3Bucket
]) != 1;
(let exclusiveAttrs = {
inherit (data) dnsProvider webroot listenHTTP s3Bucket;
}; in {
assertion = lib.length (lib.filter (x: x != null) (builtins.attrValues exclusiveAttrs)) == 1;
message = ''
Exactly one of the options
`security.acme.certs.${cert}.dnsProvider`,
@ -952,8 +949,9 @@ in {
`security.acme.certs.${cert}.listenHTTP` and
`security.acme.certs.${cert}.s3Bucket`
is required.
Current values: ${(lib.generators.toPretty {} exclusiveAttrs)}.
'';
}
})
{
assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles);
message = ''

104
nixos/modules/system/boot/systemd/tmpfiles.nix
View File

@ -20,6 +20,102 @@ in
'';
};
systemd.tmpfiles.settings = mkOption {
description = lib.mdDoc ''
Declare systemd-tmpfiles rules to create, delete, and clean up volatile
and temporary files and directories.
Even though the service is called `*tmp*files` you can also create
persistent files.
'';
example = {
"10-mypackage" = {
"/var/lib/my-service/statefolder".d = {
mode = "0755";
user = "root";
group = "root";
};
};
};
default = {};
type = types.attrsOf (types.attrsOf (types.attrsOf (types.submodule ({ name, config, ... }: {
options.type = mkOption {
type = types.str;
default = name;
example = "d";
description = lib.mdDoc ''
The type of operation to perform on the file.
The type consists of a single letter and optionally one or more
modifier characters.
Please see the upstream documentation for the available types and
more details:
<https://www.freedesktop.org/software/systemd/man/tmpfiles.d>
'';
};
options.mode = mkOption {
type = types.str;
default = "-";
example = "0755";
description = lib.mdDoc ''
The file access mode to use when creating this file or directory.
'';
};
options.user = mkOption {
type = types.str;
default = "-";
example = "root";
description = lib.mdDoc ''
The user of the file.
This may either be a numeric ID or a user/group name.
If omitted or when set to `"-"`, the user and group of the user who
invokes systemd-tmpfiles is used.
'';
};
options.group = mkOption {
type = types.str;
default = "-";
example = "root";
description = lib.mdDoc ''
The group of the file.
This may either be a numeric ID or a user/group name.
If omitted or when set to `"-"`, the user and group of the user who
invokes systemd-tmpfiles is used.
'';
};
options.age = mkOption {
type = types.str;
default = "-";
example = "10d";
description = lib.mdDoc ''
Delete a file when it reaches a certain age.
If a file or directory is older than the current time minus the age
field, it is deleted.
If set to `"-"` no automatic clean-up is done.
'';
};
options.argument = mkOption {
type = types.str;
default = "";
example = "";
description = lib.mdDoc ''
An argument whose meaning depends on the type of operation.
Please see the upstream documentation for the meaning of this
parameter in different situations:
<https://www.freedesktop.org/software/systemd/man/tmpfiles.d>
'';
};
}))));
};
systemd.tmpfiles.packages = mkOption {
type = types.listOf types.package;
default = [];
@ -100,7 +196,13 @@ in
${concatStringsSep "\n" cfg.rules}
'';
})
];
] ++ (mapAttrsToList (name: paths:
pkgs.writeTextDir "lib/tmpfiles.d/${name}.conf" (concatStrings (mapAttrsToList (path: types:
concatStrings (mapAttrsToList (_type: entry: ''
'${entry.type}' '${path}' '${entry.mode}' '${entry.user}' '${entry.group}' '${entry.age}' ${entry.argument}
'') types)
) paths ))
) cfg.settings);
systemd.tmpfiles.rules = [
"d /nix/var 0755 root root - -"

4
nixos/tests/misc.nix
View File

@ -13,6 +13,7 @@ in {
environment.variables.EDITOR = lib.mkOverride 0 "emacs";
documentation.nixos.enable = lib.mkOverride 0 true;
systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];
systemd.tmpfiles.settings."10-test"."/tmp/somefile".d = {};
virtualisation.fileSystems = { "/tmp2" =
{ fsType = "tmpfs";
options = [ "mode=1777" "noauto" ];
@ -117,6 +118,9 @@ in {
)
machine.fail("[ -e /tmp/foo ]")
with subtest("whether systemd-tmpfiles settings works"):
machine.succeed("[ -e /tmp/somefile ]")
with subtest("whether automounting works"):
machine.fail("grep '/tmp2 tmpfs' /proc/mounts")
machine.succeed("touch /tmp2/x")

2
pkgs/applications/emulators/retroarch/cores.nix
View File

@ -568,6 +568,7 @@ in
mame2015 = mkLibretroCore {
core = "mame2015";
patches = [ ./patches/mame2015-python311.patch ];
makeFlags = [ "PYTHON=python3" ];
extraNativeBuildInputs = [ python3 ];
extraBuildInputs = [ alsa-lib ];
@ -581,6 +582,7 @@ in
mame2016 = mkLibretroCore {
core = "mame2016";
patches = [ ./patches/mame2016-python311.patch ];
extraNativeBuildInputs = [ python3 ];
extraBuildInputs = [ alsa-lib ];
makeFlags = [ "PYTHON_EXECUTABLE=python3" ];

61
pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch Normal file
View File

@ -0,0 +1,61 @@
diff --git a/src/emu/cpu/m6502/m6502make.py b/src/emu/cpu/m6502/m6502make.py
index da29fc722a..3de641dd69 100755
--- a/src/emu/cpu/m6502/m6502make.py
+++ b/src/emu/cpu/m6502/m6502make.py
@@ -16,7 +16,7 @@ def load_opcodes(fname):
opcodes = []
logging.info("load_opcodes: %s", fname)
try:
- f = open(fname, "rU")
+ f = open(fname, "r")
except Exception:
err = sys.exc_info()[1]
logging.error("cannot read opcodes file %s [%s]", fname, err)
@@ -39,7 +39,7 @@ def load_disp(fname):
logging.info("load_disp: %s", fname)
states = []
try:
- f = open(fname, "rU")
+ f = open(fname, "r")
except Exception:
err = sys.exc_info()[1]
logging.error("cannot read display file %s [%s]", fname, err)
diff --git a/src/emu/cpu/m6809/m6809make.py b/src/emu/cpu/m6809/m6809make.py
index c3d5b0f66e..79f6f90cdd 100644
--- a/src/emu/cpu/m6809/m6809make.py
+++ b/src/emu/cpu/m6809/m6809make.py
@@ -14,7 +14,7 @@ def load_file(fname, lines):
if path != "":
path += '/'
try:
- f = open(fname, "rU")
+ f = open(fname, "r")
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
diff --git a/src/emu/cpu/mcs96/mcs96make.py b/src/emu/cpu/mcs96/mcs96make.py
index ec5ec37a78..7ab806a653 100644
--- a/src/emu/cpu/mcs96/mcs96make.py
+++ b/src/emu/cpu/mcs96/mcs96make.py
@@ -71,7 +71,7 @@ def __init__(self, fname, is_196):
self.ea = {}
self.macros = {}
try:
- f = open(fname, "rU")
+ f = open(fname, "r")
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
diff --git a/src/emu/cpu/tms57002/tmsmake.py b/src/emu/cpu/tms57002/tmsmake.py
index 62092097d9..78f9fe43cd 100755
--- a/src/emu/cpu/tms57002/tmsmake.py
+++ b/src/emu/cpu/tms57002/tmsmake.py
@@ -326,7 +326,7 @@ def ins_cmp_dasm(a, b):
def LoadLst(filename):
instructions = []
ins = None
- for n, line in enumerate(open(filename, "rU")):
+ for n, line in enumerate(open(filename, "r")):
line = line.rstrip()
if not line and ins:
# new lines separate intructions

74
pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch Normal file
View File

@ -0,0 +1,74 @@
diff --git a/scripts/build/verinfo.py b/scripts/build/verinfo.py
index a73d8ad268..82a80c0984 100644
--- a/scripts/build/verinfo.py
+++ b/scripts/build/verinfo.py
@@ -63,7 +63,7 @@ def extract_version(input):
build, outfmt, srcfile, dstfile = parse_args()
try:
- fp = open(srcfile, 'rU')
+ fp = open(srcfile, 'r')
except IOError:
sys.stderr.write("Unable to open source file '%s'\n" % srcfile)
sys.exit(1)
diff --git a/src/devices/cpu/m6502/m6502make.py b/src/devices/cpu/m6502/m6502make.py
index 8bcd85f8e2..557b175966 100755
--- a/src/devices/cpu/m6502/m6502make.py
+++ b/src/devices/cpu/m6502/m6502make.py
@@ -18,7 +18,7 @@ def load_opcodes(fname):
opcodes = []
logging.info("load_opcodes: %s", fname)
try:
- f = open(fname, "rU")
+ f = open(fname, "r")
except Exception:
err = sys.exc_info()[1]
logging.error("cannot read opcodes file %s [%s]", fname, err)
@@ -41,7 +41,7 @@ def load_disp(fname):
logging.info("load_disp: %s", fname)
states = []
try:
- f = open(fname, "rU")
+ f = open(fname, "r")
except Exception:
err = sys.exc_info()[1]
logging.error("cannot read display file %s [%s]", fname, err)
diff --git a/src/devices/cpu/m6809/m6809make.py b/src/devices/cpu/m6809/m6809make.py
index 8838b96019..e1ea25db06 100644
--- a/src/devices/cpu/m6809/m6809make.py
+++ b/src/devices/cpu/m6809/m6809make.py
@@ -16,7 +16,7 @@ def load_file(fname, lines):
if path != "":
path += '/'
try:
- f = open(fname, "rU")
+ f = open(fname, "r")
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
diff --git a/src/devices/cpu/mcs96/mcs96make.py b/src/devices/cpu/mcs96/mcs96make.py
index b4844942e3..207208d2b6 100644
--- a/src/devices/cpu/mcs96/mcs96make.py
+++ b/src/devices/cpu/mcs96/mcs96make.py
@@ -73,7 +73,7 @@ def __init__(self, fname, is_196):
self.ea = {}
self.macros = {}
try:
- f = open(fname, "rU")
+ f = open(fname, "r")
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
diff --git a/src/devices/cpu/tms57002/tmsmake.py b/src/devices/cpu/tms57002/tmsmake.py
index e2e12b5a4b..942ec09537 100755
--- a/src/devices/cpu/tms57002/tmsmake.py
+++ b/src/devices/cpu/tms57002/tmsmake.py
@@ -323,7 +323,7 @@ def AddInfo(self, line):
def LoadLst(filename):
instructions = []
ins = None
- for n, line in enumerate(open(filename, "rU")):
+ for n, line in enumerate(open(filename, "r")):
line = line.rstrip()
if not line and ins:
# new lines separate intructions

6
pkgs/applications/networking/trayscale/default.nix
View File

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "trayscale";
version = "0.9.7";
version = "0.10.4";
src = fetchFromGitHub {
owner = "DeedleFake";
repo = "trayscale";
rev = "v${version}";
hash = "sha256-PMcpVBJVJNX+5vICubBUqlyHC0CEZC9EGUfw6O3pCeA=";
hash = "sha256-/31QKCyMeEdpP59B+iXS5hL9W5sWz7R/I2nxBtj+0s4=";
};
vendorHash = "sha256-K1Za2j4kUtsktFi9DjZYXrtfsWF1r6vIbyocLUrj5IU=";
vendorHash = "sha256-xYBiO6Zm32Do19I/cm4T6fubXY++Bhkn+RNAmKzM5cY=";
subPackages = [ "cmd/trayscale" ];

23
pkgs/development/libraries/glibc/default.nix
View File

@ -3,7 +3,7 @@
, profilingLibraries ? false
, withGd ? false
, withLibcrypt? false
, buildPackages
, pkgsBuildBuild
, libgcc
}:
@ -95,17 +95,26 @@ in
"user-defined-trusted-dirs=${libgcc}/lib"
];
postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then ''
postInstall = previousAttrs.postInstall + (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then ''
echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED
make -j''${NIX_BUILD_CORES:-1} localedata/install-locales
'' else lib.optionalString stdenv.buildPlatform.isLinux ''
'' else lib.optionalString stdenv.buildPlatform.isLinux
# This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html
# Instead of using their patch to build a build-native localedef,
# we simply use the one from buildPackages
# we simply use the one from pkgsBuildBuild.
#
# Note that we can't use pkgsBuildHost (aka buildPackages) here, because
# that will cause an eval-time infinite recursion: "buildPackages.glibc
# depended on buildPackages.libgcc, which, since it's GCC, depends on the
# target's bintools, which depend on the target's glibc, which, again,
# depends on buildPackages.glibc, causing an infinute recursion when
# evaluating buildPackages.glibc when glibc hasn't come from stdenv
# (e.g. on musl)." https://github.com/NixOS/nixpkgs/pull/259964
''
pushd ../glibc-2*/localedata
export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata
mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale
${lib.getBin buildPackages.glibc}/bin/localedef \
mkdir -p $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale
${lib.getBin pkgsBuildBuild.glibc}/bin/localedef \
--alias-file=../intl/locale.alias \
-i locales/C \
-f charmaps/UTF-8 \
@ -115,7 +124,7 @@ in
else
"--big-endian"} \
C.UTF-8
cp -r $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale $out/lib
cp -r $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale $out/lib
popd
'') + ''

4
pkgs/development/libraries/kweathercore/default.nix
View File

@ -9,14 +9,14 @@
mkDerivation rec {
pname = "kweathercore";
version = "0.6";
version = "0.7";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "libraries";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LIgUSXKHcRqcBwGTRxU5Z4eHuWmPLerorlrnI6Cf9k4=";
sha256 = "sha256-CnnoPkgz97SfDG13zfyIWweVnp2oxAChTPKFxJC+L8A=";
};
buildInputs = [

8
pkgs/development/libraries/openmpi/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, gfortran, perl, libnl
, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
, libpsm2, libfabric, pmix, ucx
, libpsm2, libfabric, pmix, ucx, ucc
, config
# Enable CUDA support
, cudaSupport ? config.cudaSupport, cudatoolkit
@ -25,11 +25,11 @@ let
};
in stdenv.mkDerivation rec {
pname = "openmpi";
version = "4.1.5";
version = "4.1.6";
src = with lib.versions; fetchurl {
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
sha256 = "sha256-pkCYa8JXOJ3TeYhv2uYmTIz6VryYtxzjrj372M5h2+M=";
sha256 = "sha256-90CZRIVRbetjtTEa8SLCZRefUyig2FelZ7hdsAsR5BU=";
};
postPatch = ''
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
buildInputs = [ zlib ]
++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ]
++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ucc ]
++ lib.optionals cudaSupport [ cudatoolkit ]
++ [ libevent hwloc ]
++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core

20
pkgs/development/libraries/pmix/default.nix
View File

@ -1,16 +1,17 @@
{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake
, libtool, flex, libevent, hwloc, munge, zlib, pandoc
, libtool, python3, flex, libevent, hwloc, munge, zlib, pandoc, gitMinimal
} :
stdenv.mkDerivation rec {
pname = "pmix";
version = "3.2.4";
version = "5.0.1";
src = fetchFromGitHub {
repo = "openpmix";
owner = "openpmix";
rev = "v${version}";
sha256 = "sha256-79zTZm549VRsqeziCuBT6l4jTJ6D/gZaMAvgHZm7jn4=";
hash = "sha256-ZuuzQ8j5zqQ/9mBFEODAaoX9/doWB9Nt9Sl75JkJyqU=";
fetchSubmodules = true;
};
postPatch = ''
@ -18,14 +19,25 @@ stdenv.mkDerivation rec {
patchShebangs ./config
'';
nativeBuildInputs = [ pandoc perl autoconf automake libtool flex ];
nativeBuildInputs = [
pandoc
perl
autoconf
automake
libtool
flex
gitMinimal
python3
];
buildInputs = [ libevent hwloc munge zlib ];
configureFlags = [
"--with-libevent=${lib.getDev libevent}"
"--with-libevent-libdir=${lib.getLib libevent}/lib"
"--with-munge=${munge}"
"--with-hwloc=${lib.getDev hwloc}"
"--with-hwloc-libdir=${lib.getLib hwloc}/lib"
];
preConfigure = ''

7
pkgs/development/ocaml-modules/brr/default.nix
View File

@ -2,18 +2,17 @@
, ocaml, findlib, ocamlbuild, topkg
, js_of_ocaml-compiler
, js_of_ocaml-toplevel
, note
}:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-brr";
version = "0.0.4";
version = "0.0.6";
src = fetchurl {
url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz";
hash = "sha256-v+Ik1tdRBVnNDqhmNoJuLelL3k5OhxIsUorGdTb9sbw=";
hash = "sha256-paYZlzujXsG1S+s/4/kAPBlDuV1Ljorw7okAu4qaAV0=";
};
buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel note ];
propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel ];
inherit (topkg) buildPhase installPhase;
meta = {

30
pkgs/development/ocaml-modules/cooltt/default.nix
View File

@ -2,6 +2,7 @@
, fetchFromGitHub
, fetchurl
, buildDunePackage
, bos
, bwd
, cmdliner
, containers
@ -16,22 +17,21 @@
, yuujinchou
, ounit2
, qcheck
, qcheck-core
}:
let
bantorra = buildDunePackage rec {
pname = "bantorra";
version = "unstable-2022-04-20";
version = "unstable-2022-05-08";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "bantorra";
rev = "1e78633d9a2ef7104552a24585bb8bea36d4117b";
sha256 = "sha256:15v1cggm7awp11iwl3lzpaar91jzivhdxggp5mr48gd28kfipzk2";
rev = "d05c34295727dd06d0ac4416dc2e258732e8593d";
hash = "sha256-s6lUTs3VRl6YhLAn3PO4aniANhFp8ytoTsFAgcOlee4=";
};
duneVersion = "3";
propagatedBuildInputs = [ ezjsonm findlib ];
propagatedBuildInputs = [ bos ezjsonm findlib ];
meta = {
description = "Extensible Library Management and Path Resolution";
@ -41,19 +41,18 @@ let
};
kado = buildDunePackage rec {
pname = "kado";
version = "unstable-2022-04-30";
version = "unstable-2023-10-03";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "kado";
rev = "8dce50e7d759d482b82565090e550d3860d64729";
sha256 = "sha256:1xb754fha4s0bgjfqjxzqljvalmkfdwdn5y4ycsp51wiah235bsy";
rev = "6b2e9ba2095e294e6e0fc6febc280d80c5799c2b";
hash = "sha256-fP6Ade3mJeyOMjuDIvrW88m6E3jfb2z3L8ufgloz4Tc=";
};
duneVersion = "3";
propagatedBuildInputs = [ bwd ];
doCheck = true;
checkInputs = [ qcheck-core ];
meta = {
description = "Cofibrations in Cartecian Cubical Type Theory";
@ -65,16 +64,15 @@ in
buildDunePackage {
pname = "cooltt";
version = "unstable-2022-04-28";
version = "unstable-2023-10-03";
minimalOCamlVersion = "4.13";
duneVersion = "3";
minimalOCamlVersion = "5.0";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "cooltt";
rev = "88511e10cb9e17286f585882dee334f3d8ace47c";
sha256 = "sha256:1n9bh86r2n9s3mm7ayfzwjbnjqcphpsf8yqnf4whd3yi930sqisw";
rev = "a5eaf4db195b5166a7102d47d42724f59cf3de19";
hash = "sha256-48bEf59rtPRrCRjab7+GxppjfR2c87HjQ+uKY2Bag0I=";
};
nativeBuildInputs = [

4
pkgs/development/ocaml-modules/hacl-star/default.nix
View File

@ -4,9 +4,9 @@
buildDunePackage {
pname = "hacl-star";
inherit (hacl-star-raw) version src meta doCheck minimalOCamlVersion;
inherit (hacl-star-raw) version src meta doCheck;
duneVersion = "3";
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
hacl-star-raw

6
pkgs/development/ocaml-modules/hacl-star/raw.nix
View File

@ -12,11 +12,11 @@
}:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-hacl-star-raw";
version = "0.7.0";
version = "0.7.1";
src = fetchzip {
url = "https://github.com/cryspen/hacl-packages/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz";
sha256 = "sha256-jJtxVYhQgP8ItfLhQ2wcF8RKNRnYhB2j0nR7/YH1NfY=";
hash = "sha256-TcAEaJou4BOVXSz5DYewzKfvIpjXmhLAlgF0hlq3ToQ=";
stripRoot = false;
};
@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
./aligned-alloc.patch
];
minimalOCamlVersion = "4.08";
# strictoverflow is disabled because it breaks aarch64-darwin
hardeningDisable = [ "strictoverflow" ];

8
pkgs/development/ocaml-modules/note/default.nix
View File

@ -1,18 +1,20 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, brr }:
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
"note is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-note";
version = "0.0.2";
version = "0.0.3";
src = fetchurl {
url = "https://erratique.ch/software/note/releases/note-${version}.tbz";
hash = "sha256-b35XcaDUXQLqwkNfsJKX5A1q1pAhw/mgdwyOdacZiiY=";
hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k=";
};
buildInputs = [ ocaml findlib ocamlbuild topkg ];
inherit (topkg) buildPhase installPhase;
propagatedBuildInputs = [ brr ];
meta = {
homepage = "https://erratique.ch/software/note";
description = "An OCaml module for functional reactive programming";

7
pkgs/development/ocaml-modules/sail/default.nix
View File

@ -13,20 +13,20 @@
, z3
, linksem
, num
, yojson
}:
buildDunePackage rec {
pname = "sail";
version = "0.15";
version = "0.16";
src = fetchFromGitHub {
owner = "rems-project";
repo = "sail";
rev = version;
hash = "sha256-eNdFOSzkniNvSCZeORRJ/IYAu+9P4HSouwmhd4BQLPk=";
hash = "sha256-HY/rgWi0S7ZiAWZF0fVIRK6fpoJ7Xp5EQcxoPRCPJ5Y=";
};
duneVersion = "3";
minimalOCamlVersion = "4.08";
nativeBuildInputs = [
@ -43,6 +43,7 @@ buildDunePackage rec {
linenoise
pprint
linksem
yojson
];
preBuild = ''

5
pkgs/development/ocaml-modules/yuujinchou/default.nix
View File

@ -4,8 +4,8 @@
}:
let params = if lib.versionAtLeast ocaml.version "5.0" then {
version = "4.0.0";
hash = "sha256-yNLN5bBe4aft9Rl5VHmlOYTlnCdR2NgDWsc3uJHaZy4=";
version = "5.1.0";
hash = "sha256-J3qkytgJkk2gT83KJ47nNM4cXqVHbx4iTPK+fLwR7Wk=";
propagatedBuildInputs = [ algaeff bwd ];
} else {
version = "2.0.0";
@ -18,7 +18,6 @@ buildDunePackage rec {
inherit (params) version;
minimalOCamlVersion = "4.12";
duneVersion = "3";
src = fetchFromGitHub {
owner = "RedPRL";

4
pkgs/development/python-modules/accuweather/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "accuweather";
version = "1.0.0";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-CWPhdu0lttYhAS6hzyKPL3vtNRVqbDexxY6nvMya3jA=";
hash = "sha256-elpVclH/sVQHEp3kTiwbDproJcB85F7m5sEjXwSEtNk=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/aiosmtplib/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiosmtplib";
version = "2.0.2";
version = "3.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "cole";
repo = pname;
rev = "v${version}";
hash = "sha256-Wo9WH3fwGN1upLAyj6aThxpQE7hortISjaCATTPee40=";
hash = "sha256-A9pvHj2riIHCd1F+ve6aLdbtl3tPPDovV1AZeWNeOEo=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/autoit-ripper/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "autoit-ripper";
version = "1.1.0";
version = "1.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-fluG/2XlUh3kPtYtSotrP02c7kdmem92Hy1R93SaTzk=";
hash = "sha256-a30SDJdKoljWjV0O1sZ35NnQPFcJ0XOPcmTanozWpHY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/aws-adfs/default.nix
View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aws-adfs";
version = "2.8.2";
version = "2.9.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "venth";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hMM7Z0s9t5vetgskiy7nb1W/kKCKHe0Q3kT2ngUVADA=";
hash = "sha256-IZeEb87NX3fyw1hENF1LldbgbaXXPG3u2AiCeci6MIw=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/dvc-data/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "2.18.1";
version = "2.18.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-JL72tenKmsWanHl6+olpx7SkFLmFoTyctl+2TnnKcAI=";
hash = "sha256-gfb4FtuaOEtzOwNcBPa/KM6dMI8ckf91ch1TZOxFHck=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/gios/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "gios";
version = "3.1.0";
version = "3.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-7lOY8J42mRmIA18tQrmY3gNEQf6YqzbeULecrGhNwFc=";
hash = "sha256-mgfeaYC9Uq23fDzVwHMryYrmDO2b/rSwrvAp/T4HaIE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/homematicip/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "homematicip";
version = "1.0.15";
version = "1.0.16";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "hahn-th";
repo = "homematicip-rest-api";
rev = "refs/tags/${version}";
hash = "sha256-wetkcHtm5O6mxhyU3/E4yrv6UGHAdKUlae2wJdCXtJI=";
hash = "sha256-rvjdhsvGYllVeenVkU/ikwil4OVHPRIaXs+85q0pM/w=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/nettigo-air-monitor/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "nettigo-air-monitor";
version = "2.1.0";
version = "2.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-6pLdaBeyTIrsAzkr83Iywta+K4Vx3nt0QyL8opHNwV8=";
hash = "sha256-K8EiDb6B18No9RNbw2a7U+FJQaXrrcFf0hgt40r6Igo=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyeconet/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyeconet";
version = "0.1.20";
version = "0.1.21";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "w1ll1am23";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-x94V6qdDHgeeFLAuciC7mHMWbC0d3AtS0aQNaZOCajI=";
hash = "sha256-G+J61L9i5JIgPC4oZQavafjD81kue02r+GRdIazrzOw=";
};
nativeBuildInputs = [

9
pkgs/development/python-modules/pyslurm/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, pythonOlder
, fetchFromGitHub
, fetchpatch
, buildPythonPackage
, cython
, slurm
@ -20,9 +21,15 @@ buildPythonPackage rec {
hash = "sha256-M8seh5pkw2OTiDU4O96D0Lg3+FrlB2w4ehy53kSxyoU=";
};
patches = [ (fetchpatch {
name = "remove-undeclared-KILL_JOB_ARRAY";
url = "https://github.com/PySlurm/pyslurm/commit/f7a7d8beb8ceb4e4c1b248bab2ebb995dcae77e2.patch";
hash = "sha256-kQLGiGzAhqP8Z6pObz9vdTRdITd12w7KuUDXsfyLIU8=";
})];
buildInputs = [ cython slurm ];
setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ];
setupPyBuildFlags = [ "--slurm-lib=${lib.getLib slurm}/lib" "--slurm-inc=${lib.getDev slurm}/include" ];
# Test cases need /etc/slurm/slurm.conf and require a working slurm installation
doCheck = false;

4
pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
View File

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "sphinxcontrib-openapi";
version = "0.8.1";
version = "0.8.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
hash = "sha256-BPz4fCWTRRYqUEzj3+4PcTifUHw3l3mNxTHHdImVtOs=";
hash = "sha256-nGIRdUC1J2AGrHrUrzRpbQKvJ4r6KZcSdAw2gKmp3mw=";
};
nativeBuildInputs = [ setuptools-scm ];

6
pkgs/development/python-modules/whispers/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "whispers";
version = "2.1.5";
version = "2.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "adeptex";
repo = pname;
rev = version;
hash = "sha256-vY8ruemRYJ05YtJAYX3TFlp+pRwF7Tkp7eft9e+HrgA=";
rev = "refs/tags/${version}";
hash = "sha256-9vXku8BWJtlf+lmAcQ8a7qTisRNc+xVw0T0Eunc4lt4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/winacl/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "winacl";
version = "0.1.7";
version = "0.1.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ymYsCRRxpsYp12xe7GPYob8a98BUNI8JwSQvM4hQsr0=";
hash = "sha256-RCcaMCVi3lFin2jvFUDUDzom57wBc2RrAaZ3nO2tZEw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zha-quirks/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "zha-quirks";
version = "0.0.105";
version = "0.0.106";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha-device-handlers";
rev = "refs/tags/${version}";
hash = "sha256-k4azIBjlS/J448ncu6cgB6oJtpS0Qb2Bnm11vq7RFEI=";
hash = "sha256-+sL3AbjDg0Kl6eqMwVAN9W85QKJqFR1ANKz1E958KeA=";
};
propagatedBuildInputs = [

3
pkgs/servers/computing/slurm/default.nix
View File

@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
# increase string length to allow for full
# path of 'echo' in nix store
./common-env-echo.patch
# Required for configure to pick up the right dlopen path
./pmix-configure.patch
];
prePatch = ''
@ -72,6 +70,7 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc/slurm"
"--with-pmix=${pmix}"
"--with-bpf=${libbpf}"
"--without-rpath" # Required for configure to pick up the right dlopen path
] ++ (optional enableGtk2 "--disable-gtktest")
++ (optional (!enableX11) "--disable-x11");

13
pkgs/servers/computing/slurm/pmix-configure.patch
View File

@ -1,13 +0,0 @@
diff --git a/configure b/configure
index 1cf53bc..ab68441 100755
--- a/configure
+++ b/configure
@@ -21207,7 +21207,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext
as_fn_error $? "error processing $x_ac_cv_pmix_libdir: PMIx v3.x was already found in one of the previous paths" "$LINENO" 5
fi
_x_ac_pmix_v3_found="1"
- PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
+ PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include -DPMIXP_V3_LIBPATH=\\\"$x_ac_cv_pmix_libdir\\\""
if test "$ac_with_rpath" = "yes"; then
PMIX_V3_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
else

4
pkgs/tools/security/ospd-openvas/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ospd-openvas";
version = "22.6.0";
version = "22.6.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "greenbone";
repo = "ospd-openvas";
rev = "refs/tags/v${version}";
hash = "sha256-1538XMNnerhfV3xQ8/TyoztCfWnkRvy0p6QtKMQb2p4=";
hash = "sha256-Qm6TTS9yLqQHXsz19yJR3Ccyc+syxkrTJ7upSTXdXSE=";
};
pythonRelaxDeps = [

6
pkgs/tools/security/trufflehog/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.60.1";
version = "3.60.3";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-aZA/nIntTiYXvZE6sAjYyWfkm842+O6pwPFUKfnDrY4=";
hash = "sha256-864bq0LK2lRWmbQ7JTGc9gtMsTnoKMLkjyEdTNUBFRg=";
};
vendorHash = "sha256-axB0JcvGeiqz1dBKHknNqW3XzQWaLCHk6gsB9QV3PN8=";
vendorHash = "sha256-TNxZatI9l+dX2WI7SnTH975yrgyuB4VjTJOkaSr5mxc=";
ldflags = [
"-s"

4
pkgs/tools/text/crowdin-cli/default.nix
View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "crowdin-cli";
version = "3.14.0";
version = "3.15.0";
src = fetchurl {
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
hash = "sha256-Yb4zORtmEgZGu9h05/t4sQ6eTljHba89JZKh7vzIp2Q=";
hash = "sha256-ky+JNRay9VNscCXeGiSOIZlLKEcKv95TW/Kx2UtD1hA=";
};
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];