Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-05-01 18:01:56 +00:00 committed by GitHub
commit 7783054bd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 2477 additions and 921 deletions

View File

@ -434,6 +434,7 @@ ${expr "" v}
Configuration:
* multiline - by default is true which results in indented block-like view.
* indent - initial indent.
* asBindings - by default generate single value, but with this use attrset to set global vars.
Attention:
Regardless of multiline parameter there is no trailing newline.
@ -464,18 +465,35 @@ ${expr "" v}
/* If this option is true, the output is indented with newlines for attribute sets and lists */
multiline ? true,
/* Initial indentation level */
indent ? ""
indent ? "",
/* Interpret as variable bindings */
asBindings ? false,
}@args: v:
with builtins;
let
innerIndent = "${indent} ";
introSpace = if multiline then "\n${innerIndent}" else " ";
outroSpace = if multiline then "\n${indent}" else " ";
innerArgs = args // { indent = innerIndent; };
innerArgs = args // {
indent = if asBindings then indent else innerIndent;
asBindings = false;
};
concatItems = concatStringsSep ",${introSpace}";
isLuaInline = { _type ? null, ... }: _type == "lua-inline";
generatedBindings =
assert lib.assertMsg (badVarNames == []) "Bad Lua var names: ${toPretty {} badVarNames}";
libStr.concatStrings (
lib.attrsets.mapAttrsToList (key: value: "${indent}${key} = ${toLua innerArgs value}\n") v
);
# https://en.wikibooks.org/wiki/Lua_Programming/variable#Variable_names
matchVarName = match "[[:alpha:]_][[:alnum:]_]*(\\.[[:alpha:]_][[:alnum:]_]*)*";
badVarNames = filter (name: matchVarName name == null) (attrNames v);
in
if v == null then
if asBindings then
generatedBindings
else if v == null then
"nil"
else if isInt v || isFloat v || isString v || isBool v then
builtins.toJSON v

View File

