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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-06-15 12:01:51 +00:00 committed by GitHub
commit 4ea871dec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
85 changed files with 720 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/languages-frameworks/nim.section.md
View File

@ -59,7 +59,6 @@ buildNimPackage (finalAttrs: {
hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
};
propagatedBuildInputs = [ SDL2 ];
doCheck = true;
})
```

12
maintainers/maintainer-list.nix
View File

@ -3764,6 +3764,12 @@
fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2";
}];
};
deemp = {
email = "deempleton@gmail.com";
github = "deemp";
githubId = 48378098;
name = "Danila Danko";
};
deepfire = {
email = "_deepfire@feelingofgreen.ru";
github = "deepfire";
@ -10427,6 +10433,12 @@
github = "michaelBelsanti";
githubId = 62124625;
};
michaelCTS = {
email = "michael.vogel@cts.co";
name = "Michael Vogel";
github = "michaelCTS";
githubId = 132582212;
};
michaelgrahamevans = {
email = "michaelgrahamevans@gmail.com";
name = "Michael Evans";

8
maintainers/team-list.nix
View File

@ -272,6 +272,14 @@ with lib.maintainers; {
enableFeatureFreezePing = true;
};
flutter = {
members = [ gilice mkg20001 RossComputerGuy FlafyDev hacker1024 ];
scope = "Maintain Flutter and Dart-related packages and build tools";
shortName = "flutter";
enableFeatureFreezePing = false;
githubTeams = [ "flutter" ];
};
freedesktop = {
members = [ jtojnar ];
scope = "Maintain Freedesktop.org packages for graphical desktop.";

18
nixos/modules/programs/nix-ld.nix
View File

@ -2,15 +2,14 @@
let
cfg = config.programs.nix-ld;
# TODO make glibc here configurable?
nix-ld-so = pkgs.runCommand "ld.so" {} ''
ln -s "$(cat '${pkgs.stdenv.cc}/nix-support/dynamic-linker')" $out
'';
nix-ld-libraries = pkgs.buildEnv {
name = "lb-library-path";
pathsToLink = [ "/lib" ];
paths = map lib.getLib cfg.libraries;
# TODO make glibc here configurable?
postBuild = ''
ln -s ${pkgs.stdenv.cc.bintools.dynamicLinker} $out/share/nix-ld/lib/ld.so
'';
extraPrefix = "/share/nix-ld";
ignoreCollisions = true;
};
@ -38,12 +37,7 @@ in
meta.maintainers = [ lib.maintainers.mic92 ];
options.programs.nix-ld = {
enable = lib.mkEnableOption (lib.mdDoc ''nix-ld, Documentation: <https://github.com/Mic92/nix-ld>'');
package = lib.mkOption {
type = lib.types.package;
description = lib.mdDoc "Which package to use for the nix-ld.";
default = pkgs.nix-ld;
defaultText = lib.literalExpression "pkgs.nix-ld";
};
package = lib.mkPackageOptionMD pkgs "nix-ld" { };
libraries = lib.mkOption {
type = lib.types.listOf lib.types.package;
description = lib.mdDoc "Libraries that automatically become available to all programs. The default set includes common libraries.";
@ -60,7 +54,7 @@ in
environment.pathsToLink = [ "/share/nix-ld" ];
environment.variables = {
NIX_LD = toString nix-ld-so;
NIX_LD = "/run/current-system/sw/share/nix-ld/lib/ld.so";
NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib";
};
};

37
nixos/modules/services/web-apps/lemmy.nix
View File

@ -16,7 +16,13 @@ in
enable = mkEnableOption (lib.mdDoc "lemmy a federated alternative to reddit in rust");
server = {
package = mkPackageOptionMD pkgs "lemmy-server" {};
};
ui = {
package = mkPackageOptionMD pkgs "lemmy-ui" {};
port = mkOption {
type = types.port;
default = 1234;
@ -27,7 +33,15 @@ in
caddy.enable = mkEnableOption (lib.mdDoc "exposing lemmy with the caddy reverse proxy");
nginx.enable = mkEnableOption (lib.mdDoc "exposing lemmy with the nginx reverse proxy");
database.createLocally = mkEnableOption (lib.mdDoc "creation of database on the instance");
database = {
createLocally = mkEnableOption (lib.mdDoc "creation of database on the instance");
uri = mkOption {
type = with types; nullOr str;
default = null;
description = lib.mdDoc "The connection URI to use. Takes priority over the configuration file if set.";
};
};
settings = mkOption {
default = { };
@ -49,7 +63,7 @@ in
};
options.federation = {
enabled = mkEnableOption (lib.mdDoc "activitypub federation");
enabled = (mkEnableOption (lib.mdDoc "activitypub federation")) // { visible = false; };
};
options.captcha = {
@ -71,6 +85,10 @@ in
config =
lib.mkIf cfg.enable {
warnings = lib.optional (cfg.settings.federation.enabled) ''
This option was removed in 0.17.0 and no longer has any effect.
'';
services.lemmy.settings = (mapAttrs (name: mkDefault)
{
bind = "127.0.0.1";
@ -112,7 +130,7 @@ in
virtualHosts."${cfg.settings.hostname}" = {
extraConfig = ''
handle_path /static/* {
root * ${pkgs.lemmy-ui}/dist
root * ${cfg.ui.package}/dist
file_server
}
@for_backend {
@ -185,10 +203,8 @@ in
description = "Lemmy server";
environment = {
LEMMY_CONFIG_LOCATION = "/run/lemmy/config.hjson";
# Verify how this is used, and don't put the password in the nix store
LEMMY_DATABASE_URL = with cfg.settings.database;"postgres:///${database}?host=${host}";
LEMMY_CONFIG_LOCATION = "${settingsFormat.generate "config.hjson" cfg.settings}";
LEMMY_DATABASE_URL = mkIf (cfg.database.uri != null) cfg.database.uri;
};
documentation = [
@ -205,8 +221,7 @@ in
serviceConfig = {
DynamicUser = true;
RuntimeDirectory = "lemmy";
ExecStartPre = "${pkgs.coreutils}/bin/install -m 600 ${settingsFormat.generate "config.hjson" cfg.settings} /run/lemmy/config.hjson";
ExecStart = "${pkgs.lemmy-server}/bin/lemmy_server";
ExecStart = "${cfg.server.package}/bin/lemmy_server";
};
};
@ -233,8 +248,8 @@ in
serviceConfig = {
DynamicUser = true;
WorkingDirectory = "${pkgs.lemmy-ui}";
ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.lemmy-ui}/dist/js/server.js";
WorkingDirectory = "${cfg.ui.package}";
ExecStart = "${pkgs.nodejs}/bin/node ${cfg.ui.package}/dist/js/server.js";
};
};
};

3
nixos/tests/nix-ld.nix
View File

@ -13,5 +13,8 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
testScript = ''
start_all()
machine.succeed("hello")
# test fallback if NIX_LD is not set
machine.succeed("unset NIX_LD; unset NIX_LD_LIBRARY_PATH; hello")
'';
})

8
pkgs/applications/audio/faust/faust2sc.nix
View File

@ -22,17 +22,11 @@ stdenv.mkDerivation (faustDefaults // {
'';
postFixup = ''
# export parts of the build environment
mkdir "$out"/include
# until pr #887 is merged and released in faust we need to link the header folders
ln -s "${supercollider}"/include/SuperCollider/plugin_interface "$out"/include/plugin_interface
ln -s "${supercollider}"/include/SuperCollider/common "$out"/include/common
ln -s "${supercollider}"/include/SuperCollider/server "$out"/include/server
wrapProgram "$out"/bin/${baseName} \
--append-flags "--import-dir ${faust}/share/faust" \
--append-flags "--architecture-dir ${faust}/share/faust" \
--append-flags "--architecture-dir ${faust}/include" \
--append-flags "-p $out" \
--append-flags "-p ${supercollider}" \
--prefix PATH : "$PATH"
'';
})

1
pkgs/applications/file-managers/browsr/default.nix
View File

@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication rec {
};
pythonRelaxDeps = [
"art"
"fsspec"
"pymupdf"
"rich-click"

14
pkgs/applications/office/zim/default.nix
View File

@ -27,6 +27,20 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
postInstall = ''
(
cd icons
for img in *.{png,svg}; do
size=''${img#zim}
size=''${size%.png}
size=''${size%.svg}
dimensions="''${size}x''${size}"
mkdir -p $out/share/icons/hicolor/$dimensions/apps
cp $img $out/share/icons/hicolor/$dimensions/apps/${pname}.png
done
)
'';
# RuntimeError: could not create GtkClipboard object
doCheck = false;

3
pkgs/development/coq-modules/reglang/default.nix
View File

@ -5,11 +5,12 @@ mkCoqDerivation {
releaseRev = v: "v${v}";
release."1.1.3".sha256 = "sha256-kaselYm8K0JBsTlcI6K24m8qpv8CZ9+VNDJrOtFaExg=";
release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk=";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.10" "8.16"; out = "1.1.2"; }
{ case = range "8.10" "8.17"; out = "1.1.3"; }
] null;

4
pkgs/development/interpreters/clojure/babashka.nix
View File

@ -7,11 +7,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
version = "1.3.180";
version = "1.3.181";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-moNFb5jHTK2XJHx9BAeD+BUH4Y6NyypDM0MycqE5Zwk=";
sha256 = "sha256-NzchlHRxOCSyUf9U0Jv8h4bgKd2Jwp+LmxIfeV8+8+M=";
};
graalvmDrv = graalvmCEPackages.graalvm19-ce;

10
pkgs/development/libraries/hunspell/dictionaries.nix
View File

@ -914,4 +914,14 @@ rec {
# the README doesn't specify versions of licenses :/
license = with lib.licenses; [ gpl2Plus lgpl2Plus mpl10 asl20 cc-by-sa-25 ];
};
# Portugese
pt_BR = pt-br;
pt-br = mkDictFromLibreOffice {
shortName = "pt-br";
dictFileName = "pt_BR";
shortDescription = "Brazillian Portugese (Brazil)";
readmeFile = "README_pt_BR.txt";
license = with lib.licenses; [ lgpl3 ];
};
}

6
pkgs/development/libraries/libvgm/default.nix
View File

@ -42,13 +42,13 @@ let
in
stdenv.mkDerivation rec {
pname = "libvgm";
version = "unstable-2023-04-22";
version = "unstable-2023-05-17";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "libvgm";
rev = "669a7566a356393d4e5b1030a9f9cdd3486bb41b";
sha256 = "U/PO/YtS8bOb2yKk57UQKH4eRNysYC/hrmUR5YZyYlw=";
rev = "5ad95d6fb40261cebab3d142b5f0191ed4e3a7cd";
sha256 = "R1PCinxUUoCpBWYXpbPCVNrl299ETIDovRbnAPFXMHM=";
};
outputs = [

2
pkgs/development/libraries/oneDNN/default.nix
View File

@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ alexarice bhipple ];
maintainers = with maintainers; [ bhipple ];
};
}

1
pkgs/development/nim-packages/asciigraph/default.nix
View File

@ -11,7 +11,6 @@ buildNimPackage rec {
hash = "sha256-JMBAW8hkE2wuXkRt4aHqFPoz1HX1J4SslvcaQXfpDNk";
};
doCheck = true;
meta = with lib;
src.meta // {

1
pkgs/development/nim-packages/base32/default.nix
View File

@ -9,7 +9,6 @@ buildNimPackage rec {
rev = version;
hash = "sha256-BsDly13xsY2bu4N9LGHB0OGej/JhAx3B01TDdF0M8Jk=";
};
doCheck = true;
meta = src.meta // {
description = "Base32 library for Nim";
maintainers = with lib.maintainers; [ ehmry ];

1
pkgs/development/nim-packages/base45/default.nix
View File

@ -9,7 +9,6 @@ buildNimPackage rec {
rev = version;
hash = "sha256-9he+14yYVGt2s1IuRLPRsv23xnJzERkWRvIHr3PxFYk=";
};
doCheck = true;
meta = src.meta // {
description = "Base45 library for Nim";
license = lib.licenses.unlicense;

3
pkgs/development/nim-packages/build-nim-package/default.nix
View File

@ -5,6 +5,7 @@ let
baseAttrs = {
strictDeps = true;
enableParallelBuilding = true;
doCheck = true;
configurePhase = ''
runHook preConfigure
export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
@ -30,7 +31,7 @@ let
};
inputsOverride =
{ depsBuildBuild ? [ ], nativeBuildInputs ? [ ], meta, ... }: {
{ depsBuildBuild ? [ ], nativeBuildInputs ? [ ], ... }: {
depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
};

1
pkgs/development/nim-packages/bumpy/default.nix
View File

@ -13,7 +13,6 @@ buildNimPackage rec {
propagatedBuildInputs = [ vmath ];
doCheck = true;
meta = with lib;
src.meta // {

1
pkgs/development/nim-packages/cbor/default.nix
View File

@ -9,7 +9,6 @@ buildNimPackage rec {
rev = version;
hash = "sha256-VmSYWgXDJLB2D2m3/ymrEytT2iW5JE56WmDz2MPHAqQ=";
};
doCheck = true;
meta = with lib;
src.meta // {
description =

1
pkgs/development/nim-packages/flatty/default.nix
View File

@ -11,7 +11,6 @@ buildNimPackage rec {
hash = "sha256-ZmhjehmEJHm5qNlsGQvyYLajUdwhWt1+AtRppRrNtgA=";
};
doCheck = true;
meta = with lib;
src.meta // {

2
pkgs/development/nim-packages/freedesktop_org/default.nix
View File

@ -11,7 +11,6 @@ let
rev = "695f1285d63f1954c25eb1f42798d90fa7bcbe14";
hash = "sha256-Z2Qr14pv2RHzQNfEYIKuXKHfHvvIfaEiGCHHCWJZFyw=";
};
doCheck = true;
};
in buildNimPackage rec {
pname = "freedesktop_org";
@ -23,7 +22,6 @@ in buildNimPackage rec {
hash = "sha256-gEN8kiWYCfC9H7o4UE8Xza5s7OwU3TFno6XnIlEm9Dg=";
};
propagatedBuildInputs = [ configparser ];
doCheck = true;
meta = src.meta // {
description = "Some Nim procedures for looking up freedesktop.org data";
license = lib.licenses.unlicense;

1
pkgs/development/nim-packages/getdns/default.nix
View File

@ -13,7 +13,6 @@ buildNimPackage rec {
propagatedNativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ getdns ];
doCheck = true;
checkPhase = "nim c tests/test_example_synchronous";
# The test requires network but check if it builds.

1
pkgs/development/nim-packages/hts-nim/default.nix
View File

@ -10,4 +10,5 @@ buildNimPackage rec {
sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7";
};
propagatedBuildInputs = [ htslib ];
doCheck = false;
}

5
pkgs/development/nim-packages/illwillwidgets/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildNimPackage, fetchFromGitHub }:
{ lib, buildNimPackage, fetchFromGitHub, illwill }:
buildNimPackage rec {
pname = "illwillwidgets";
@ -11,6 +11,9 @@ buildNimPackage rec {
hash = "sha256-YVNdgs8jquJ58qbcyNMMJt+hJYcvahYpkSrDBbO4ILU=";
};
propagatedBuildInputs = [ illwill ];
doCheck = false;
meta = with lib;
src.meta // {
description = "Mouse enabled widgets for illwill";

1
pkgs/development/nim-packages/jsony/default.nix
View File

@ -11,7 +11,6 @@ buildNimPackage rec {
sha256 = "1p250wb97nzz2g0vvq6mn521fx7sn1jpk1ralbzqh5q8clh4g7wr";
};
doCheck = true;
meta = with lib;
src.meta // {

1
pkgs/development/nim-packages/nimSHA2/default.nix
View File

@ -9,7 +9,6 @@ buildNimPackage rec {
rev = "b8f666069dff1ed0c5142dd1ca692f0e71434716";
hash = "sha256-Wqb3mQ7638UOTze71mf6WMyGiw9qTwhbJiGGb+9OR2k=";
};
doCheck = true;
meta = src.meta // {
description = "Secure Hash Algorithm 2";
maintainers = with lib.maintainers; [ ehmry ];

6
pkgs/development/nim-packages/nimraylib-now/default.nix
View File

@ -1,4 +1,4 @@
{ lib, nimPackages, fetchFromGitHub }:
{ lib, nimPackages, fetchFromGitHub, raylib }:
nimPackages.buildNimPackage rec {
pname = "nimraylib-now";
@ -11,6 +11,10 @@ nimPackages.buildNimPackage rec {
sha256 = "sha256-18YiAzJ46dpD5JN+gH0MWKchZ5YLPBNcm9eVFnyy2Sw=";
};
propagatedBuildInputs = [ raylib ];
doCheck = false; # no $DISPLAY available
meta = with lib; {
homepage = "https://github.com/greenfork/nimraylib_now";
description = "The Ultimate Raylib gaming library wrapper for Nim";

1
pkgs/development/nim-packages/npeg/default.nix
View File

@ -9,7 +9,6 @@ buildNimPackage rec {
rev = version;
hash = "sha256-kN91cp50ZL4INeRWqwrRK6CAkVXUq4rN4YlcN6WL/3Y=";
};
doCheck = true;
meta = src.meta // {
description = "NPeg is a pure Nim pattern matching library";
maintainers = with lib.maintainers; [ ehmry ];

1
pkgs/development/nim-packages/parsetoml/default.nix
View File

@ -11,7 +11,6 @@ buildNimPackage rec {
hash = "sha256-jtqn59x2ZRRgrPir6u/frsDHnl4kvTJWpbejxti8aHY=";
};
doCheck = true;
meta = with lib;
src.meta // {

1
pkgs/development/nim-packages/pixie/default.nix
View File

@ -14,7 +14,6 @@ buildNimPackage rec {
propagatedBuildInputs = [ bumpy chroma flatty nimsimd vmath zippy ];
doCheck = true;
meta = with lib;
src.meta // {

1
pkgs/development/nim-packages/safeset/default.nix
View File

@ -11,7 +11,6 @@ buildNimPackage rec {
hash = "sha256-ZLdStoNVoQhRkD2iEzKxhs1UPfgnbJM9QCDHdjH7vTU=";
};
doCheck = true;
meta = with lib;
src.meta // {

1
pkgs/development/nim-packages/sdl2/default.nix
View File

@ -8,7 +8,6 @@ buildNimPackage (finalAttrs: {
hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
};
propagatedBuildInputs = [ SDL2 ];
doCheck = true;
meta = {
description = "Nim wrapper for SDL 2.x";
platforms = lib.platforms.linux; # Problems with Darwin.

7
pkgs/development/nim-packages/snappy/config.patch
View File

@ -1,7 +0,0 @@
diff --git a/tests/config.nims b/tests/config.nims
index 46348f1..fbe9f5e 100644
--- a/tests/config.nims
+++ b/tests/config.nims
@@ -1 +1,2 @@
switch("path", "..")
+switch("passL", "-lsnappy")

6
pkgs/development/nim-packages/snappy/default.nix
View File

@ -10,11 +10,7 @@ buildNimPackage rec {
hash = "sha256-18CFRuDK+E701MHrCixx22QSVmglTc0EJwrMCsKwayM=";
};
propagatedBuildInputs = [ snappy ];
patches = [ ./config.patch ];
preCheck = ''
mkdir $NIX_BUILD_TOP/nimcache/
mv -v tests/data $NIX_BUILD_TOP/nimcache/data
''; # test standards, please
doCheck = false;
meta = with lib;
src.meta // {
description = "Nim implementation of snappy compression algorithm";

1
pkgs/development/nim-packages/spry/default.nix
View File

@ -12,7 +12,6 @@ buildNimPackage rec {
};
buildInputs = [ rocksdb snappy spryvm stew tempfile ui ];
patches = [ ./nil.patch ./python.patch ];
doCheck = true;
meta = with lib;
src.meta // {
description =

1
pkgs/development/nim-packages/spryvm/default.nix
View File

@ -11,7 +11,6 @@ buildNimPackage rec {
};
propagatedBuildInputs = [ sqlite ];
patches = [ ./nil.patch ];
doCheck = true;
meta = with lib;
src.meta // {
description = "Spry virtual machine";

1
pkgs/development/nim-packages/syndicate/default.nix
View File

@ -11,7 +11,6 @@ buildNimPackage rec {
hash = "sha256-yTPbEsBcpEPXfmhykbWzWdnJ2ExEJxdii1L+mqx8VGQ=";
};
propagatedBuildInputs = [ nimSHA2 preserves ];
doCheck = true;
meta = src.meta // {
description = "Nim implementation of the Syndicated Actor model";
license = lib.licenses.unlicense;

1
pkgs/development/nim-packages/tkrzw/default.nix
View File

@ -11,7 +11,6 @@ buildNimPackage rec {
};
propagatedNativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ tkrzw ];
doCheck = true;
meta = with lib;
src.meta // {
description = "Nim wrappers over some of the Tkrzw C++ library";

1
pkgs/development/nim-packages/ui/default.nix
View File

@ -14,7 +14,6 @@ buildNimPackage rec {
postPatch = ''
echo {.passL: r\"$(pkg-config --libs libui)\".} >> ui/rawui.nim
'';
doCheck = true;
meta = with lib;
src.meta // {
description = "Nim bindings to libui";

2
pkgs/development/nim-packages/x11/default.nix
View File

@ -11,8 +11,6 @@ buildNimPackage rec {
hash = "sha256-2XRyXiBxAc9Zx/w0zRBHRZ240qww0FJvIvOKZ8YH50A=";
};
doCheck = true;
meta = with lib;
src.meta // {
description = "X11 library for nim";

2
pkgs/development/nim-packages/zippy/default.nix
View File

@ -13,8 +13,6 @@ buildNimPackage rec {
hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8=";
};
doCheck = true;
meta = with lib;
src.meta // {
description = "Pure Nim implementation of deflate, zlib, gzip and zip";

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

@ -9,13 +9,16 @@ buildDunePackage rec {
version = "5.1.0";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
sha256 = "sha256-mINgeBO7DSsWd84gYjQNUQFqbh8KBZ+S2bYI/iVWMAc=";
hash = "sha256-mINgeBO7DSsWd84gYjQNUQFqbh8KBZ+S2bYI/iVWMAc=";
};
postPatch = ''
substituteInPlace cohttp/src/dune --replace 'bytes base64' 'base64'
'';
buildInputs = [ jsonm ppx_sexp_conv ];
propagatedBuildInputs = [ base64 re stringext uri-sexp ];

4
pkgs/development/ocaml-modules/github/unix.nix
View File

@ -6,7 +6,9 @@ buildDunePackage {
pname = "github-unix";
inherit (github) version src;
duneVersion = "3";
postPatch = ''
substituteInPlace unix/dune --replace 'github bytes' 'github'
'';
propagatedBuildInputs = [
github

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

@ -5,14 +5,14 @@
buildPythonPackage rec {
pname = "art";
version = "5.9";
version = "6.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "sepandhaghighi";
repo = "art";
rev = "v${version}";
hash = "sha256-3fX0kYYyeJ9tHX8/+hlv5aRE6LujXW915N5Ov6Q+EW8=";
hash = "sha256-ZF7UvqJU7KxNccMXL7tsL/s5KYpgGeGqaEATHo4WyNI=";
};
pythonImportsCheck = [ "art" ];

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

@ -1,5 +1,4 @@
{ stdenv
, lib
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
@ -71,7 +70,6 @@ buildPythonPackage rec {
];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "Tool to compile, build and package AWS Lambda functions";
homepage = "https://github.com/awslabs/aws-lambda-builders";
changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/v${version}";

4
pkgs/development/python-modules/google-cloud-bigquery/default.nix
View File

@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "3.11.0";
version = "3.11.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-OhwbNWb58n6oOjaq9U64eURO5z70JFZ2QBigs7VW0Ps=";
hash = "sha256-z+EVi8WBgna6dllZ2oonr9zaoR+j+p7tCX1WOSl9/nQ=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-container/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.23.0";
version = "2.24.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-yVyd5kowbHbs64EY5oMIa1sYIs/qShqzVdjfZ1VifA4=";
hash = "sha256-pTs3sEieEQRWDiSUeQDgPzsbny8mblXlYzGj5EtuXCA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-securitycenter/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
version = "1.21.0";
version = "1.22.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-zk5yZYevzpWmTOAAJgdNx9lnoTxjaq5XFJ+2hDQOBuc=";
hash = "sha256-lRFWozkurWzP3v80VkvH9XrFobrqFsQ9J3jtUeKl1AE=";
};
propagatedBuildInputs = [

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

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "gudhi";
version = "3.4.1";
version = "3.8.0";
src = fetchFromGitHub {
owner = "GUDHI";
repo = "gudhi-devel";
rev = "tags/gudhi-release-${version}";
fetchSubmodules = true;
sha256 = "1m03qazzfraxn62l1cb11icjz4x8q2sg9c2k3syw5v0yv9ndgx1v";
sha256 = "sha256-f2ajy4muG9vuf4JarGWZmdk/LF9OYd2KLSaGyY6BQrY=";
};
patches = [ ./remove_explicit_PYTHONPATH.patch ];

261
pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch
View File

@ -1,173 +1,194 @@
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index 5c1402a..48a1250 100644
index 86a409b6..09544fb5 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -271,9 +271,6 @@ if(PYTHONINTERP_FOUND)
@@ -329,15 +329,6 @@ if(PYTHONINTERP_FOUND)
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/setup.py" "build_ext" "--inplace")
- add_custom_target(python ALL DEPENDS gudhi.so
- COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests")
-
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)")
# Documentation generation is available through sphinx - requires all modules
@@ -295,14 +292,14 @@ if(PYTHONINTERP_FOUND)
# sphinx target requires gudhi.so, because conf.py reads gudhi version from it
add_custom_target(sphinx
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${SPHINX_PATH} -b html ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/sphinx
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gudhi.so"
COMMENT "${GUDHI_SPHINX_MESSAGE}" VERBATIM)
add_test(NAME sphinx_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${SPHINX_PATH} -b doctest ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doctest)
# Set missing or not modules
@@ -346,13 +343,13 @@ if(PYTHONINTERP_FOUND)
# Bottleneck and Alpha
add_test(NAME alpha_rips_persistence_bottleneck_distance_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_rips_persistence_bottleneck_distance.py"
-f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -t 0.15 -d 3)
# Tangential
add_test(NAME tangential_complex_plain_homology_from_off_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/tangential_complex_plain_homology_from_off_file_example.py"
--no-diagram -i 2 -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off)
@@ -361,13 +358,13 @@ if(PYTHONINTERP_FOUND)
# Witness complex
add_test(NAME euclidean_strong_witness_complex_diagram_persistence_from_off_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py"
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2)
add_test(NAME euclidean_witness_complex_diagram_persistence_from_off_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py"
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2)
@@ -379,7 +376,7 @@ if(PYTHONINTERP_FOUND)
# Bottleneck
add_test(NAME bottleneck_basic_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/bottleneck_basic_example.py")
if (PYBIND11_FOUND)
@@ -392,26 +389,26 @@ if(PYTHONINTERP_FOUND)
file(COPY ${CMAKE_SOURCE_DIR}/data/points/COIL_database/lucky_cat_PCA1 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
add_test(NAME cover_complex_nerve_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/nerve_of_a_covering.py"
-f human.off -c 2 -r 10 -g 0.3)
add_test(NAME cover_complex_coordinate_gic_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/coordinate_graph_induced_complex.py"
-f human.off -c 0 -v)
add_test(NAME cover_complex_functional_gic_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/functional_graph_induced_complex.py"
-o lucky_cat.off
-f lucky_cat_PCA1 -v)
add_test(NAME cover_complex_voronoi_gic_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/voronoi_graph_induced_complex.py"
-f human.off -n 700 -v)
@@ -422,11 +419,11 @@ if(PYTHONINTERP_FOUND)
# Alpha
add_test(NAME alpha_complex_from_points_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_points_example.py")
add_test(NAME alpha_complex_diagram_persistence_from_off_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_diagram_persistence_from_off_file_example.py"
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 0.6)
add_gudhi_py_test(test_alpha_complex)
@@ -441,13 +438,13 @@ if(PYTHONINTERP_FOUND)
- # Path separator management for windows
- if (WIN32)
- set(GUDHI_PYTHON_PATH_ENV "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR};$ENV{PYTHONPATH}")
- else(WIN32)
- set(GUDHI_PYTHON_PATH_ENV "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:$ENV{PYTHONPATH}")
- endif(WIN32)
# Documentation generation is available through sphinx - requires all modules
# Make it first as sphinx test is by far the longest test which is nice when testing in parallel
if(SPHINX_PATH)
@@ -358,13 +349,13 @@ if(PYTHONINTERP_FOUND)
# sphinx target requires gudhi.so, because conf.py reads gudhi version from it
add_custom_target(sphinx
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${SPHINX_PATH} -b html ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/sphinx
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gudhi.so"
COMMENT "${GUDHI_SPHINX_MESSAGE}" VERBATIM)
add_test(NAME sphinx_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${SPHINX_PATH} -b doctest ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doctest)
# Set missing or not modules
set(GUDHI_MODULES ${GUDHI_MODULES} "python-documentation" CACHE INTERNAL "GUDHI_MODULES")
@@ -408,13 +399,13 @@ if(PYTHONINTERP_FOUND)
# Cubical
add_test(NAME periodic_cubical_complex_barcode_persistence_from_perseus_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py"
--no-barcode -f ${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt)
add_test(NAME random_cubical_complex_persistence_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/random_cubical_complex_persistence_example.py"
10 10 10)
@@ -456,19 +453,19 @@ if(PYTHONINTERP_FOUND)
@@ -426,7 +417,7 @@ if(PYTHONINTERP_FOUND)
add_test(NAME cubical_complex_sklearn_itf_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/cubical_complex_sklearn_itf.py")
endif()
@@ -435,7 +426,7 @@ if(PYTHONINTERP_FOUND)
# Bottleneck and Alpha
add_test(NAME alpha_rips_persistence_bottleneck_distance_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_rips_persistence_bottleneck_distance.py"
-f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -t 0.15 -d 3)
endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 5.1.0)
@@ -443,7 +434,7 @@ if(PYTHONINTERP_FOUND)
# Tangential
add_test(NAME tangential_complex_plain_homology_from_off_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/tangential_complex_plain_homology_from_off_file_example.py"
--no-diagram -i 2 -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off)
@@ -452,13 +443,13 @@ if(PYTHONINTERP_FOUND)
# Witness complex
add_test(NAME euclidean_strong_witness_complex_diagram_persistence_from_off_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py"
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2)
add_test(NAME euclidean_witness_complex_diagram_persistence_from_off_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py"
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2)
@@ -467,7 +458,7 @@ if(PYTHONINTERP_FOUND)
# Bottleneck
add_test(NAME bottleneck_basic_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/bottleneck_basic_example.py")
add_gudhi_py_test(test_bottleneck_distance)
@@ -479,26 +470,26 @@ if(PYTHONINTERP_FOUND)
file(COPY ${CMAKE_SOURCE_DIR}/data/points/COIL_database/lucky_cat_PCA1 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
add_test(NAME cover_complex_nerve_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/nerve_of_a_covering.py"
-f human.off -c 2 -r 10 -g 0.3)
add_test(NAME cover_complex_coordinate_gic_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/coordinate_graph_induced_complex.py"
-f human.off -c 0 -v)
add_test(NAME cover_complex_functional_gic_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/functional_graph_induced_complex.py"
-o lucky_cat.off
-f lucky_cat_PCA1 -v)
add_test(NAME cover_complex_voronoi_gic_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/voronoi_graph_induced_complex.py"
-f human.off -n 700 -v)
@@ -506,15 +497,15 @@ if(PYTHONINTERP_FOUND)
# Alpha
add_test(NAME alpha_complex_from_points_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_points_example.py")
add_test(NAME alpha_complex_from_generated_points_on_sphere_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_generated_points_on_sphere_example.py")
add_test(NAME alpha_complex_diagram_persistence_from_off_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_diagram_persistence_from_off_file_example.py"
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off)
add_gudhi_py_test(test_alpha_complex)
@@ -532,19 +523,19 @@ if(PYTHONINTERP_FOUND)
# Rips
add_test(NAME rips_complex_diagram_persistence_from_distance_matrix_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py"
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/distance_matrix/lower_triangular_distance_matrix.csv -e 12.0 -d 3)
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/distance_matrix/lower_triangular_distance_matrix.csv -s , -e 12.0 -d 3)
add_test(NAME rips_complex_diagram_persistence_from_off_file_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_off_file_example.py
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -e 0.25 -d 3)
add_test(NAME rips_complex_from_points_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_from_points_example.py)
add_gudhi_py_test(test_rips_complex)
@@ -476,7 +473,7 @@ if(PYTHONINTERP_FOUND)
@@ -552,7 +543,7 @@ if(PYTHONINTERP_FOUND)
# Simplex tree
add_test(NAME simplex_tree_example_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/simplex_tree_example.py)
add_gudhi_py_test(test_simplex_tree)
@@ -485,7 +482,7 @@ if(PYTHONINTERP_FOUND)
@@ -565,7 +556,7 @@ if(PYTHONINTERP_FOUND)
# Witness
add_test(NAME witness_complex_from_nearest_landmark_table_py_test
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
+ COMMAND ${CMAKE_COMMAND} -E env
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/witness_complex_from_nearest_landmark_table.py)

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

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "hcloud";
version = "1.19.0";
version = "1.20.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-IKgK8UQYVPV8zm0wqmVyFDeRv0h9+1iwJ3Ih6yrXIOM=";
hash = "sha256-s4l3DZdKfyC1Eu3PwLQHQpdcIw4yvEURxRjgxJlaXsg=";
};
propagatedBuildInputs = [

15
pkgs/development/python-modules/httpx-socks/default.nix
View File

@ -12,16 +12,19 @@
, pytestCheckHook
, python-socks
, pythonOlder
, setuptools
, sniffio
, starlette
, tiny-proxy
, trio
, trustme
, yarl
}:
buildPythonPackage rec {
pname = "httpx-socks";
version = "0.7.5";
format = "setuptools";
version = "0.7.6";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -29,9 +32,13 @@ buildPythonPackage rec {
owner = "romis2012";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-HwLJ2pScgiNmM/l14aKp47MMuGW1qSaIq7ujpCSRtqA=";
hash = "sha256-rLcYC8IO2eCWAL4QIiUg/kyigybq6VNTUjNDXx4KPHc=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
httpx
httpcore
@ -54,6 +61,8 @@ buildPythonPackage rec {
pytest-trio
pytestCheckHook
starlette
tiny-proxy
trustme
yarl
];

4
pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "ibm-cloud-sdk-core";
version = "3.16.6";
version = "3.16.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-lFpaMteVj8TBpcK1zLV95TwG3zY3PZG7QUzY0/LSF/c=";
hash = "sha256-qYXxR+jXjMfqrxJ62j5do33EbjfeoYSq+IeMrO14FnQ=";
};
propagatedBuildInputs = [

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

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "logical-unification";
version = "0.4.5";
version = "0.4.6";
src = fetchFromGitHub {
owner = "pythological";
repo = "unification";
rev = "707cf4a39e27a4a8bf06b7e7dce7223085574e65";
hash = "sha256-3wqO0pWWFRQeoGNvbSDdLNYFyjNnv+O++F7+vTBUJoI=";
rev = "refs/tags/v${version}";
hash = "sha256-uznmlkREFONU1YoI/+mcfb+Yg30NinWvsMxTfHCXzOU=";
};
propagatedBuildInputs = [

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.100.0";
version = "2.104.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-hzuuYRf9D0nWSyAPC66umDD2fKYZ+khHd6281UW6u9M=";
hash = "sha256-JOsyu0zIzItK4+Rq8vnqhRO9YucxLLKtMTK+0EJbxSo=";
};
pythonRelaxDeps = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pycm";
version = "3.8";
version = "4.0";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "sepandhaghighi";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-L0WPZomOU/I/x8QrdAerG0S2wnHyP661XTaDzzWeruk=";
hash = "sha256-GyH06G7bArFBTzV/Sx/KmoJvcoed0sswW7qGqsSULHo=";
};
propagatedBuildInputs = [

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pymupdf";
version = "1.21.1";
version = "1.22.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyMuPDF";
inherit version;
hash = "sha256-+BV0GkNcYqADa7y/X6bFM1Z71pxTONQTcU/FeyLbk+A=";
hash = "sha256-Xs2SjpbmMJJXECCXOqFFtXt1cH86Pfl8dC5WMRJhWJE=";
};
postPatch = ''

45
pkgs/development/python-modules/tiny-proxy/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib
, anyio
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "tiny-proxy";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "romis2012";
repo = "tiny-proxy";
rev = "refs/tags/v${version}";
hash = "sha256-emQRiG2QiuZt4/lI8shJOvMpaqXNyJ/PMvtDZPaoyLo=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
anyio
];
# The tests depend on httpx-socks, whose tests depend on tiny-proxy.
doCheck = false;
pythonImportsCheck = [
"tiny_proxy"
];
meta = with lib; {
description = "SOCKS5/SOCKS4/HTTP proxy server";
homepage = "https://github.com/romis2012/tiny-proxy";
changelog = "https://github.com/romis2012/tiny-proxy/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ tjni ];
};
}

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

@ -20,7 +20,7 @@ let
in
buildPythonPackage rec {
pname = "yaramod";
version = "3.19.1";
version = "3.20.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ in
owner = "avast";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-HYagARlppQpM43ND/CkLL0iHmOmhl/wBDGVlJyOc9dU=";
hash = "sha256-b4jHveGQGwO1BjpS/WJrMMBGB0LVB6Q7oltq4azp+7o=";
};
postPatch = ''

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

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "z3c-checkversions";
version = "2.0";
version = "2.1";
src = fetchPypi {
inherit version;
pname = "z3c.checkversions";
hash = "sha256-rn4kl8Pn6YNqbE+VD6L8rVBQHkQqXSD47ZIy77+ashE=";
hash = "sha256-j5So40SyJf7XfCz3P9YFR/6z94up3LY2/dfEmmIbxAk=";
};
propagatedBuildInputs = [ zc-buildout ];

2
pkgs/development/tools/database/surrealdb-migrations/Cargo.lock generated
View File

@ -2268,7 +2268,7 @@ dependencies = [
[[package]]
name = "surrealdb-migrations"
version = "0.9.9"
version = "0.9.10"
dependencies = [
"anyhow",
"assert_cmd",

4
pkgs/development/tools/database/surrealdb-migrations/default.nix
View File

@ -10,7 +10,7 @@
let
pname = "surrealdb-migrations";
version = "0.9.9";
version = "0.9.10";
in
rustPlatform.buildRustPackage rec {
inherit pname version;
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
owner = "Odonno";
repo = pname;
rev = "v${version}";
hash = "sha256-wVaNsdNrRhb6lai60c1msBWTtLWsESOJNoHFJzdHtrs=";
hash = "sha256-LtaAKcCqsm9o7XKEqHgyCE7cpzJEzDUJje8zBKQAKv8=";
};
cargoLock = {

56
pkgs/development/tools/electron/binary/default.nix
View File

@ -151,39 +151,39 @@ rec {
headers = "0zvwd3gz5y3yq5jgkswnarv75j05lfaz58w37fidq5aib1hi50hn";
};
electron_22-bin = mkElectron "22.3.12" {
armv7l-linux = "aee831671cb7f869366ed165900743e6e8a53845e9a059a68ef81bb725c93dca";
aarch64-linux = "35d8ba41d2247a26923e93d7b96425b39ac821fd24d31c286718a1e5b64a7156";
x86_64-linux = "616bc674bf7cbdd6369888b987514c7a63442755561e1f5e6d85575e881d107e";
x86_64-darwin = "e421bc52de410b45b68bae2f13c405ef0ef43f8aa2046419a0f15e38d04f214a";
aarch64-darwin = "f2d4b327df42f9801e09260b94adaeed878e02b7e4a9adfd5912b754181ead3c";
headers = "1k5a8sg8g5jzv9vih4n81wwlvi14snzxgvrh13w5canihj6hiygi";
electron_22-bin = mkElectron "22.3.13" {
armv7l-linux = "d396a7722f63163e63b9f660328a1c1e992284e5fd9dd5f6d0dca572eb34528a";
aarch64-linux = "1f85d242d2d6d151c604f516eff984da57797cd5d2708bbc07d88a4258bfb1f1";
x86_64-linux = "c568012570aa4e1ead7f28f63e698c268356c45c878561c1ade727b612bffbda";
x86_64-darwin = "b62b718824d686ae9deb400dc74cc86fde0710735af26d449bf720ec89b13e7f";
aarch64-darwin = "edd48266e3726284e374b83c0db39ff18e9ef0b7176b2b22d816fdf37ba7d07a";
headers = "0f324hs9y2g6pi7rpzv49wi7sd0bqsq5h1nvlkc44lz4sha57y49";
};
electron_23-bin = mkElectron "23.3.5" {
armv7l-linux = "3525ab12e582c36b7e905550a13a4f8c205586eccbd818db7f705ee46be19939";
aarch64-linux = "49e9ff90165d12accd34e8fc6808016e20f7588fba2195af39f4467698adbcf0";
x86_64-linux = "168c9332448276c7f0338bffd02a90d6bdea90c4789ae655464831f74d3e6e43";
x86_64-darwin = "453ddddbe0a935b5349410d783f3dba079b4e913bfbd6b56a9c4927c4c3f1601";
aarch64-darwin = "a41bd320d73143f0469e6d250e65f2f629bef2c36f1e6730110b86436842d2d1";
headers = "11w1vz5kyklahhn7046bccknym24f076b5p19mxjwmmdbvggmvsq";
electron_23-bin = mkElectron "23.3.7" {
armv7l-linux = "ecb4bec19b851147fc2fd23bf21c92f1171eaa839cb019209ee674eaa6e9baaa";
aarch64-linux = "d0aea397158a1e302ebf502977747777a06aa2a8b59d2dd1b176bc5d92c8f552";
x86_64-linux = "0388e0ac0f76ec744139111e7a2557535dd214ad1195410dc3e08022f878def8";
x86_64-darwin = "57cafe9854fc5fe1dc7f8faecdbc43b5e532a98c6a6ace78a839b8b02401aa00";
aarch64-darwin = "a544c0ff364389453d7c3f36d9fc3f9aa6e81e88902849932d038183ef359cb4";
headers = "0xki8xxgqp6i1vdy521m423b5hk9x1rskwygmxjql2cz6680lcd7";
};
electron_24-bin = mkElectron "24.4.1" {
armv7l-linux = "4c0d12186e1fe918b0e5a618fc10eabb2b120b432ea5ff45e29c41a163f338f4";
aarch64-linux = "e9e9ac6b24e6dd79650be3619a98187fb9d07cc97bb181051912bead7c06cefe";
x86_64-linux = "4751d5320e0a2668e5b964dccf433fc7e537a3cb7f215d3042fd7d61d7f1198e";
x86_64-darwin = "a8417febf79db15f15edf209a03dcf4240ed0d7b7e731b31224173b685a768c2";
aarch64-darwin = "f2efec7bfe62002e1b52b0e14fa7bc5fd586812c0c49fbb0aa99830c20088484";
headers = "13zicpwzsnl34nvy0y15ykfabkda4991h6kc933r9n4fz4wk7493";
electron_24-bin = mkElectron "24.5.1" {
armv7l-linux = "828fbffd9f81f341c70723076b921b757340ff8de76f5d2c797e97331e3d7668";
aarch64-linux = "9912b209d78affdf7fb8a0edc5fc07156a29322cbf66d774e738ae0191cf7141";
x86_64-linux = "0c3b805f180db1aa8e58b5049dda6519cac9a945baad0ddce9d531cc34380a58";
x86_64-darwin = "33e3b085e4da1b1149d82db9813fa6bd3ebccc067e9b308f055aa7802bac79b8";
aarch64-darwin = "0d5940af75b2ba388a7d514d34e40b433d1fe1bc85e7368af54b379ec78123d4";
headers = "1fxfnpjxrpznsrr5d39qvzd4l3kqfspg362ppvqz57b0irwjwabd";
};
electron_25-bin = mkElectron "25.0.1" {
armv7l-linux = "1bfdb7e6d85880dd1695d8fab69558e69728fb4f23756375ba7f7bc4f441516a";
aarch64-linux = "0a8b44cc2c280a31f7a7e3c9927e55e4ea8ad3841a8cd4fe70237771e6c71023";
x86_64-linux = "c7c85dd575b7d1eccba8d338c91f524663514eb43c2fb936035c219bd84ab885";
x86_64-darwin = "f4a51adf95b37bfe39320ab7f8025b148a6b6b7140bd96101788a62b77c13d8c";
aarch64-darwin = "6a26d58eb5b37ce9852668e59330ca54bf6226e8bb1172e179bb9ddb592e4b8c";
headers = "0par0jw88j5n0jpg0lik6gws7iwqq45jcfs42w7vxz2g2nkpdgxp";
electron_25-bin = mkElectron "25.1.1" {
armv7l-linux = "cc06e944811f06c1c9bb98cd8aab160b07e049ac1907e8cdf150fd2bce8170aa";
aarch64-linux = "9ad6e6abf8eee76da799d91989dc5d031530318673c28488fc3776af829ca024";
x86_64-linux = "cba3ee86e2135297d3403f2972e5b311f4a97855076d736a2b048fbacad3f2c7";
x86_64-darwin = "4eab6abde714b3af3b8a230f80d092e927402e88de355dda6b53cc9817da2219";
aarch64-darwin = "19938d86aaa6ab2bb6a693cafb97227c23e945f37f04511248308da860fd5660";
headers = "0997llx6qlhql3x0xw9c3gdm7r60j92ys2jbzil9az6ld2snflr2";
};
}

27
pkgs/development/tools/misc/dart-sass/default.nix
View File

@ -1,21 +1,42 @@
{ lib
, fetchFromGitHub
, buildDartApplication
, buf
, protoc-gen-dart
}:
let
sass-language = fetchFromGitHub {
owner = "sass";
repo = "sass";
rev = "refs/tags/embedded-protocol-2.0.0";
hash = "sha256-3qk3XbI/DpNj4oa/3ar5hqEY8LNmQsokinuKt4xV7ck=";
};
in
buildDartApplication rec {
pname = "dart-sass";
version = "1.62.1";
version = "1.63.3";
src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
hash = "sha256-U6enz8yJcc4Wf8m54eYIAnVg/jsGi247Wy8lp1r1wg4=";
hash = "sha256-PBFBepG7b5M9LKSQOp7+mVhtwSLgQzUTu3i1055uNBk=";
};
pubspecLockFile = ./pubspec.lock;
vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s=";
vendorHash = "sha256-ciJUjkItnwzKH6k8a5zxIbARQAEfg/GJEsKfSaygsXU=";
nativeBuildInputs = [
buf
protoc-gen-dart
];
preConfigure = ''
mkdir -p build
ln -s ${sass-language} build/language
HOME="$TMPDIR" buf generate
'';
dartCompileFlags = [ "--define=version=${version}" ];

172
pkgs/development/tools/misc/dart-sass/pubspec.lock
View File

@ -5,18 +5,18 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8"
sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
url: "https://pub.dev"
source: hosted
version: "47.0.0"
version: "61.0.0"
analyzer:
dependency: "direct dev"
description:
name: analyzer
sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80"
sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
url: "https://pub.dev"
source: hosted
version: "4.7.0"
version: "5.13.0"
archive:
dependency: "direct dev"
description:
@ -29,10 +29,10 @@ packages:
dependency: "direct main"
description:
name: args
sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "2.4.2"
async:
dependency: "direct main"
description:
@ -61,10 +61,10 @@ packages:
dependency: transitive
description:
name: checked_yaml
sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
url: "https://pub.dev"
source: hosted
version: "2.0.2"
version: "2.0.3"
cli_pkg:
dependency: "direct dev"
description:
@ -85,18 +85,18 @@ packages:
dependency: transitive
description:
name: cli_util
sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7
url: "https://pub.dev"
source: hosted
version: "0.3.5"
version: "0.4.0"
collection:
dependency: "direct main"
description:
name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
url: "https://pub.dev"
source: hosted
version: "1.17.1"
version: "1.17.2"
convert:
dependency: transitive
description:
@ -117,42 +117,50 @@ packages:
dependency: "direct dev"
description:
name: crypto
sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
url: "https://pub.dev"
source: hosted
version: "3.0.2"
version: "3.0.3"
csslib:
dependency: transitive
description:
name: csslib
sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745
sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f"
url: "https://pub.dev"
source: hosted
version: "0.17.2"
version: "0.17.3"
dart_style:
dependency: "direct dev"
description:
name: dart_style
sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad
url: "https://pub.dev"
source: hosted
version: "2.2.4"
version: "2.3.1"
dartdoc:
dependency: "direct dev"
description:
name: dartdoc
sha256: f236297ea9d0908e1510cfabbf9cfc318c9834067c1bbddbea0ad9d670cd0b1a
sha256: d9bab893c9f42615f62bf2d3ff2b89d5905952d1d42cc7890003537249cb472e
url: "https://pub.dev"
source: hosted
version: "6.1.1"
version: "6.3.0"
file:
dependency: transitive
description:
name: file
sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
url: "https://pub.dev"
source: hosted
version: "6.1.4"
version: "7.0.0"
fixnum:
dependency: transitive
description:
name: fixnum
sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
frontend_server_client:
dependency: transitive
description:
@ -165,26 +173,26 @@ packages:
dependency: transitive
description:
name: glob
sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
grinder:
dependency: "direct dev"
description:
name: grinder
sha256: "1dabcd70f0d3975f9143d0cebf48a09cf56d4f5e0922f1d1931781e1047c8d00"
sha256: "48495acdb3df702c55c952c6536faf11631b8401a292eb0d182ef332fc568b56"
url: "https://pub.dev"
source: hosted
version: "0.9.3"
version: "0.9.4"
html:
dependency: transitive
description:
name: html
sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8"
url: "https://pub.dev"
source: hosted
version: "0.15.2"
version: "0.15.3"
http:
dependency: "direct main"
description:
@ -229,42 +237,42 @@ packages:
dependency: transitive
description:
name: json_annotation
sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
url: "https://pub.dev"
source: hosted
version: "4.8.0"
version: "4.8.1"
lints:
dependency: "direct dev"
description:
name: lints
sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "2.1.1"
logging:
dependency: transitive
description:
name: logging
sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.2.0"
markdown:
dependency: transitive
description:
name: markdown
sha256: c2b81e184067b41d0264d514f7cdaa2c02d38511e39d6521a1ccc238f6d7b3f2
sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e"
url: "https://pub.dev"
source: hosted
version: "6.0.1"
version: "7.1.0"
matcher:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16"
meta:
dependency: "direct main"
description:
@ -301,10 +309,10 @@ packages:
dependency: transitive
description:
name: oauth2
sha256: "1e8376c222651904caf7785fd2fa01b1e2be608c94bec842a94e116deca88f13"
sha256: c4013ef62be37744efdc0861878fd9e9285f34db1f9e331cc34100d7674feb42
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "2.0.2"
package_config:
dependency: "direct main"
description:
@ -338,13 +346,29 @@ packages:
source: hosted
version: "3.7.3"
pool:
dependency: transitive
dependency: "direct main"
description:
name: pool
sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
url: "https://pub.dev"
source: hosted
version: "1.5.1"
protobuf:
dependency: "direct main"
description:
name: protobuf
sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
protoc_plugin:
dependency: "direct dev"
description:
name: protoc_plugin
sha256: e2be5014ba145dc0f8de20ac425afa2a513aff64fe350d338e481d40de0573df
url: "https://pub.dev"
source: hosted
version: "20.0.1"
pub_api_client:
dependency: "direct dev"
description:
@ -357,10 +381,10 @@ packages:
dependency: "direct main"
description:
name: pub_semver
sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
url: "https://pub.dev"
source: hosted
version: "2.1.3"
version: "2.1.4"
pubspec:
dependency: transitive
description:
@ -373,10 +397,10 @@ packages:
dependency: "direct dev"
description:
name: pubspec_parse
sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c
sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
url: "https://pub.dev"
source: hosted
version: "1.2.2"
version: "1.2.3"
quiver:
dependency: transitive
description:
@ -389,42 +413,42 @@ packages:
dependency: transitive
description:
name: retry
sha256: a8a1e475a100a0bdc73f529ca8ea1e9c9c76bec8ad86a1f47780139a34ce7aea
sha256: "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc"
url: "https://pub.dev"
source: hosted
version: "3.1.1"
version: "3.1.2"
shelf:
dependency: transitive
description:
name: shelf
sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.4.1"
shelf_packages_handler:
dependency: transitive
description:
name: shelf_packages_handler
sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306
sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
version: "3.0.2"
shelf_static:
dependency: transitive
description:
name: shelf_static
sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c
sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.2"
shelf_web_socket:
dependency: transitive
description:
name: shelf_web_socket
sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
url: "https://pub.dev"
source: hosted
version: "1.0.3"
version: "1.0.4"
source_map_stack_trace:
dependency: transitive
description:
@ -458,7 +482,7 @@ packages:
source: hosted
version: "1.11.0"
stream_channel:
dependency: "direct dev"
dependency: "direct main"
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
@ -493,26 +517,26 @@ packages:
dependency: "direct dev"
description:
name: test
sha256: "4f92f103ef63b1bbac6f4bd1930624fca81b2574464482512c4f0896319be575"
sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46"
url: "https://pub.dev"
source: hosted
version: "1.24.2"
version: "1.24.3"
test_api:
dependency: transitive
description:
name: test_api
sha256: daadc9baabec998b062c9091525aa95786508b1c48e9c30f1f891b8bf6ff2e64
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.5.2"
version: "0.6.0"
test_core:
dependency: transitive
description:
name: test_core
sha256: "3642b184882f79e76ca57a9230fb971e494c3c1fd09c21ae3083ce891bcc0aa1"
sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e"
url: "https://pub.dev"
source: hosted
version: "0.5.2"
version: "0.5.3"
test_descriptor:
dependency: "direct dev"
description:
@ -525,10 +549,10 @@ packages:
dependency: "direct dev"
description:
name: test_process
sha256: b0e6702f58272d459d5b80b88696483f86eac230dab05ecf73d0662e305d005e
sha256: "217f19b538926e4922bdb2a01410100ec4e3beb4cc48eae5ae6b20037b07bbd6"
url: "https://pub.dev"
source: hosted
version: "2.0.3"
version: "2.1.0"
tuple:
dependency: "direct main"
description:
@ -538,13 +562,13 @@ packages:
source: hosted
version: "2.0.1"
typed_data:
dependency: transitive
dependency: "direct main"
description:
name: typed_data
sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.3.2"
uri:
dependency: transitive
description:
@ -557,18 +581,18 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "518254c0d3ee20667a1feef39eefe037df87439851e4b3cb277e5b3f37afa2f0"
sha256: f3743ca475e0c9ef71df4ba15eb2d7684eecd5c8ba20a462462e4e8b561b2e11
url: "https://pub.dev"
source: hosted
version: "11.4.0"
version: "11.6.0"
watcher:
dependency: "direct main"
description:
name: watcher
sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
url: "https://pub.dev"
source: hosted
version: "1.0.2"
version: "1.1.0"
web_socket_channel:
dependency: transitive
description:
@ -597,9 +621,9 @@ packages:
dependency: "direct dev"
description:
name: yaml
sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
url: "https://pub.dev"
source: hosted
version: "3.1.1"
version: "3.1.2"
sdks:
dart: ">=2.19.0 <3.0.0"
dart: ">=3.0.0 <4.0.0"

2
pkgs/development/tools/misc/nimlsp/default.nix
View File

@ -22,6 +22,8 @@ nimPackages.buildNimPackage rec {
nimDefines = [ "nimcore" "nimsuggest" "debugCommunication" "debugLogging" ];
doCheck = false;
meta = with lib; {
description = "Language Server Protocol implementation for Nim";
homepage = "https://github.com/PMunch/nimlsp";

22
pkgs/development/tools/refmt/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "refmt";
version = "1.6.1";
src = fetchFromGitHub {
owner = "rjeczalik";
repo = "refmt";
rev = "v${version}";
sha256 = "sha256-HiAWSR2S+3OcIgwdQ0ltW37lcG+OHkDRDUF07rfNcJY=";
};
vendorSha256 = "sha256-MiYUDEF9W0VAiOX6uE8doXtGAekIrA1cfA8A2a7xd2I=";
meta = with lib; {
description = "Reformat HCL <-> JSON <-> YAML";
homepage = "https://github.com/rjeczalik/refmt";
license = licenses.agpl3Only;
maintainers = with lib.maintainers; [ deemp ];
};
}

22
pkgs/development/tools/rust/tauri-mobile/default.nix
View File

@ -12,36 +12,36 @@
let
inherit (darwin.apple_sdk.frameworks) CoreServices;
pname = "tauri-mobile";
version = "unstable-2023-04-25";
version = "unstable-2023-06-06";
in
rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "tauri-apps";
repo = pname;
rev = "c2abaf54135bf65b1165a38d3b1d84e8d57f5d6c";
sha256 = "sha256-WHyiswe64tkNhhgmHquv9YPLQAU1yTJ/KglTqEPBcOM=";
rev = "43b2a3ba3a05b9ca3d3c9d8d7eafbeb4f24bf396";
hash = "sha256-fVQmhtUn2Lwtr/id/qWtgnHQdXkf0jAOg4apOgnLD4Y=";
};
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
# sourceRoot = "source/tooling/cli";
cargoHash = "sha256-Kc1BikwUYSpPShRtAPbHCdfVzo6zwjiO3QeqRkO+WhY=";
cargoHash = "sha256-MtLfcDJcLVhsIGD6pjpomuu9GYGqa7L8xnaQ++f+0H4=";
preBuild = ''
export HOME=$(mktemp -d)
mkdir -p $out/share/
# during the install process tauri-mobile puts templates and commit information in CARGO_HOME
export CARGO_HOME=$out/share/
'';
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
nativeBuildInputs = [ pkg-config git makeWrapper ];
preInstall = ''
mkdir -p $out/share/
# the directory created in the build process is .tauri-mobile, a hidden directory
shopt -s dotglob
for temp_dir in $HOME/*; do
cp -R $temp_dir $out/share
preFixup = ''
for bin in $out/bin/cargo-*; do
wrapProgram $bin \
--set CARGO_HOME "$out/share"
done
'';

4
pkgs/development/web/postman/darwin.nix
View File

@ -11,12 +11,12 @@ let
dist = {
aarch64-darwin = {
arch = "arm64";
sha256 = "sha256-dJM85/6JCNqSXtrglEjP11cypGkj8+zHPo0qNANyylU=";
sha256 = "sha256-zBjA+IekQONwZJ+2hQhJIBA+qu/rRYOtm6y1aBaxQrA=";
};
x86_64-darwin = {
arch = "64";
sha256 = "sha256-36T7S/F35hRCmXXYA8DWwwLsuJiUVU9UBY7eAXjzx1s=";
sha256 = "sha256-YBI8F/wABFBqfwIGSBr7UqD/zDGaESL9/v/DpCSy1m0=";
};
}.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");

2
pkgs/development/web/postman/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "postman";
version = "10.12.0";
version = "10.15.0";
meta = with lib; {
homepage = "https://www.getpostman.com";
description = "API Development Environment";

4
pkgs/development/web/postman/linux.nix
View File

@ -47,12 +47,12 @@ let
dist = {
aarch64-linux = {
arch = "arm64";
sha256 = "sha256-ciQ9LqtaOosUAtcZiwOQ+8gB5dTut8pXHAjUsoQEEB8=";
sha256 = "sha256-cBueTCZHZZGU3Z/UKLBIw4XCvCz9Hm4MxdIMY9+2ulk=";
};
x86_64-linux = {
arch = "64";
sha256 = "sha256-QaIj+SOQGR6teUIdLB3D5klRlYrna1MoE3c6UXYEoB4=";
sha256 = "sha256-svk60K4pZh0qRdx9+5OUTu0xgGXMhqvQTGTcmqBOMq8=";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

1
pkgs/os-specific/linux/hostapd/default.nix
View File

@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
CONFIG_IEEE80211R=y
CONFIG_IEEE80211N=y
CONFIG_IEEE80211AC=y
CONFIG_IEEE80211AX=y
CONFIG_FULL_DYNAMIC_VLAN=y
CONFIG_VLAN_NETLINK=y
CONFIG_TLS=openssl

4
pkgs/os-specific/linux/nix-ld/default.nix
View File

@ -12,13 +12,13 @@ let
in
stdenv.mkDerivation rec {
pname = "nix-ld";
version = "1.1.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "mic92";
repo = "nix-ld";
rev = version;
sha256 = "sha256-dM9YPN+yq6sHmRhJQinYdAVXBkTgEtrVQcsd/mIIX0o=";
sha256 = "sha256-NitUt9LBJMpAbbKC98aRPYMfxZFq3PHH6ieqM4MVO08=";
};
doCheck = true;

1
pkgs/os-specific/linux/wpa_supplicant/default.nix
View File

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
CONFIG_HS20=y
CONFIG_HT_OVERRIDES=y
CONFIG_IEEE80211AC=y
CONFIG_IEEE80211AX=y
CONFIG_IEEE80211N=y
CONFIG_IEEE80211R=y
CONFIG_IEEE80211W=y

4
pkgs/servers/matrix-synapse/tools/synadm.nix
View File

@ -6,12 +6,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "synadm";
version = "0.41.2";
version = "0.41.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-wSpgc1umBMLCc2ThfYSuNNnzqWXyEQM0XhTuOAQaiXg=";
hash = "sha256-gWEgLpSE77XdocAZqN1i/vR5dvYFsgsg5zs5Dj90V/o=";
};
propagatedBuildInputs = with python3.pkgs; [

182
pkgs/tools/audio/mpd-discord-rpc/Cargo.lock generated
View File

@ -15,9 +15,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
version = "0.7.20"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
@ -147,22 +147,23 @@ dependencies = [
[[package]]
name = "dirs"
version = "5.0.0"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
"option-ext",
"redox_users",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -623,7 +624,7 @@ dependencies = [
[[package]]
name = "mpd-discord-rpc"
version = "1.6.0"
version = "1.7.0"
dependencies = [
"dirs",
"discord-rpc-client",
@ -787,6 +788,12 @@ dependencies = [
"vcpkg",
]
[[package]]
name = "option-ext"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "overload"
version = "0.1.1"
@ -1017,9 +1024,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.7.2"
version = "1.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c"
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
dependencies = [
"aho-corasick",
"memchr",
@ -1028,15 +1035,15 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.29"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "reqwest"
version = "0.11.15"
version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949"
checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [
"base64",
"bytes 1.4.0",
@ -1153,18 +1160,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
version = "1.0.158"
version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.158"
version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
dependencies = [
"proc-macro2",
"quote",
@ -1184,9 +1191,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
version = "0.6.1"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
dependencies = [
"serde",
]
@ -1334,31 +1341,30 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.26.0"
version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg 1.1.0",
"bytes 1.4.0",
"libc",
"memchr",
"mio",
"num_cpus",
"pin-project-lite",
"socket2",
"tokio-macros",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
name = "tokio-macros"
version = "1.8.2"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.4",
]
[[package]]
@ -1387,9 +1393,9 @@ dependencies = [
[[package]]
name = "toml"
version = "0.7.3"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
dependencies = [
"serde",
"serde_spanned",
@ -1399,18 +1405,18 @@ dependencies = [
[[package]]
name = "toml_datetime"
version = "0.6.1"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.19.7"
version = "0.19.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274"
checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
dependencies = [
"indexmap",
"serde",
@ -1471,9 +1477,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
version = "0.3.16"
version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
dependencies = [
"nu-ansi-term",
"sharded-slab",
@ -1512,9 +1518,9 @@ dependencies = [
[[package]]
name = "universal-config"
version = "0.3.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dae262d0546bed6c0955faad12c07ec989768c2550643609410178fddb39909"
checksum = "23a92582af2bb8ffac1958db4de6fc821529c673a16319d70fa1cebabf572426"
dependencies = [
"dirs",
"serde",
@ -1694,13 +1700,13 @@ version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
[[package]]
@ -1709,7 +1715,16 @@ version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
"windows-targets",
"windows-targets 0.42.2",
]
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.0",
]
[[package]]
@ -1718,13 +1733,28 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
[[package]]
name = "windows-targets"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
dependencies = [
"windows_aarch64_gnullvm 0.48.0",
"windows_aarch64_msvc 0.48.0",
"windows_i686_gnu 0.48.0",
"windows_i686_msvc 0.48.0",
"windows_x86_64_gnu 0.48.0",
"windows_x86_64_gnullvm 0.48.0",
"windows_x86_64_msvc 0.48.0",
]
[[package]]
@ -1733,36 +1763,72 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
@ -1770,10 +1836,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "winnow"
version = "0.3.6"
name = "windows_x86_64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winnow"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
dependencies = [
"memchr",
]

4
pkgs/tools/audio/mpd-discord-rpc/default.nix
View File

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "mpd-discord-rpc";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "JakeStanger";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FYI0TlYyoT9h4fVjR1kp2Rn5qVppQhy6o09mPptTEMo=";
sha256 = "sha256-/B9ar9Q+d1MbBh6zIzf0QmlfgugxECLWHuiYSGUjdmg=";
};
cargoLock = {

4
pkgs/tools/filesystems/cryfs/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, cmake, pkg-config, python3
, boost175, curl, fuse, openssl, range-v3, spdlog
, boost, curl, fuse, openssl, range-v3, spdlog
# cryptopp and gtest on standby - using the vendored ones for now
# see https://github.com/cryfs/cryfs/issues/369
, llvmPackages
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
buildInputs = [ boost175 curl fuse openssl range-v3 spdlog ]
buildInputs = [ boost curl fuse openssl range-v3 spdlog ]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
#nativeCheckInputs = [ gtest ];

2
pkgs/tools/inputmethods/fcitx5/update.py
View File

@ -2,7 +2,6 @@
#!nix-shell -i python3 -p nix-update nix-prefetch-github python3Packages.requests
from nix_prefetch_github import *
import json
import requests
import subprocess
@ -34,7 +33,6 @@ def get_latest_tag(repo, owner=OWNER):
return r.json()[0].get("name")
def main():
sources = dict()
for repo in REPOS:
rev = get_latest_tag(repo)
if repo == "fcitx5-qt":

44
pkgs/tools/misc/ondir/default.nix Normal file
View File

@ -0,0 +1,44 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation {
pname = "ondir";
version = "0.2.3";
src = fetchFromGitHub {
owner = "alecthomas";
repo = "ondir";
rev = "cb2f9f8b21e336165fc0a310d677fda75c8e8513";
hash = "sha256-XTZKFIzJ3xL8ae3zG8nsMhGWvpvRUAQ2b6q/Q1QvGd0=";
};
installPhase = ''
runHook preInstall
make DESTDIR="$out" PREFIX= install
cp scripts.* $out
runHook postInstall
'';
meta = with lib; {
description = "a small program to automate tasks specific to certain directories";
longDescription = ''
It works by executing scripts in directories when you enter and leave them.
This is done by overriding the shell builtins cd, pushd, and popd,
which is a manual action.
The user is required to add a snippet to their shell initialisation file like .bashrc or .profile.
Which commands are executed on directory entry and leave is done
in predefined locations with a .ondirrc file.
See man ondir for more information
'';
homepage = "https://github.com/alecthomas/ondir/";
license = licenses.gpl2Only;
maintainers = [ maintainers.michaelCTS ];
};
}

4
pkgs/tools/misc/pre-commit/default.nix
View File

@ -17,7 +17,7 @@
with python3Packages;
buildPythonApplication rec {
pname = "pre-commit";
version = "3.3.2";
version = "3.3.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonApplication rec {
owner = "pre-commit";
repo = "pre-commit";
rev = "v${version}";
hash = "sha256-ZPfxulGiGqPT5z+BTfMn9wl/erzyfPA4LPan/ySFTi8=";
hash = "sha256-6FKf4jLHUt2c7LSxFcq53IsfHOWeUSI+P9To0eh48+o=";
};
patches = [

4
pkgs/tools/networking/easyrsa/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "easyrsa";
version = "3.1.4";
version = "3.1.5";
src = fetchFromGitHub {
owner = "OpenVPN";
repo = "easy-rsa";
rev = "v${version}";
sha256 = "sha256-2UIeHc5I6cvuD9DAFxwFbWOKNjV1StIBItxARohe0qk=";
sha256 = "sha256-GOgwGCsutg4WsBjs1f9jiTS2fvmVMyWCoTw+J/7iZG0=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/top-level/all-packages.nix
View File

@ -5717,6 +5717,8 @@ with pkgs;
oil-buku = callPackage ../applications/misc/oil-buku { };
ondir = callPackage ../tools/misc/ondir { };
osdlyrics = callPackage ../applications/audio/osdlyrics { };
ossutil = callPackage ../tools/admin/ossutil { };
@ -39797,6 +39799,8 @@ with pkgs;
refind = callPackage ../tools/bootloaders/refind { };
refmt = callPackage ../development/tools/refmt { };
spectra = callPackage ../development/libraries/spectra { };
spectrojack = callPackage ../applications/audio/spectrojack { };

2
pkgs/top-level/python-packages.nix
View File

@ -12226,6 +12226,8 @@ self: super: with self; {
pythonSupport = true;
});
tiny-proxy = callPackage ../development/python-modules/tiny-proxy { };
tinycss2 = callPackage ../development/python-modules/tinycss2 { };
tinycss = callPackage ../development/python-modules/tinycss { };