@ -4,6 +4,11 @@
with import ../default.nix;
let
testingThrow = expr: {
expr = (builtins.tryEval (builtins.seq expr "didn't throw"));
expected = { success = false; value = false; };
};
testingDeepThrow = expr: testingThrow (builtins.deepSeq expr expr);
testSanitizeDerivationName = { name, expected }:
let
@ -962,6 +967,41 @@ runTests {
expected = ''{ 41, 43 }'';
};
testToLuaEmptyBindings = {
expr = generators.toLua { asBindings = true; } {};
expected = "";
};
testToLuaBindings = {
expr = generators.toLua { asBindings = true; } { x1 = 41; _y = { a = 43; }; };
expected = ''
_y = {
["a"] = 43
}
x1 = 41
'';
};
testToLuaPartialTableBindings = {
expr = generators.toLua { asBindings = true; } { "x.y" = 42; };
expected = ''
x.y = 42
'';
};
testToLuaIndentedBindings = {
expr = generators.toLua { asBindings = true; indent = " "; } { x = { y = 42; }; };
expected = " x = {\n [\"y\"] = 42\n }\n";
};
testToLuaBindingsWithSpace = testingThrow (
generators.toLua { asBindings = true; } { "with space" = 42; }
);
testToLuaBindingsWithLeadingDigit = testingThrow (
generators.toLua { asBindings = true; } { "11eleven" = 42; }
);
testToLuaBasicExample = {
expr = generators.toLua {} {
cmd = [ "typescript-language-server" "--stdio" ];

View File

@ -235,7 +235,7 @@ in {
systemd.services = let
makeService = attrs: recursiveUpdate {
path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute2 ];
path = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute2 ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = "datadog";

View File

@ -41,13 +41,13 @@
stdenv.mkDerivation rec {
pname = "gnome-builder";
version = "44.1";
version = "44.2";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "+Tmn+VtLbh0EvY20vpygtnsqp2W4bGP03yP9s6ftzz4=";
sha256 = "z6aJx40/AiMcp0cVV99MZIKASio08nHDXRqWLX8XKbA=";
};
patches = [

View File

@ -6,14 +6,18 @@
python3Packages.buildPythonApplication rec {
pname = "veusz";
version = "3.3.1";
version = "3.6.2";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "4ClgYwiU21wHDve2q9cItSAVb9hbR2F+fJc8znGI8OA=";
sha256 = "whcaxF5LMEJNj8NSYeLpnb5uJboRl+vCQ1WxBrJjldE=";
};
nativeBuildInputs = [ wrapQtAppsHook python3Packages.sip_4 ];
nativeBuildInputs = [
wrapQtAppsHook
python3Packages.sip
python3Packages.tomli
];
buildInputs = [ qtbase ];
@ -24,22 +28,17 @@ python3Packages.buildPythonApplication rec {
wrapQtApp "$out/bin/veusz"
'';
# Since sip 6 (we use sip 4 here, but pyqt5 is built with sip 6), sip files are
# placed in a different directory layout and --sip-dir won't work anymore.
# --sip-dir expects a directory with a PyQt5 subdirectory (where sip files are located),
# but the new directory layout places sip files in a subdirectory named 'bindings'.
# To workaround this, we patch the full path into pyqtdistutils.py.
# pyqt_setuptools.py uses the platlib path from sysconfig, but NixOS doesn't
# really have a corresponding path, so patching the location of PyQt5 inplace
postPatch = ''
substituteInPlace pyqtdistutils.py \
--replace "'-I', pyqt5_include_dir," "'-I', '${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings',"
substituteInPlace pyqt_setuptools.py \
--replace "get_path('platlib')" "'${python3Packages.pyqt5}/${python3Packages.python.sitePackages}'"
patchShebangs tests/runselftest.py
'';
# you can find these options at
# https://github.com/veusz/veusz/blob/53b99dffa999f2bc41fdc5335d7797ae857c761f/pyqtdistutils.py#L71
# --sip-dir cannot be used here for the reasons explained above
setupPyBuildFlags = [
"--qt-include-dir=${qtbase.dev}/include"
# veusz tries to find a libinfix and fails without one
# but we simply don't need a libinfix, so set it to empty here
"--qt-libinfix="

View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
version = "1.26.3";
version = "1.26.4";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
hash = "sha256-YI9/rMoe5Waw2e/tObvu+wi9dkmhEoG9v3ZQzkn4QH4=";
hash = "sha256-l/sPqXkr4rSMEbPi/ahl/74RYqNrjcb28v6/scDrh1w=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -55,7 +55,7 @@
buildFun:
let
python3WithPackages = python3.withPackages(ps: with ps; [
python3WithPackages = python3.pythonForBuild.withPackages(ps: with ps; [
ply jinja2 setuptools
]);
clangFormatPython3 = fetchurl {
@ -129,6 +129,7 @@ let
python3WithPackages perl
which
llvmPackages.bintools
bison gperf
];
buildInputs = [
@ -142,7 +143,7 @@ let
nasm
nspr nss
util-linux alsa-lib
bison gperf libkrb5
libkrb5
glib gtk3 dbus-glib
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
mesa # required for libgbm
@ -314,7 +315,7 @@ let
# This is to ensure expansion of $out.
libExecPath="${libExecPath}"
${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
${python3.pythonForBuild}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
${gnChromium}/bin/gn gen --args=${lib.escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
# Fail if `gn gen` contains a WARNING.

View File

@ -2,22 +2,16 @@
python3Packages.buildPythonApplication rec {
pname = "git-cola";
version = "4.1.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "refs/tags/v${version}";
hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY=";
hash = "sha256-VAn4zXypOugPIVyXQ/8Yt0rCDM7hVdIY+jpmoTHqssU=";
};
# TODO: remove in the next release since upstream removed pytest-flake8
# https://github.com/git-cola/git-cola/commit/6c5c5c6c888ee1a095fc1ca5521af9a03b833205
postPatch = ''
substituteInPlace pytest.ini \
--replace "--flake8" ""
'';
buildInputs = [ qt5.qtwayland ];
propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ];
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook ];
nativeCheckInputs = with python3Packages; [ git pytestCheckHook ];

View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "youtube-tui";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "Siriusmart";
repo = pname;
rev = "v${version}";
hash = "sha256-YQj+hmNh8rqP7bKeFDQhZIf79WG7vqg31oReb0jrmg4=";
hash = "sha256-Dhdtdc8LmTeg9cxKPfdxRowTsAaJXKtvJXqJHK1t3P4=";
};
cargoHash = "sha256-qcWuh8qaOQBBebdX3D01k5yXZfifbFC+ZP0d6bJeOr0=";
cargoHash = "sha256-hT3Ygn0zcQdU1iU22e5SP5ZF6S6GiZzWieBsCqViN8Y=";
nativeBuildInputs = [
pkg-config

View File

@ -0,0 +1,26 @@
{ lib
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage {
pname = "i3-cycle-focus";
version = "unstable-2021-09-27";
src = fetchFromGitHub {
owner = "TheDoctor314";
repo = "i3-cycle-focus";
rev = "d94f22e4b8502de4ed846a211fa0c8418b3e3e89";
hash = "sha256-caZKvxOqoYgPs+Zjltj8K0/ospjkLnA4kh0rsTjeU3Y=";
};
cargoHash = "sha256-9glaxThm/ovgvUWCyrycS/Oe5t8iN5P38fF5vO5awQE=";
meta = with lib; {
description = "A simple tool to cyclically switch between the windows on the active workspace";
homepage = "https://github.com/TheDoctor314/i3-cycle-focus";
license = licenses.unlicense;
maintainers = with maintainers; [ GaetanLepage ];
platforms = platforms.linux;
};
}

View File

@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
buildNpmPackage rec {
pname = if set != null then "iosevka-${set}" else "iosevka";
version = "22.0.2";
version = "22.1.0";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
hash = "sha256-cBIcf6GEJnkOvKPMWTb9dWqN9uPs4ynr6tLc7+B6f3k=";
hash = "sha256-aq8IKWGOOYf83ed5Z10/B+42SsI7JY5ED3AwAlk/24k=";
};
npmDepsHash = "sha256-tLdJuDFVPdnEtHdGdU7G6N+LIiINVVB5/NNFaeveK/U=";
npmDepsHash = "sha256-6zt7q5aGb6jaa6YBr4HqawZjf2jqNnR9xQM/abKpT04=";
nativeBuildInputs = [
remarshal

View File

@ -21,9 +21,9 @@
let unwrapped = mkXfceDerivation {
category = "xfce";
pname = "thunar";
version = "4.18.4";
version = "4.18.6";
sha256 = "sha256-tdk0sWUzTmYXk+dOPVOpjmODpqmhzQc9jAOCk2+yNKM=";
sha256 = "sha256-7SWpIBGm/YhnQSWYi5BgYjx8WCiEqxZRTagz/cY0p3E=";
nativeBuildInputs = [
docbook_xsl

View File

@ -1,17 +1,27 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel,
libxfce4ui, gtk3, exo, gitUpdater }:
{ lib
, stdenv
, fetchurl
, pkg-config
, intltool
, libxfce4util
, xfce4-panel
, libxfce4ui
, glib
, gtk3
, gitUpdater
}:
let
category = "panel-plugins";
in
stdenv.mkDerivation rec {
pname = "xfce4-mpc-plugin";
version = "0.5.2";
pname = "xfce4-mpc-plugin";
version = "0.5.3";
src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-7v54t7a5UxKzpSgUt/Yy3JKXDBs+lTXeYWMVdJv2d2A=";
sha256 = "sha256-BGf7TRrNmC08PguJy0EBmUaFBST/Ge0PZYqNVse3Zk0=";
};
nativeBuildInputs = [
@ -23,8 +33,8 @@ stdenv.mkDerivation rec {
libxfce4util
libxfce4ui
xfce4-panel
glib
gtk3
exo
];
passthru.updateScript = gitUpdater {

View File

@ -1,14 +1,27 @@
{ lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
{ lib
, mkXfceDerivation
, glib
, gtk3
, libxfce4ui
, libxfce4util
, xfce4-panel
}:
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-netload-plugin";
version = "1.4.0";
version = "1.4.1";
rev-prefix = "xfce4-netload-plugin-";
odd-unstable = false;
sha256 = "sha256-HasaMymMCPidYkaAUK4gvD+Ka7NJdFOTeq43gJ1G3jo=";
sha256 = "sha256-PwbyYi9EeSTKilVXlbseY2zkabcL7o2CGnk2DFFVI94=";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
buildInputs = [
glib
gtk3
libxfce4ui
libxfce4util
xfce4-panel
];
meta = with lib; {
description = "Internet load speed plugin for Xfce4 panel";

View File

@ -56,7 +56,7 @@ with builtins;
let majorVersion = "12";
version = "${majorVersion}.2.0";
disableBootstrap = !stdenv.hostPlatform.isDarwin;
disableBootstrap = !stdenv.hostPlatform.isDarwin && !profiledCompiler;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -288,6 +288,8 @@ lib.pipe (stdenv.mkDerivation ({
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags =
# we do not yet have Nix-driven profiling
assert profiledCompiler -> !disableBootstrap;
let target =
lib.optionalString (profiledCompiler) "profiled" +
lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap";

View File

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DGDCM_BUILD_APPLICATIONS=ON"
"-DGDCM_BUILD_SHARED_LIBS=ON"
"-DGDCM_BUILD_TESTING=ON"
# hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue:
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_BINDIR=bin"
@ -47,6 +48,28 @@ stdenv.mkDerivation rec {
libiconv
] ++ lib.optionals enablePython [ swig python ];
disabledTests = [
# require networking:
"TestEcho"
"TestFind"
"gdcmscu-echo-dicomserver"
"gdcmscu-find-dicomserver"
# seemingly ought to be be disabled when the test data submodule is not present:
"TestvtkGDCMImageReader2_3"
"TestSCUValidation"
# errors because 3 classes not wrapped:
"TestWrapPython"
];
checkPhase = ''
runHook preCheck
ctest --exclude-regex '^(${lib.concatStringsSep "|" disabledTests})$'
runHook postCheck
'';
doCheck = true;
# note that when the test data is available to the build via `fetchSubmodules = true`,
# a number of additional but much slower tests are enabled
meta = with lib; {
description = "The grassroots cross-platform DICOM implementation";
longDescription = ''

View File

@ -1,23 +1,29 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq nix-update
#!nix-shell -i bash -p nix-update
set -euf -o pipefail
NEW_VERSION=$(curl https://vulkan.lunarg.com/sdk/latest/linux.json | jq -r '.linux')
VULKAN_SDK_PACKAGES=(
V_PACKAGES=(
"vulkan-headers"
"spirv-headers"
"glslang"
"vulkan-loader"
"spirv-tools"
"spirv-cross"
"vulkan-validation-layers"
"vulkan-tools"
"vulkan-tools-lunarg"
"vulkan-extension-layer"
)
for P in "${VULKAN_SDK_PACKAGES[@]}"; do
nix-update "$P" --version "$NEW_VERSION" --commit
SDK_PACKAGES=(
"spirv-headers"
"spirv-cross"
)
nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit
for P in "${V_PACKAGES[@]}"; do
nix-update "$P" --version-regex "(?:v)(.*)" --commit
done
for P in "${SDK_PACKAGES[@]}"; do
nix-update "$P" --version-regex "(?:sdk-)(.*)" --commit
done

View File

@ -1,5 +1,6 @@
{ pkgs, lib, lua }:
let
inherit (lib.generators) toLua;
requiredLuaModules = drvs: with lib; let
modules = filter hasLuaModule drvs;
in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules));
@ -88,58 +89,50 @@ rec {
, rocksSubdir
}: let
rocksTrees = lib.imap0
(i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }")
(i: dep: { name = "dep-${toString i}"; root = "${dep}"; rocks_dir = "${dep}/${dep.rocksSubdir}"; })
requiredLuaRocks;
# Explicitly point luarocks to the relevant locations for multiple-output
# derivations that are external dependencies, to work around an issue it has
# (https://github.com/luarocks/luarocks/issues/766)
depVariables = lib.concatMap ({name, dep}: [
"${name}_INCDIR='${lib.getDev dep}/include';"
"${name}_LIBDIR='${lib.getLib dep}/lib';"
"${name}_BINDIR='${lib.getBin dep}/bin';"
]) externalDeps';
depVariables = zipAttrsWithLast (lib.lists.map ({name, dep}: {
"${name}_INCDIR" = "${lib.getDev dep}/include";
"${name}_LIBDIR" = "${lib.getLib dep}/lib";
"${name}_BINDIR" = "${lib.getBin dep}/bin";
}) externalDeps');
zipAttrsWithLast = lib.attrsets.zipAttrsWith (name: lib.lists.last);
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
externalDepsDirs = map
(x: "'${builtins.toString x}'")
(x: builtins.toString x)
(lib.filter (lib.isDerivation) externalDeps);
extraVariablesStr = lib.concatStringsSep "\n "
(lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables);
in ''
local_cache = ""
-- To prevent collisions when creating environments, we install the rock
-- files into per-package subdirectories
rocks_subdir = '${rocksSubdir}'
-- first tree is the default target where new rocks are installed,
-- any other trees in the list are treated as additional sources of installed rocks for matching dependencies.
rocks_trees = {
{name = "current", root = '${placeholder "out"}', rocks_dir = "current" },
${lib.concatStringsSep "\n, " rocksTrees}
}
'' + lib.optionalString lua.pkgs.isLuaJIT ''
-- Luajit provides some additional functionality built-in; this exposes
-- that to luarock's dependency system
in toLua { asBindings = true; } ({
local_cache = "";
# To prevent collisions when creating environments, we install the rock
# files into per-package subdirectories
rocks_subdir = rocksSubdir;
# first tree is the default target where new rocks are installed,
# any other trees in the list are treated as additional sources of installed rocks for matching dependencies.
rocks_trees = (
[{name = "current"; root = "${placeholder "out"}"; rocks_dir = "current"; }] ++
rocksTrees
);
} // lib.optionalAttrs lua.pkgs.isLuaJIT {
# Luajit provides some additional functionality built-in; this exposes
# that to luarock's dependency system
rocks_provided = {
jit='${lua.luaversion}-1';
ffi='${lua.luaversion}-1';
luaffi='${lua.luaversion}-1';
bit='${lua.luaversion}-1';
}
'' + ''
-- For single-output external dependencies
external_deps_dirs = {
${lib.concatStringsSep "\n, " externalDepsDirs}
}
variables = {
-- Some needed machinery to handle multiple-output external dependencies,
-- as per https://github.com/luarocks/luarocks/issues/766
${lib.optionalString (lib.length depVariables > 0) ''
${lib.concatStringsSep "\n " depVariables}''}
${extraVariablesStr}
}
'';
jit = "${lua.luaversion}-1";
ffi = "${lua.luaversion}-1";
luaffi = "${lua.luaversion}-1";
bit = "${lua.luaversion}-1";
};
} // {
# For single-output external dependencies
external_deps_dirs = externalDepsDirs;
# Some needed machinery to handle multiple-output external dependencies,
# as per https://github.com/luarocks/luarocks/issues/766
variables = (depVariables // extraVariables);
});
}

View File

@ -17,6 +17,7 @@ buildDunePackage rec {
nativeBuildInputs = [ postgresql ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ postgresql ];
meta = {
description = "Bindings to the PostgreSQL library";

View File

@ -10,20 +10,29 @@
buildPythonPackage rec {
pname = "bucketstore";
version = "0.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jpetrucciani";
repo = "bucketstore";
rev = version;
rev = "refs/tags/${version}";
hash = "sha256-BtoyGqFbeBhGQeXnmeSfiuJLZtXFrK26WO0SDlAtKG4=";
};
propagatedBuildInputs = [ boto3 ];
postPatch = ''
substituteInPlace setup.py \
--replace "version=__version__," 'version="${version}",'
'';
propagatedBuildInputs = [
boto3
];
nativeCheckInputs = [
pytestCheckHook
moto
pytestCheckHook
];
pythonImportsCheck = [
@ -33,6 +42,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for interacting with Amazon S3";
homepage = "https://github.com/jpetrucciani/bucketstore";
changelog = "https://github.com/jpetrucciani/bucketstore/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ jpetrucciani ];
};

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, miniful
, numpy
, pythonOlder
}:
buildPythonPackage rec {
pname = "fst-pso";
version = "1.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-s9FuwnsLTTazWzBq9AwAzQs05eCp4wpx7QJJDolUomo=";
};
propagatedBuildInputs = [
miniful
numpy
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"fstpso"
];
meta = with lib; {
description = "Fuzzy Self-Tuning PSO global optimization library";
homepage = "https://github.com/aresio/fst-pso";
license = with licenses; [ lgpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, numpy
, scipy
, pythonOlder
}:
buildPythonPackage rec {
pname = "miniful";
version = "0.0.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ZCyfNrh8gbPvwplHN5tbmbjTMYXJBKe8Mg2JqOGHFCk=";
};
propagatedBuildInputs = [
numpy
scipy
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"miniful"
];
meta = with lib; {
description = "Minimal Fuzzy Library";
homepage = "https://github.com/aresio/miniful";
license = with licenses; [ lgpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -45,6 +45,7 @@ buildPythonPackage rec {
"test_pull_subscribe_limits"
"test_fetch_n"
"test_subscribe_no_echo"
"test_stream_management"
] ++ lib.optionals stdenv.isDarwin [
"test_subscribe_iterate_next_msg"
"test_buf_size_force_flush_timeout"
@ -57,6 +58,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python client for NATS.io";
homepage = "https://github.com/nats-io/nats.py";
changelog = "https://github.com/nats-io/nats.py/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

View File

@ -41,7 +41,7 @@ buildPythonPackage rec {
];
# Test fixtures require a running keycloak instance
doTest = false;
doCheck = false;
pythonImportsCheck = [
"keycloak"

View File

@ -0,0 +1,55 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, matplotlib
, numpy
, pytestCheckHook
, pythonOlder
, scipy
, seaborn
, requests
}:
buildPythonPackage rec {
pname = "simpful";
version = "2.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "aresio";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-vT7Y/6bD+txEVEw/zelMogQ0V7BIHHRitrC1COByzhY=";
};
propagatedBuildInputs = [
numpy
scipy
requests
];
passthru.optional-dependencies = {
plotting = [
matplotlib
seaborn
];
};
nativeCheckInputs = [
pytestCheckHook
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
pythonImportsCheck = [
"simpful"
];
meta = with lib; {
description = "Library for fuzzy logic";
homepage = "https://github.com/aresio/simpful";
changelog = "https://github.com/aresio/simpful/releases/tag/${version}";
license = with licenses; [ lgpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,40 @@
{ lib
, rustPlatform
, fetchFromGitLab
, pkg-config
, openssl
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-info";
version = "0.7.3";
src = fetchFromGitLab {
owner = "imp";
repo = "cargo-info";
rev = version;
hash = "sha256-m8YytirD9JBwssZFO6oQ9TGqjqvu1GxHN3z8WKLiKd4=";
};
cargoHash = "sha256-gI/DGPCVEi4Mg9nYLaPpeqpV7LBbxoLP0ditU6hPS1w=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "Cargo subcommand to show crates info from crates.io";
homepage = "https://gitlab.com/imp/cargo-info";
changelog = "https://gitlab.com/imp/cargo-info/-/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ figsoda ];
};
}

View File

@ -23,7 +23,7 @@ let
in
stdenv.mkDerivation rec {
pname = "vulkan-validation-layers";
version = "1.3.243.0";
version = "1.3.249";
# If we were to use "dev" here instead of headers, the setupHook would be
# placed in that output instead of "out".
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
rev = "sdk-${version}";
rev = "v${version}";
hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M=";
};

View File

@ -1,21 +1,21 @@
{ lib
, flutter2
, flutter
, fetchFromGitHub
}:
flutter2.buildFlutterApplication {
flutter.buildFlutterApplication {
pname = "firmware-updater";
version = "unstable";
version = "unstable-2023-04-30";
pubspecLockFile = ./pubspec.lock;
depsListFile = ./deps.json;
vendorHash = "sha256-kKfe+7obb2fihrca+mjCM2+51wNkbPLEPFLpXzK5Wvc=";
vendorHash = "sha256-cdMO+tr6kYiN5xKXa+uTMAcFf2C75F3wVPrn21G4QPQ=";
src = fetchFromGitHub {
owner = "canonical";
repo = "firmware-updater";
rev = "a51817a2551e29895352618a91df9cf93d944af1";
sha256 = "6uhks6a9JcyIC5o0VssqfBlE4pqKiQ7d3KOb6feNTvU=";
rev = "6e7dbdb64e344633ea62874b54ff3990bd3b8440";
sha256 = "sha256-s5mwtr5MSPqLMN+k851+pFIFFPa0N1hqz97ys050tFA=";
fetchSubmodules = true;
};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
$out/etc/clickhouse-server/config.xml
substituteInPlace $out/etc/clickhouse-server/config.xml \
--replace "<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>" "<console>1</console>"
substituteInPlace $out/etc/clickhouse-server/config.xml \
--replace "<level>trace</level>" "<level>warning</level>"
'';
hardeningDisable = [ "format" ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "vulkan-extension-layer";
version = "1.3.243.0";
version = "1.3.248";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ExtensionLayer";
rev = "sdk-${version}";
hash = "sha256-hxlfSnH4M3ui5nW0Ll5rhto0DnJIHW0tJzS+p4KV0R4=";
rev = "v${version}";
hash = "sha256-CuwYpB8HX8pnR+ElkQfckpKDLKyZIzqm4F9kluM1cKo=";
};
nativeBuildInputs = [ cmake jq ];
@ -40,6 +40,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.asl20;
maintainers = with maintainers; [ expipiplus1 ];
broken = (version != vulkan-headers.version);
};
}

View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "vulkan-tools";
version = "1.3.243.0";
version = "1.3.249";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Tools";
rev = "sdk-${version}";
hash = "sha256-8XJON+iBEPRtuQWf1bPXyOJHRkuRLnLXgTIjk7gYQwE=";
rev = "v${version}";
hash = "sha256-+d0Yp+e/wzlRmUIs4SffiphkqmM/7avJrt3JNOgO19I=";
};
nativeBuildInputs = [
@ -103,6 +103,5 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
license = licenses.asl20;
maintainers = [ maintainers.ralith ];
broken = (version != vulkan-headers.version);
};
}

View File

@ -5,11 +5,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "shell_gpt";
version = "0.8.8";
version = "0.9.0";
format = "pyproject";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-KuaSAiXlqWRhFtX4C6vibbUiq43L83pZX+yM9L7Ej68=";
sha256 = "sha256-KzW9yI1TGG2hFKeXHFqqYCLw/PB9+lJoTgyWrXxCHpo=";
};
nativeBuildInputs = with python3.pkgs; [
@ -24,6 +25,7 @@ python3.pkgs.buildPythonApplication rec {
distro
typer
requests
hatchling
];
pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ];

View File

@ -16213,6 +16213,7 @@ with pkgs;
cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
cargo-info = callPackage ../development/tools/rust/cargo-info { };
cargo-inspect = callPackage ../development/tools/rust/cargo-inspect {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -31174,6 +31175,8 @@ with pkgs;
i3-balance-workspace = python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix { };
i3-cycle-focus = callPackage ../applications/window-managers/i3/cycle-focus.nix { };
i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { };
i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { };

View File

@ -3768,6 +3768,8 @@ self: super: with self; {
fsspec = callPackage ../development/python-modules/fsspec { };
fst-pso = callPackage ../development/python-modules/fst-pso { };
ftfy = callPackage ../development/python-modules/ftfy { };
ftputil = callPackage ../development/python-modules/ftputil { };
@ -6112,6 +6114,8 @@ self: super: with self; {
minidump = callPackage ../development/python-modules/minidump { };
miniful = callPackage ../development/python-modules/miniful { };
minikanren = callPackage ../development/python-modules/minikanren { };
minikerberos = callPackage ../development/python-modules/minikerberos { };
@ -10931,6 +10935,8 @@ self: super: with self; {
simplisafe-python = callPackage ../development/python-modules/simplisafe-python { };
simpful = callPackage ../development/python-modules/simpful { };
simpy = callPackage ../development/python-modules/simpy { };
single-version = callPackage ../development/python-modules/single-version { };