Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-01-24 00:02:51 +00:00 committed by GitHub
commit 9bf128cad3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
87 changed files with 4062 additions and 2139 deletions

View File

@ -307,6 +307,20 @@ with lib.maintainers; {
shortName = "Flying Circus employees";
};
formatter = {
members = [
piegames
infinisil
das_j
tomberek
_0x4A6F
# Not in the maintainer list
# Sereja313
];
scope = "Tentative Nix formatter team to be established in https://github.com/NixOS/rfcs/pull/166";
shortName = "Nix formatter team";
};
freedesktop = {
members = [ jtojnar ];
scope = "Maintain Freedesktop.org packages for graphical desktop.";

View File

@ -61,6 +61,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [TuxClocker](https://github.com/Lurkki14/tuxclocker), a hardware control and monitoring program. Available as [programs.tuxclocker](#opt-programs.tuxclocker.enable).
- [RustDesk](https://rustdesk.com), a full-featured open source remote control alternative for self-hosting and security with minimal configuration. Alternative to TeamViewer.
## Backward Incompatibilities {#sec-release-24.05-incompatibilities}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@ -184,6 +186,14 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [watchdogd](https://troglobit.com/projects/watchdogd/), a system and process supervisor using watchdog timers. Available as [services.watchdogd](#opt-services.watchdogd.enable).
- The `jdt-language-server` package now uses upstream's provided python wrapper instead of our own custom wrapper. This results in the following breaking and notable changes:
- The main binary for the package is now named `jdtls` instead of `jdt-language-server`, equivalent to what most editors expect the binary to be named.
- JVM arguments should now be provided with the `--jvm-arg` flag instead of setting `JAVA_OPTS`.
- The `-data` path is no longer required to run the package, and will be set to point to a folder in `$TMP` if missing.
## Other Notable Changes {#sec-release-24.05-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

View File

@ -832,6 +832,7 @@
./services/monitoring/riemann-dash.nix
./services/monitoring/riemann-tools.nix
./services/monitoring/riemann.nix
./services/monitoring/rustdesk-server.nix
./services/monitoring/scollector.nix
./services/monitoring/smartd.nix
./services/monitoring/snmpd.nix

View File

@ -0,0 +1,95 @@
{ lib, pkgs, config, ... }:
let
TCPPorts = [21115 21116 21117 21118 21119];
UDPPorts = [21116];
in {
options.services.rustdesk-server = with lib; with types; {
enable = mkEnableOption "RustDesk, a remote access and remote control software, allowing maintenance of computers and other devices.";
package = mkPackageOption pkgs "rustdesk-server" {};
openFirewall = mkOption {
type = types.bool;
default = false;
description = ''
Open the connection ports.
TCP (${lib.concatStringsSep ", " (map toString TCPPorts)})
UDP (${lib.concatStringsSep ", " (map toString UDPPorts)})
'';
};
relayIP = mkOption {
type = str;
description = ''
The public facing IP of the RustDesk relay.
'';
};
};
config = let
cfg = config.services.rustdesk-server;
serviceDefaults = {
enable = true;
requiredBy = [ "rustdesk.target" ];
serviceConfig = {
Slice = "system-rustdesk.slice";
User = "rustdesk";
Group = "rustdesk";
Environment = [];
WorkingDirectory = "/var/lib/rustdesk";
StateDirectory = "rustdesk";
StateDirectoryMode = "0750";
LockPersonality = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateMounts = true;
PrivateTmp = true;
PrivateUsers = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProtectSystem = "strict";
RemoveIPC = true;
RestrictNamespaces = true;
RestrictSUIDSGID = true;
};
};
in lib.mkIf cfg.enable {
users.users.rustdesk = {
description = "System user for RustDesk";
isSystemUser = true;
group = "rustdesk";
};
users.groups.rustdesk = {};
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall TCPPorts;
networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall UDPPorts;
systemd.slices.system-rustdesk = {
enable = true;
description = "Slice designed to contain RustDesk Signal & RustDesk Relay";
};
systemd.targets.rustdesk = {
enable = true;
description = "Target designed to group RustDesk Signal & RustDesk Relay";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
};
systemd.services.rustdesk-signal = lib.mkMerge [ serviceDefaults {
serviceConfig.ExecStart = "${cfg.package}/bin/hbbs -r ${cfg.relayIP}";
} ];
systemd.services.rustdesk-relay = lib.mkMerge [ serviceDefaults {
serviceConfig.ExecStart = "${cfg.package}/bin/hbbr";
} ];
};
meta.maintainers = with lib.maintainers; [ ppom ];
}

View File

@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec {
pname = "mopidy";
version = "3.4.1";
version = "3.4.2";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy";
rev = "refs/tags/v${version}";
sha256 = "sha256-IUQe5WH2vsrAOgokhTNVVM3lnJXphT2xNGu27hWBLSo=";
sha256 = "sha256-2OFav2HaQq/RphmZxLyL1n3suwzt1Y/d4h33EdbStjk=";
};
nativeBuildInputs = [ wrapGAppsNoGuiHook ];

View File

@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/moonlight-stream/moonlight-embedded";
license = licenses.gpl3Plus;
maintainers = [];
mainProgram = "moonlight";
platforms = platforms.linux;
};
}

View File

@ -2,12 +2,12 @@
let
pname = "polypane";
version = "17.0.0";
version = "17.1.0";
src = fetchurl {
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
name = "${pname}-${version}.AppImage";
sha256 = "sha256-ppAzE7dNjEb6uYO+c3o00RIdwMxx2o1AE+ZI+SMbS24=";
sha256 = "sha256-vOSw+zjO8OJWRzAdnl4i3MLg+AyXFQwYBg332MXdQhw=";
};
appimageContents = appimageTools.extractType2 {

View File

@ -2,20 +2,20 @@
buildGoModule rec {
pname = "atlantis";
version = "0.27.0";
version = "0.27.1";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
hash = "sha256-a+xrmEHkSh5kicxIIxnoXgF9ep2ay5kCXwMR2sAVJIA=";
hash = "sha256-qtfMkCI1vX9aKWFNAhqCrnc5mhE+4kh2pogzv4oRXnE=";
};
ldflags = [
"-X=main.version=${version}"
"-X=main.date=1970-01-01T00:00:00Z"
];
vendorHash = "sha256-ZbCNHARgliw9TMkHyS9k+cnWgbdCCJ+8nMdJMu66Uvo=";
vendorHash = "sha256-W3bX5fAxFvI1zQCx8ioNIc/yeDAXChpxNPYyaghnxxE=";
subPackages = [ "." ];

View File

@ -1,16 +1,20 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, go_1_21 }:
buildGoModule rec {
pname = "terraform-docs";
version = "0.16.0";
version = "0.17.0";
go = go_1_21;
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zSSK2WfcbD1DvqsFUKdTydLfyApWzm1h+ihSnLUmq2E=";
sha256 = "sha256-HkkW6JX5wcGElmr6CiSukyeS/8rz4CUThy8rZfx4hbo=";
};
vendorHash = "sha256-0Bkjx/gq2MAWjxoMSGtBcRzv40SSUVDZBh4PzEtKj5o=";
patches = [ ./update-to-go-1.21.patch ];
vendorHash = "sha256-ZHWAiXJG8vCmUkf6GNxoIJbIEjEWukLdrmdIb64QleI=";
subPackages = [ "." ];

File diff suppressed because it is too large Load Diff

View File

@ -11,24 +11,24 @@ with lib;
let
pname = "gitkraken";
version = "9.10.0";
version = "9.11.1";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
hash = "sha256-JVeJY0VUNyIeR/IQcfoLBN0I1WQNFy7PpCjzk5bPv/Q=";
hash = "sha256-DTnVsVWOPAcG2O87dS6PwAB+VU0ijulELHe9CnOLYPU=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
hash = "sha256-npc+dwHH0tlVKkAZxmGwpoiHXeDn0VHkivqbwoJsI7M=";
hash = "sha256-JkmQYk+t4ACkK3V0IxrrIcheBWJEkxQzf9ZYRWs769c=";
};
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
hash = "sha256-fszsGdNKcVgKdv97gBBf+fSODzjKbOBB4MyCvWzm3CA=";
hash = "sha256-jWXvDSyM7A3+cer/yPvom9f0w2nGJmwOJ22qoQzRWGQ=";
};
};

View File

@ -1,21 +1,50 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake, qtx11extras, qttools, mpv }:
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, qmake
, qttools
, qtbase
, mpv
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "mpc-qt";
version = "23.02";
version = "23.12";
src = fetchFromGitHub {
owner = "mpc-qt";
repo = "mpc-qt";
rev = "v${version}";
sha256 = "sha256-b8efsdWWpwoaiX+oQhHK15KxD6JpvPhESTxCR2kS7Mk=";
hash = "sha256-v22o5QtCY9Z8bPoIkwypG0oTBEPqPFeKZ8cWO+pKCD0=";
};
nativeBuildInputs = [ pkg-config qmake qttools ];
nativeBuildInputs = [
pkg-config
qmake
qttools
wrapQtAppsHook
];
buildInputs = [ mpv qtx11extras ];
buildInputs = [
mpv
];
qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ];
postPatch = ''
substituteInPlace lconvert.pri --replace "qtPrepareTool(LCONVERT, lconvert)" "qtPrepareTool(LCONVERT, lconvert, , , ${qttools}/bin)"
'';
postConfigure = ''
substituteInPlace Makefile --replace ${qtbase}/bin/lrelease ${qttools.dev}/bin/lrelease
'';
qmakeFlags = [
"MPCQT_VERSION=${version}"
];
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = with lib; {
description = "Media Player Classic Qute Theater";

View File

@ -915,7 +915,7 @@ rec {
mkdir $out
${if enableFakechroot then ''
proot -r $PWD/old_out ${bind-paths} --pwd=/ --root-id bash -c '
proot -r $PWD/old_out ${bind-paths} --pwd=/ fakeroot bash -c '
source $stdenv/setup
eval "$fakeRootCommands"
tar \

View File

@ -0,0 +1,54 @@
{ stdenv
, lib
, fetchFromSourcehut
, gitUpdater
, hare
, hareThirdParty
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bonsai";
version = "1.0.2";
src = fetchFromSourcehut {
owner = "~stacyharper";
repo = "bonsai";
rev = "v${finalAttrs.version}";
hash = "sha256-Yosf07KUOQv4O5111tLGgI270g0KVGwzdTPtPOsTcP8=";
};
nativeBuildInputs = [
hare
hareThirdParty.hare-ev
hareThirdParty.hare-json
];
makeFlags = [
"PREFIX=${builtins.placeholder "out"}"
"HARECACHE=.harecache"
"HAREFLAGS=-qa${stdenv.hostPlatform.uname.processor}"
];
enableParallelBuilding = true;
doCheck = true;
postPatch = ''
substituteInPlace Makefile \
--replace 'hare build' 'hare build $(HAREFLAGS)' \
--replace 'hare test' 'hare test $(HAREFLAGS)'
'';
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = with lib; {
description = "Finite State Machine structured as a tree";
homepage = "https://git.sr.ht/~stacyharper/bonsai";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ colinsane ];
platforms = platforms.linux;
mainProgram = "bonsaictl";
};
})

View File

@ -2,13 +2,13 @@
buildDotnetModule rec {
pname = "Boogie";
version = "3.0.9";
version = "3.0.10";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie";
rev = "v${version}";
sha256 = "sha256-8hujTiUO62yfv3T/Fu5unTuvJXLGgn9BXoCA2oag3jQ=";
sha256 = "sha256-0E4yAVNWJC67vX0DTQj1ZH7T6JKOgE0BDf6u0V0QvFA=";
};
projectFile = [ "Source/Boogie.sln" ];

View File

@ -0,0 +1,42 @@
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, alsa-lib
, wl-clipboard
, xclip
}:
buildGoModule rec {
pname = "gtt";
version = "8";
src = fetchFromGitHub {
owner = "eeeXun";
repo = "gtt";
rev = "v${version}";
hash = "sha256-HC1cz2CAjyuirzhn720RD9P0gFjtP+Dh1jTniDCWBz8=";
};
vendorHash = "sha256-5Uwi1apowHoUtvkSgmUV9WbfpVQFTqJ9GA2sRnC5nFw=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
alsa-lib
xclip
wl-clipboard
];
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Google Translate TUI (Originally). Now support Apertium, Argos, Bing, ChatGPT, DeepL, Google, Reverso";
homepage = "https://github.com/eeeXun/gtt";
license = licenses.mit;
maintainers = with maintainers; [ linuxissuper ];
mainProgram = "gtt";
};
}

View File

@ -0,0 +1 @@
2024-01-15

View File

@ -0,0 +1,27 @@
# This file has been autogenerate with cabal2nix.
# Update via ./update.sh
{ mkDerivation, base, cmdargs, directory, fetchzip, filepath, lib
, megaparsec, mtl, parser-combinators, safe-exceptions, scientific
, text, transformers, unix
}:
mkDerivation {
pname = "nixfmt";
version = "0.5.0";
src = fetchzip {
url = "https://github.com/piegamesde/nixfmt/archive/1eff7a84ac82fbebb5f586244f1c80e1fcc4f494.tar.gz";
sha256 = "1pg876sr58h7v087kbjsnfr4pzvqpwzibl06w2468qs1sywmd283";
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base megaparsec mtl parser-combinators scientific text transformers
];
executableHaskellDepends = [
base cmdargs directory filepath safe-exceptions text unix
];
jailbreak = true;
homepage = "https://github.com/serokell/nixfmt";
description = "An opinionated formatter for Nix";
license = lib.licenses.mpl20;
mainProgram = "nixfmt";
}

View File

@ -0,0 +1,32 @@
{
haskell,
haskellPackages,
lib,
runCommand,
nixfmt-rfc-style,
}:
let
inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
overrides = {
version = "unstable-${lib.fileContents ./date.txt}";
passthru.updateScript = ./update.sh;
maintainers = lib.teams.formatter.members;
# These tests can be run with the following command.
#
# $ nix-build -A nixfmt-rfc-style.tests
passthru.tests =
runCommand "nixfmt-rfc-style-tests" { nativeBuildInputs = [ nixfmt-rfc-style ]; }
''
nixfmt --version > $out
'';
};
raw-pkg = haskellPackages.callPackage ./generated-package.nix { };
in
lib.pipe raw-pkg [
(overrideCabal overrides)
justStaticExecutables
]

View File

@ -0,0 +1,33 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p cabal2nix curl jq
#
# This script will update the nixfmt-rfc-style derivation to the latest version using
# cabal2nix.
set -eo pipefail
# This is the directory of this update.sh script.
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
derivation_file="${script_dir}/generated-package.nix"
date_file="${script_dir}/date.txt"
# This is the latest version of nixfmt-rfc-style branch on GitHub.
new_version=$(curl --silent https://api.github.com/repos/piegamesde/nixfmt/git/refs/heads/rfc101-style | jq '.object.sha' --raw-output)
new_date=$(curl --silent https://api.github.com/repos/piegamesde/nixfmt/git/commits/"$new_version" | jq '.committer.date' --raw-output)
echo "Updating nixfmt-rfc-style to version $new_date."
echo "Running cabal2nix and outputting to ${derivation_file}..."
cat > "$derivation_file" << EOF
# This file has been autogenerate with cabal2nix.
# Update via ./update.sh
EOF
cabal2nix --jailbreak \
"https://github.com/piegamesde/nixfmt/archive/${new_version}.tar.gz" \
>> "$derivation_file"
date --date="$new_date" -I > "$date_file"
echo "Finished."

52
pkgs/by-name/pa/parabolic/deps.nix generated Normal file
View File

@ -0,0 +1,52 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Ace4896.DBus.Services.Secrets"; version = "1.2.0"; sha256 = "1i1rwv8z2dx0mjib7vair2w7ylngmrcpbd012sdlpvdjpx0af0bn"; })
(fetchNuGet { pname = "Cake.Tool"; version = "4.0.0"; sha256 = "11vc5fimi6w465081sqxs4zhw7grr6v8ga7nl1mscdl43wv33ql2"; })
(fetchNuGet { pname = "GetText.NET"; version = "1.9.14"; sha256 = "18z4cf0dldcf41z8xgj3gdlvj9w5a9ikgj72623r0i740ndnl094"; })
(fetchNuGet { pname = "GirCore.Adw-1"; version = "0.5.0-preview.3"; sha256 = "090kg5v99myd7hi49cz933cl36hk5n586ywy78gf5djn5im3v19l"; })
(fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0bh1h2hr6givrq6096bvzcsg4lab1hlm7r7h4bqifbw0zmmcfb7k"; })
(fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.5.0-preview.3"; sha256 = "194p44gd7r69x70j3qynv5v8awlyxmdazmzpwzgj5ayy2xpdk3hy"; })
(fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.5.0-preview.3"; sha256 = "09p097nvs7vi7l14l024m39qyhg1gyqihanq7zv66xqys4hzim1g"; })
(fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.5.0-preview.3"; sha256 = "0lspyra1g1rd8hj3f3daxspin5dhgplzgjh4jwhlgzzn648942j0"; })
(fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.5.0-preview.3"; sha256 = "090svrddgpliks5r29yncih3572w7gdc552nl16qbviqbmhr0lbs"; })
(fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.5.0-preview.3"; sha256 = "1wxwf24gabd69yxpnhv30rn7pcv49w885jdw3nqbrakl7pvv9fza"; })
(fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.5.0-preview.3"; sha256 = "0iajydyx79f3khx0fhv8izbxlzxwn6gpps2xzmi9c4v98ly221j3"; })
(fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.5.0-preview.3"; sha256 = "114fbgxils50jdy891nwj70yr43lnwgbq9fzxqzywd1kk70k7mww"; })
(fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.5.0-preview.3"; sha256 = "0f5s6f6pwc9vc3nm7xfaa06z2klgpg4rv5cdf0cwis3vlncd7dnj"; })
(fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.5.0-preview.3"; sha256 = "1fn0b8lwlrmjm9phjq4amqnq3q70fl214115652cap5rz4rjmpgg"; })
(fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.5.0-preview.3"; sha256 = "0xska2l44l0j38mlgmrwly1qal9wzbv2w2jjj8gn90sxbygb8zky"; })
(fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.5.0-preview.3"; sha256 = "0ccw3bd3kl24mnxbjzhya11i0ln6g1g7q876pyy54cwh48x4mdia"; })
(fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0lds340p5cci7sjp58nh94jxkjvzfky9cbs2h4q98hglxndjm7r9"; })
(fetchNuGet { pname = "Markdig"; version = "0.33.0"; sha256 = "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r"; })
(fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.5"; sha256 = "1ikjxj6wir2jcjwlmd4q7zz0b4g40808gx59alvad31sb2aqp738"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; sha256 = "05qjnzk1fxybks92y93487l3mj5nghjcwiy360xjgk3jykz3rv39"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; sha256 = "05392f41ijgn17y8pbjcx535l1k09krnq3xdp60kyq568sn6xk2i"; })
(fetchNuGet { pname = "Nickvision.Aura"; version = "2023.11.4"; sha256 = "0gasyglp1pgi0s6zqzmbm603j3j36vvr68grv6g93fdj2vjlmkxs"; })
(fetchNuGet { pname = "Octokit"; version = "9.0.0"; sha256 = "0kw49w1hxk4d2x9598012z9q1yr3ml5rm06fy1jnmhy44s3d3jp5"; })
(fetchNuGet { pname = "pythonnet"; version = "3.0.3"; sha256 = "0qnivddg13vi1fb22z3krsj1gczyyfd56nmk6gas6qrwlxdzhriv"; })
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.6"; sha256 = "15v2x7y4k7cl47a9jccbvgbwngwi5dz6qhv0cxpcasx4v5i9aila"; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; })
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.6"; sha256 = "0dl5an15whs4yl5hm2wibzbfigzck0flah8a07k99y1bhbmv080z"; })
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.6"; sha256 = "1jx8d4dq5w2951b7w722gnxbfgdklwazc48kcbdzylkglwkrqgrq"; })
(fetchNuGet { pname = "System.CodeDom"; version = "8.0.0"; sha256 = "0zyzd15v0nf8gla7nz243m1kff8ia6vqp471i3g7xgawgj5n21dv"; })
(fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.0"; sha256 = "1j4rsm36bnwqmh5br9mzmj0ikjnc39k26q6l9skjlrnw8hlngwy4"; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
(fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; })
(fetchNuGet { pname = "System.Management"; version = "8.0.0"; sha256 = "1zbwj6ii8axa4w8ymjzi9d9pj28nhswygahyqppvzaxypw6my2hz"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
(fetchNuGet { pname = "Tmds.DBus"; version = "0.15.0"; sha256 = "1bz5j6wfp9hn4fg5vjxl6mr9lva4gx6zqncqyqxrcb8lw7hvhwc6"; })
(fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; })
]

View File

@ -0,0 +1,77 @@
{ lib
, buildDotnetModule
, fetchFromGitHub
, dotnetCorePackages
, gtk4
, libadwaita
, pkg-config
, wrapGAppsHook4
, glib
, shared-mime-info
, gdk-pixbuf
, blueprint-compiler
, python3
, ffmpeg
}:
buildDotnetModule rec {
pname = "parabolic";
version = "2023.12.0";
src = fetchFromGitHub {
owner = "NickvisionApps";
repo = "Parabolic";
rev = version;
hash = "sha256-mbGByw/wgovo81l2LDtDE5p+Mh6aJ5DOcZCNzVfmAtA=";
fetchSubmodules = true;
};
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
pythonEnv = python3.withPackages(ps: with ps; [ yt-dlp ]);
projectFile = "NickvisionTubeConverter.GNOME/NickvisionTubeConverter.GNOME.csproj";
nugetDeps = ./deps.nix;
executables = "NickvisionTubeConverter.GNOME";
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
glib
shared-mime-info
gdk-pixbuf
blueprint-compiler
];
buildInputs = [ gtk4 libadwaita ];
runtimeDeps = [
gtk4
libadwaita
glib
gdk-pixbuf
];
postPatch = ''
substituteInPlace NickvisionTubeConverter.Shared/Linux/org.nickvision.tubeconverter.desktop.in --replace '@EXEC@' "NickvisionTubeConverter.GNOME"
'';
postInstall = ''
install -Dm444 NickvisionTubeConverter.Shared/Resources/org.nickvision.tubeconverter.svg -t $out/share/icons/hicolor/scalable/apps/
install -Dm444 NickvisionTubeConverter.Shared/Resources/org.nickvision.tubeconverter-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/
install -Dm444 NickvisionTubeConverter.Shared/Linux/org.nickvision.tubeconverter.desktop.in -T $out/share/applications/org.nickvision.tubeconverter.desktop
'';
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ pythonEnv ffmpeg ]}" ];
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Download web video and audio";
homepage = "https://github.com/NickvisionApps/Parabolic";
license = licenses.mit;
maintainers = with maintainers; [ ewuuwe ];
mainProgram = "parabolic";
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,18 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
#shellcheck shell=bash
set -eu -o pipefail
version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
https://api.github.com/repos/NickvisionApps/Parabolic/releases/latest | jq -e -r .tag_name)
old_version=$(nix-instantiate --eval -A parabolic.version | jq -e -r)
if [[ $version == "$old_version" ]]; then
echo "New version same as old version, nothing to do." >&2
exit 0
fi
update-source-version parabolic "$version"
$(nix-build -A parabolic.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.nix"

View File

@ -0,0 +1,35 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "plumber";
version = "2.5.2";
src = fetchFromGitHub {
owner = "streamdal";
repo = pname;
rev = "v${version}";
hash = "sha256-ftXLipJQjRdOSNO56rIRfAKKU0kHtAK85hgcT3nYOKA=";
};
vendorHash = null;
# connection tests create a config file in user home directory
preCheck = ''
export HOME="$(mktemp -d)"
'';
ldflags = [
"-s"
"-w"
"-X github.com/streamdal/plumber/options.VERSION=${version}"
# remove once module in go.mod is renamed to github.com/batchcorp/streamdal
"-X github.com/batchcorp/plumber/options.VERSION=${version}"
];
meta = with lib; {
description = "A CLI devtool for interacting with data in message systems like Kafka, RabbitMQ, GCP PubSub and more";
homepage = "https://github.com/streamdal/plumber";
license = licenses.mit;
maintainers = with maintainers; [ svrana ];
};
}

View File

@ -11,12 +11,12 @@
stdenv.mkDerivation {
pname = "udebug";
version = "unstable-2023-11-28";
version = "unstable-2023-12-06";
src = fetchgit {
url = "https://git.openwrt.org/project/udebug.git";
rev = "d49aadabb7a147b99a3e6299a77d7fda4e266091";
hash = "sha256-5I50q+oUQ5f82ngKl7bX50J+3pBviNk3iVEChNjt5wY=";
rev = "6d3f51f9fda706f0cf4732c762e4dbe8c21e12cf";
hash = "sha256-5dowoFZn9I2IXMQ3Pz+2Eo3rKfihLzjca84MytQIXcU=";
};
buildInputs = [

View File

@ -0,0 +1,28 @@
{
lib,
stdenv,
fetchurl,
unzip,
}:
let
version = "4.4.2";
in stdenv.mkDerivation {
pname = "yeswiki";
inherit version;
src = fetchurl {
url = "https://repository.yeswiki.net/doryphore/yeswiki-doryphore-${version}.zip";
hash = "sha256-TNiVBragEnLkMTu/Op6sCFsk9wWXUQ2GUPqmWgPV/vk=";
};
nativeBuildInputs = [
unzip
];
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -R . $out/
runHook postInstall
'';
}

View File

@ -2,16 +2,16 @@
[7off]
dependencies = ["anaphora", "define-options", "lowdown", "matchable", "srfi-1", "sxml-transforms", "sxpath", "utf8", "srfi-42", "srfi-69", "strse", "uri-common"]
license = "agpl"
sha256 = "01dp84dnvvvg26k27bwh8m64qss5jqy8iifykaymz3brragg3406"
sha256 = "0hsqxva92k3yasrlgl7bbq3z3d2d2nd3r3i2v6vimv7mp2chfkdr"
synopsis = "Markdown to Gemini text"
version = "1.30"
version = "1.31"
[F-operator]
dependencies = ["utf8", "miscmacros", "datatype", "box"]
dependencies = ["miscmacros", "datatype", "box"]
license = "bsd"
sha256 = "1zhfvcv8628s9sria1i63sdp88h5gpm96iv023qvm07g9z9qv5dv"
sha256 = "0i7yfc8pxszvsgls871s2bwy11yxyxr4sqbl8gc21g29xm7vjivq"
synopsis = "Shift/Reset Control Operators"
version = "4.1.3"
version = "4.1.4"
[abnf]
dependencies = ["srfi-1", "utf8", "lexgen"]
@ -79,9 +79,9 @@ version = "3.0.0"
[amb]
dependencies = ["srfi-1"]
license = "bsd"
sha256 = "1kkzmbym1xhgxby9grjamjs3yajz5l32v3wg2b6xsl7v0infkszs"
sha256 = "0ggwmsd4igg099ikn5qja5nkqmrnsw0byyk3q9y04ygvzalqyb36"
synopsis = "The non-deterministic backtracking ambivalence operator"
version = "3.0.8"
version = "3.0.9"
[amqp]
dependencies = ["bitstring", "mailbox", "srfi-18", "uri-generic"]
@ -146,6 +146,13 @@ sha256 = "1yq819vbb813svxvxad4h99vrhvf7rs8cv9dsnj85rcvi60w7299"
synopsis = "Automatically compile Scheme scripts on demand"
version = "1.1.0"
[awful-main]
dependencies = ["awful", "spiffy", "define-options"]
license = "bsd"
sha256 = "1zpnk3xjkn2pdfw953ximq6i0d3v3mak8ydl6a3nb2zz1daq7044"
synopsis = "Turn awful web applications into static executables"
version = "0.1.0"
[awful-path-matchers]
dependencies = []
license = "bsd"
@ -254,9 +261,9 @@ version = "0.4.1"
[binary-search]
dependencies = []
license = "bsd"
sha256 = "1r3a5387knvg29hp3pn0xs5zzql6g7pkjzl2h6b0ds8gsyqf65b7"
sha256 = "0hycs33782xvcc4p0jl2a716fi388v8vbvf9isgrnl9ahqnk9kia"
synopsis = "Binary search algorithm"
version = "0.1"
version = "0.2"
[bind]
dependencies = ["silex", "matchable", "coops", "srfi-1", "regex"]
@ -345,16 +352,16 @@ version = "0.11"
[brev-separate]
dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"]
license = "bsd-1-clause"
sha256 = "12pl79bfgii9d7kg30qlk94ag0rm0ca4zr4nc95spiva4p8j6ixx"
sha256 = "0ycm95vcf1dj6m3kqii7b2a5kxyd1m6lzksz77ispay14srgw8rd"
synopsis = "Hodge podge of macros and combinators"
version = "1.92"
version = "1.95"
[brev]
dependencies = ["anaphora", "brev-separate", "clojurian", "combinators", "define-options", "dwim-sort", "fix-me-now", "acetone", "html-parser", "match-generics", "http-client", "matchable", "miscmacros", "scsh-process", "sequences", "srfi-1", "srfi-42", "srfi-69", "strse", "sxml-serializer", "sxml-transforms", "sxpath", "tree", "uri-common"]
license = "public-domain"
sha256 = "0ddf3j3lxv35kgnrzi9lq6ckn1sj149nr0nckj8ghqvfzkqa9flw"
sha256 = "1kbphbz21rlrsfcfqg77hm1vv7wh9z1gcwh5lb2hlrqp2yl7m7yc"
synopsis = "A huge pile of batteries and shortcuts"
version = "1.37"
version = "1.41"
[byte-blob]
dependencies = ["srfi-1"]
@ -415,9 +422,9 @@ version = "0.4"
[check-errors]
dependencies = []
license = "bsd"
sha256 = "1ra8pvs0qnfqsjbrsn0k94drwx5ydvhapziv6dcqcb118iimnrmd"
sha256 = "09ffyffrv3gamjsjgbisn3yxb40wbqy5pfrs6dxw20n1ffimgfw5"
synopsis = "Argument checks & errors"
version = "3.7.1"
version = "3.8.0"
[checks]
dependencies = ["simple-exceptions"]
@ -436,9 +443,9 @@ version = "0.1.3"
[chickadee]
dependencies = ["matchable", "uri-common", "uri-generic", "intarweb", "simple-sha1", "spiffy", "spiffy-request-vars", "sxml-transforms", "chicken-doc", "chicken-doc-admin", "chicken-doc-html", "srfi-18"]
license = "bsd"
sha256 = "02wrg3s1hx5slbx0vmg1zmknchwksxxw75yld1nyqxf5wyv2dibj"
sha256 = "0blbxy2l7kii85glczrxrqc8n7794qxswq67v0vl6hxajwij197i"
synopsis = "chicken-doc web server"
version = "0.12.1"
version = "0.12.2"
[chicken-belt]
dependencies = ["matchable", "srfi-1", "srfi-13"]
@ -524,6 +531,13 @@ sha256 = "1rxyr6di07zqfjzbb0kgdx43m2b1zpjrkaph8x078jgqawyblc6v"
synopsis = "A chicken wrapper for cmark with markdown to sxml capabilities"
version = "0.1.0"
[coin-change]
dependencies = ["srfi-1"]
license = "unlicense"
sha256 = "09p83afsh2dx4y2cpyi55bf2br03ysdpq9xrqik7fmks3913kxmk"
synopsis = "Greedy solver for the coin change problem"
version = "1.0.2"
[color]
dependencies = ["fmt", "records", "srfi-13"]
license = "bsd"
@ -632,9 +646,9 @@ version = "1.4"
[csm]
dependencies = ["matchable", "srfi-1", "srfi-13", "srfi-14", "miscmacros"]
license = "bsd"
sha256 = "0rfysqqxn92asa6wd1dnzc372982nsr81ay7i7x1cn62bw5gs1pl"
sha256 = "1bvawrbslsfzxlhal5abyss0nj0jddqbs5ran58nygfc1myn3vfs"
synopsis = "a build system"
version = "0.4"
version = "0.5"
[cst]
dependencies = ["brev-separate", "srfi-1", "define-options", "match-generics"]
@ -693,11 +707,11 @@ synopsis = "explicitly implicit renaming"
version = "1.2"
[define-options]
dependencies = ["tree", "brev-separate", "getopt-long", "srfi-1"]
dependencies = ["brev-separate", "getopt-long", "matchable", "quasiwalk", "srfi-1"]
license = "lgpl"
sha256 = "03l46ma7d1yy5c8b4b71bwr0vhd0h3w57b3wr25bawk10ngr2qn6"
sha256 = "1j9lj5kj3j8jhclxnxrrc2wn6qn9j0bhr2y9fydg05an9q7jmrh0"
synopsis = "Conveniently bind to getopt-long options"
version = "1.7"
version = "1.23"
[define-record-and-printer]
dependencies = ["hahn", "matchable"]
@ -1043,11 +1057,11 @@ synopsis = "Client library for the gemini:// protocol"
version = "0.2.1"
[geminih]
dependencies = ["clojurian", "acetone", "anaphora", "strse", "match-generics", "brev-separate", "srfi-1"]
dependencies = ["clojurian", "acetone", "anaphora", "html-parser", "strse", "match-generics", "brev-separate", "srfi-1"]
license = "bsd-1-clause"
sha256 = "158jprg7y49avv4wnbmp2i0zxw1vwk2am8nfb7nc603rhrc0xism"
sha256 = "1i2nmzk61szkpg0a2r4i6gx00hnj78b3dqkk34y349h29dm2jv56"
synopsis = "Gemtext to SXML"
version = "1.10"
version = "1.13"
[gemrefinder]
dependencies = ["scsh-process", "srfi-1", "srfi-42", "define-options", "combinators", "brev-separate", "match-generics", "strse"]
@ -1094,9 +1108,9 @@ version = "1.21"
[getopt-utils]
dependencies = ["utf8", "srfi-1", "getopt-long"]
license = "bsd"
sha256 = "0jbzv8s0b3pnlqzl4vls0fssw56ivz1g9afdj90kxaxlxv1b1l0k"
sha256 = "0i17fj29zbbm05x68h7fy524ypk8vbr62gq6jkrwf18371l0l767"
synopsis = "Utilities for getopt-long"
version = "1.1.0"
version = "1.1.1"
[git]
dependencies = ["srfi-69", "foreigners", "module-declarations", "srfi-1"]
@ -1353,9 +1367,9 @@ version = "1.2"
[intarweb]
dependencies = ["srfi-1", "srfi-13", "srfi-14", "defstruct", "uri-common", "base64"]
license = "bsd"
sha256 = "1vpdrbrmjsdbl4cb3c82iqcvyn9318jzapg6bl00dkbn6ykyisr3"
sha256 = "0khzz6w8dh8sbiaqw3b68p0v8lv4bjwxipkb9cqj2q9r7zl84555"
synopsis = "A more convenient HTTP library"
version = "2.0.3"
version = "2.1.0"
[integer-map]
dependencies = ["srfi-1", "srfi-128", "srfi-143", "srfi-158"]
@ -1388,9 +1402,9 @@ version = "0.2"
[ioctl]
dependencies = ["foreigners"]
license = "bsd"
sha256 = "1knyb80hm9l3j2cw71i5j73vjhw0g5l4vyyjyp1h5j6fwnsywpfb"
sha256 = "0qs2daw16zw4jpqnb0q2nnb0qanki7nl0k437b9m4a7qslhdqw6r"
synopsis = "ioctl system call interface"
version = "0.3"
version = "0.4"
[ipfs]
dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"]
@ -1449,11 +1463,11 @@ synopsis = "Parser combinators for JavaScript Object Notation (JSON)."
version = "7.0"
[json-rpc]
dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180"]
dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180", "utf8"]
license = "mit"
sha256 = "09ydq35aaap14vxw0533mnxvqq9c8yir1dc7bn61q4l7vzfl44k8"
sha256 = "10f2iw93fhc0vha6axqzd27akh0ys7a6q0vwhpl0jzw4s48h3ss3"
synopsis = "A JSON RPC library for R7RS scheme."
version = "0.4.2"
version = "0.4.5a"
[json-utils]
dependencies = ["utf8", "srfi-1", "srfi-69", "vector-lib", "miscmacros", "moremacros"]
@ -1528,9 +1542,9 @@ version = "1.2"
[levenshtein]
dependencies = ["srfi-1", "srfi-13", "srfi-63", "srfi-69", "vector-lib", "utf8", "miscmacros", "record-variants", "check-errors"]
license = "bsd"
sha256 = "1v8g5ghilraz2lx0fif3yb1rlg3n51zvvik2l12ycqh0wj0pz59l"
sha256 = "07jwz006c6yhibg7d9nb35rif04810820pss5mg7c7mbn2nzmq1q"
synopsis = "Levenshtein edit distance"
version = "2.2.8"
version = "2.4.0"
[lexgen]
dependencies = ["srfi-1", "utf8", "srfi-127"]
@ -1624,11 +1638,11 @@ synopsis = "A pure Chicken Markdown parser"
version = "3"
[lsp-server]
dependencies = ["apropos", "chicken-doc", "json-rpc", "nrepl", "r7rs", "srfi-1", "srfi-130", "srfi-133", "srfi-18", "srfi-69", "uri-generic", "utf8"]
dependencies = ["apropos", "chicken-doc", "json-rpc", "nrepl", "r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-130", "srfi-133", "srfi-180", "uri-generic", "utf8"]
license = "mit"
sha256 = "0wbigf0s37377hjfxspwydhvnds165mhp2qa14iskvsw5zbp8g80"
sha256 = "09fak8d29qmxynh4361prhfg971j74mha6pw311a6kmz88h9zp0h"
synopsis = "LSP Server for CHICKEN."
version = "0.4.1"
version = "0.4.4"
[macaw]
dependencies = []
@ -1654,9 +1668,9 @@ version = "3.3.10"
[make-tests]
dependencies = ["brev-separate", "srfi-1", "uri-common"]
license = "public-domain"
sha256 = "0ca8fx40x42zqqsp3dmw5cb9xsjlz4cp71yh9kgcb29n4ig80r97"
sha256 = "174nbjy27iiz29g906p9rsg036mgwjnl7ll0qc2clqzq1svkgqc7"
synopsis = "Create unit tests from a file of expressions"
version = "1.10"
version = "1.12"
[make]
dependencies = ["srfi-1"]
@ -1682,9 +1696,9 @@ version = "0.3.1"
[match-generics]
dependencies = ["brev-separate", "matchable", "quasiwalk", "srfi-1"]
license = "bsd-1-clause"
sha256 = "07ssmsa52ixwn5wj8b11a0adglyxycf2f7qkkfrwwikalwpvnwdp"
sha256 = "1js4kq8hp6n8182mzyrs7q7aa6hf9q5y8q3zp2lkplpp862x2sks"
synopsis = "matchable generics"
version = "2.4"
version = "2.8"
[matchable]
dependencies = []
@ -1827,11 +1841,11 @@ synopsis = "Various helper macros"
version = "1.0"
[mistie]
dependencies = []
dependencies = ["srfi-1"]
license = "bsd"
sha256 = "0j5cqkqqfmq3g0brws02vsvn7c68rdw4k0i17gm7pbsjwjb6qggw"
sha256 = "0qfz8zc41wm2afwwbg1c8gmpzlph07nsj4r86lx01af9s03nvpfa"
synopsis = "A programmable filter"
version = "1.6"
version = "1.9"
[modular-arithmetic]
dependencies = ["srfi-1", "matchable"]
@ -1868,6 +1882,13 @@ sha256 = "09kc4wmhwkdhspk8g0i357qdq9mp1xcalgnqi8z9yasfy2k6gk1h"
synopsis = "More miscellaneous macros"
version = "2.5.0"
[mosquitto]
dependencies = ["srfi-1"]
license = "mit"
sha256 = "0v03hljm71hl6xr1pffzcpk2izil9w2sp9k68a7iirvpcvqg9iph"
synopsis = "Bindings to mosquitto MQTT client library"
version = "0.1.3"
[mpd-client]
dependencies = ["regex", "srfi-1"]
license = "bsd"
@ -1903,6 +1924,13 @@ sha256 = "01ma6cxmbc0bmk4598q3ag28pnbqlmcfq11mbs4c87ir82bkvz7h"
synopsis = ""
version = "1.0.0.6"
[nanosleep]
dependencies = []
license = "bsd"
sha256 = "1nynvd6sv8ffxk0jlvr77mgm0r1rww4c1n5k5m799b36w4gs6df9"
synopsis = "Interface to POSIX nanosleep"
version = "0.3.0"
[natural-sort]
dependencies = []
license = "mit"
@ -1976,9 +2004,9 @@ version = "1.21"
[openssl]
dependencies = ["srfi-1", "srfi-13", "srfi-18", "address-info"]
license = "bsd"
sha256 = "06bj8jqmfk9vlwny5w53bfrahv9wdbxvqyqijxvhmzy8z0p3slx0"
sha256 = "018x80cxs7glvqn7nhjcfbvw36bn3pf4y24a6cn7mz25z6597vg0"
synopsis = "Bindings to the OpenSSL SSL/TLS library"
version = "2.2.4"
version = "2.2.5"
[operations]
dependencies = ["srfi-1"]
@ -2403,9 +2431,9 @@ version = "1.7.1"
[salmonella]
dependencies = []
license = "bsd"
sha256 = "1xr01d9ax106c5q3xx0lj92q24jqiywasamimpzvda4b17bb34n5"
sha256 = "1r60dlr1qcjlirbwqpn23aphczlkhrhskgqmw51973w46ww839nf"
synopsis = "A tool for testing eggs"
version = "3.0.1"
version = "3.1.1"
[salt]
dependencies = ["datatype", "matchable", "make", "mathh", "lalr", "datatype", "unitconv", "fmt"]
@ -2435,6 +2463,13 @@ sha256 = "03nn90fi18gn29vxvslyi5zxhl5hx2m7f7ikfy9a3ypnkw1bh8qk"
synopsis = "Tools for Scheme development"
version = "0.3.2"
[scheme-indent]
dependencies = ["srfi-1"]
license = "bsd"
sha256 = "0brwmphr724shd32dcixsn9wz9zqrhg27g7rjbiz96885maj6nwf"
synopsis = "A Scheme code indenter"
version = "0.5"
[scheme2c-compatibility]
dependencies = ["srfi-1", "srfi-13", "srfi-14", "traversal", "foreigners", "xlib"]
license = "lgpl"
@ -2508,9 +2543,9 @@ version = "0.0.13"
[sendfile]
dependencies = ["memory-mapped-files"]
license = "bsd"
sha256 = "00fnmx6frrvms7s61in2jmfp852rif8nlh3akv1wrn3xm6i7gsyw"
sha256 = "1vi5i8df146j2gh4x7s8fry0bdzfm57f7v62zd5sd0x45h72lffw"
synopsis = "Sending a file over the network"
version = "1.9.1"
version = "2.0"
[sequences-utils]
dependencies = ["srfi-1", "srfi-69", "sequences"]
@ -2596,6 +2631,13 @@ sha256 = "0phsfz2263yiy9z33sf7qjf4i8kh51n5yf1g2wmb0pb63vcdqy8n"
synopsis = "Some user-friendly exception routines"
version = "1.3.1"
[simple-logger]
dependencies = []
license = "bsd"
sha256 = "05d9fjn6m9m8c4n2blig844vhv9cp1rmyrcxnkzxfxxiw9y4wfhf"
synopsis = "A very simple logger"
version = "1.0.0"
[simple-loops]
dependencies = []
license = "bsd"
@ -2795,9 +2837,9 @@ version = "0.2"
[sql-de-lite]
dependencies = ["foreigners", "object-evict", "srfi-1", "srfi-18", "srfi-69"]
license = "bsd"
sha256 = "06pr2b0ix5f27cd3ymxbbihdng3n9i9a22dr2g0dlp3ks6i174g3"
sha256 = "1vx7j1y6b1wkhf3wn3bgf62a3zn3wk9clcygn80k4cjpma2p8ig5"
synopsis = "SQLite 3 interface"
version = "0.10.0"
version = "0.10.1"
[sql-null]
dependencies = []
@ -2849,11 +2891,11 @@ synopsis = "SRFI-111: Boxes"
version = "0.5"
[srfi-113]
dependencies = ["srfi-69", "srfi-128"]
dependencies = ["r7rs", "srfi-69", "srfi-128"]
license = "bsd"
sha256 = "1psipd38r5jwb4l2q7rxj5yjq3zmisqnmqq64dqx1nxhhbh01wrw"
sha256 = "0ripxgwfwizj9mzb04lsbvavvy7qima81cyqm830j59sixj6ldc2"
synopsis = "SRFI-113: Sets and Bags"
version = "1.1"
version = "1.2.0"
[srfi-115]
dependencies = ["srfi-14", "srfi-152"]
@ -3124,9 +3166,9 @@ version = "2.0.0"
[srfi-209]
dependencies = ["srfi-1", "srfi-69", "srfi-113", "srfi-128", "srfi-178", "typed-records"]
license = "mit"
sha256 = "0dphpi92afn569pgi3jfwdxm7h63nd0s9s42f5m106wfkf79si9r"
sha256 = "04fghjk0rfcz0fp71dvwvlxmxshrbmrs85g4l5cx8sp74y047qlv"
synopsis = "SRFI 209: Enums and enum sets"
version = "1.2.2"
version = "1.3.1"
[srfi-216]
dependencies = ["srfi-18"]
@ -3173,9 +3215,9 @@ version = "4.2.3"
[srfi-29]
dependencies = ["srfi-1", "srfi-69", "utf8", "locale", "posix-utils", "condition-utils", "check-errors"]
license = "bsd"
sha256 = "15g2knq5b76f3nhxnmxidhkvbw9dyyc00hrzvsnpkmnfqzcmxbxw"
sha256 = "1pz31xrfja4y43ci5n8gplhdnasbyxx0kwlmcjzycs1js4b66ld1"
synopsis = "Localization"
version = "3.0.7"
version = "3.0.8"
[srfi-34]
dependencies = []
@ -3432,9 +3474,9 @@ version = "2.7.3"
[strse]
dependencies = ["matchable", "srfi-13", "miscmacros"]
license = "bsd-1-clause"
sha256 = "0gmc7pzhhs964swgq709j89z9lkydy1y267lbw0mza949h6dx5fv"
sha256 = "1abwb27l8ms7cwdc03wfa51jdqngjdfxdfayjynsvbhw5hp4rxmf"
synopsis = "A string DSL"
version = "1.38"
version = "1.39"
[stty]
dependencies = ["foreigners", "srfi-69"]
@ -3635,9 +3677,9 @@ version = "2.4.2"
[tiny-prolog]
dependencies = ["srfi-69"]
license = "bsd"
sha256 = "0bw1l5vsyw2z3yvv6zlgvzk1hlm16ql6m8gdfd94fk691pvjpnd0"
sha256 = "0zz468zvr7v1dh2sg48kmlq43dbim66md3dv2dchdpzfjg378w8k"
synopsis = "Tiny PROLOG interpreter."
version = "2.0"
version = "2.1"
[tokyocabinet]
dependencies = []
@ -3668,18 +3710,18 @@ synopsis = "tracing and breakpoints"
version = "2.0"
[transducers]
dependencies = ["srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors", "r7rs"]
dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-133", "srfi-146", "srfi-160", "check-errors"]
license = "mit"
sha256 = "080lwlgvqpwdlqjdb71c1i657wq6ax2v4r9117fh83wr8bs3h1j9"
sha256 = "1bz05dy7kjypk85yck3a8h6iji6kkmnb48kpqdqvj9nm0kvg2nwd"
synopsis = "Transducers for working with foldable data types."
version = "0.5.1"
version = "0.5.4"
[transmission]
dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"]
license = "unlicense"
sha256 = "0x94ihhpway5rzsrviwnmzm7h38p1s0np7f59nxp0a99vcy9x2f0"
sha256 = "1483d5kz13zvrqpacvb7lfvc178x3j9236vmdv37ndsvjfy7m6fc"
synopsis = "Transmission RPC"
version = "0.2.2"
version = "0.3.0"
[traversal]
dependencies = ["srfi-1", "vector-lib"]
@ -3810,9 +3852,9 @@ version = "3.6.3"
[uuid-lib]
dependencies = ["record-variants"]
license = "bsd"
sha256 = "1hk5p2yvwq4dx93a1wnxggrbwkh050b6m9jlw44s7xvhxhvdqyns"
sha256 = "16b03b6d29mjn8bcil0ln0vq85dxxvzlxrpnpblf68n7l9ix8qnc"
synopsis = "OSF DCE 1.1 UUID"
version = "0.0.14"
version = "0.0.15"
[uuid]
dependencies = []
@ -3880,9 +3922,9 @@ version = "1.1"
[xj]
dependencies = ["fmt", "html-parser", "srfi-1", "utf8", "brev-separate"]
license = "bsd-3-clause"
sha256 = "0ygznmn4p5df6q7f1m0nv4hz4l5ym3nmm2zp8y3h80piy0cb9c0a"
sha256 = "15a7p9qq33mlxa3h50s142zy9zchpdpkdkx51kfcadh0rbj0x7bi"
synopsis = "Unix filter that turns XML into JSON"
version = "1.28"
version = "1.29"
[xlib]
dependencies = ["matchable", "srfi-13"]
@ -3936,9 +3978,9 @@ version = "0.2"
[zshbrev]
dependencies = ["brev"]
license = "lgplv3"
sha256 = "1id8a728ibi3fzcpfdd7ary41g7nrlb7pc3vjpmz70jp1q53qppx"
sha256 = "1zmb84z22p8gv1bk05x7daqpl5h1z71hpivkyc1wbjfxyymmyaxj"
synopsis = "Access Chicken functions from any shell and access zsh functions from Chicken"
version = "1.20"
version = "1.21"
[zstd]
dependencies = []

View File

@ -57,6 +57,7 @@ in
mdh = addToBuildInputs pkgs.pcre;
# missing dependency in upstream egg
mistie = addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 ]);
mosquitto = addToPropagatedBuildInputs ([ pkgs.mosquitto ]);
nanomsg = addToBuildInputs pkgs.nanomsg;
ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ];
opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ]

View File

@ -0,0 +1,4 @@
import ./common-hadrian.nix {
version = "9.6.4";
sha256 = "10bf25b8b07174fdd9868b5c0c56c17c0ef1edcb6247b4b864be933651bfd4c0";
}

View File

@ -256,7 +256,9 @@ self: super: {
sha256 = "sha256-b7u9GiIAd2xpOrM0MfILHNb6Nt7070lNRIadn2l3DfQ=";
})];
}) super.ConfigFile;
}
# super.ghc is required to break infinite recursion as Nix is strict in the attrNames
// lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && lib.versionOlder super.ghc.version "9.6.4") {
# The NCG backend for aarch64 generates invalid jumps in some situations,
# the workaround on 9.6 is to revert to the LLVM backend (which is used
# for these sorts of situations even on 9.2 and 9.4).

View File

@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
env = lib.optionalAttrs stdenv.cc.isClang {
CXXFLAGS = "-std=c++14";
};
hardeningDisable = [ "format" ];
meta = with lib; {

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "libubox";
version = "unstable-2023-11-28";
version = "unstable-2023-12-18";
src = fetchgit {
url = "https://git.openwrt.org/project/libubox.git";
rev = "e80dc00ee90c29ef56ae28f414b0e5bb361206e7";
hash = "sha256-R4Yz4C63LQTNBKyNyiLMQHfc5KJBPFldP1trmtEBb9U=";
rev = "6339204c212b2c3506554a8842030df5ec6fe9c6";
hash = "sha256-QgpORITt6MYgfzUpaI2T0Ge2a0iVHjDhdYI/nZ2HbJ8=";
};
cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ];

View File

@ -36,14 +36,16 @@ stdenv.mkDerivation rec {
"FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
"FCFLAGS=-fallow-argument-mismatch"
] ++ lib.optionals pmixSupport [
"--with-pmix=${lib.getDev pmix}"
"--with-pmix"
];
enableParallelBuilding = true;
nativeBuildInputs = [ gfortran python3 ];
buildInputs = [ perl openssh hwloc ]
++ lib.optional (!stdenv.isDarwin) ch4backend;
++ lib.optional (!stdenv.isDarwin) ch4backend
++ lib.optional pmixSupport pmix;
doCheck = true;

View File

@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.96.1";
hash = "sha256-HhN3wZEdi9R/KD0nl3+et+94LBJjGLDVqDX8v5qGrqQ=";
version = "3.97";
hash = "sha256-d26v8a+5EkQ6cFg5SZirT4L22AxfIteiUx4I42msyqw=";
}

View File

@ -1,5 +1,7 @@
{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake
, libtool, python3, flex, libevent, hwloc, munge, zlib, pandoc, gitMinimal
, removeReferencesTo, libtool, python3, flex, libevent
, targetPackages, makeWrapper
, hwloc, munge, zlib, pandoc, gitMinimal
} :
stdenv.mkDerivation rec {
@ -14,6 +16,8 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
outputs = [ "out" "dev" ];
postPatch = ''
patchShebangs ./autogen.pl
patchShebangs ./config
@ -28,6 +32,8 @@ stdenv.mkDerivation rec {
flex
gitMinimal
python3
removeReferencesTo
makeWrapper
];
buildInputs = [ libevent hwloc munge zlib ];
@ -46,6 +52,27 @@ stdenv.mkDerivation rec {
postInstall = ''
find $out/lib/ -name "*.la" -exec rm -f \{} \;
moveToOutput "bin/pmix_info" "''${!outputDev}"
moveToOutput "bin/pmixcc" "''${!outputDev}"
moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}"
# The path to the pmixcc-wrapper-data.txt is hard coded and
# points to $out instead of dev. Use wrapper to fix paths.
wrapProgram $dev/bin/pmixcc \
--set PMIX_INCLUDEDIR $dev/include \
--set PMIX_PKGDATADIR $dev/share/pmix
'';
postFixup = ''
# The build info (parameters to ./configure) are hardcoded
# into the library. This clears all references to $dev/include.
remove-references-to -t $dev $(readlink -f $out/lib/libpmix.so)
# Pin the compiler to the current version in a cross compiler friendly way.
# Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \
$dev/share/pmix/pmixcc-wrapper-data.txt
'';
enableParallelBuilding = true;

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "ubus";
version = "unstable-2023-11-28";
version = "unstable-2023-12-18";
src = fetchgit {
url = "https://git.openwrt.org/project/ubus.git";
rev = "f84eb5998c6ea2d34989ca2d3254e56c66139313";
hash = "sha256-5pIovqIeJczWAA9KQPKFnTnGRrIZVdSNdxBR8AEFtO4=";
rev = "65bb027054def3b94a977229fd6ad62ddd32345b";
hash = "sha256-n82Ub0IiuvWbnlDCoN+0hjo/1PbplEbc56kuOYMrHxQ=";
};
cmakeFlags = [ "-DBUILD_LUA=OFF" ];

View File

@ -12,16 +12,16 @@
buildPythonPackage rec {
pname = "aesedb";
version = "0.1.4";
format = "pyproject";
version = "0.1.6";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "skelsec";
repo = pname;
repo = "aesedb";
rev = "refs/tags/${version}";
hash = "sha256-QqPy68rWabRY0Y98W+odwP/10gMtLAQ0Ah2+ZLkqHPI=";
hash = "sha256-nYuMWE03Rsw1XuD/bxccpu8rddeXgS/EKJcO1VBLTLU=";
};
nativeBuildInputs = [

View File

@ -1,20 +1,22 @@
{ lib
, aio-geojson-client
, aiohttp
, aresponses
, aioresponses
, mock
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytest-xdist
, pytestCheckHook
, pytz
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "aio-geojson-geonetnz-volcano";
version = "0.8";
format = "setuptools";
version = "0.9";
pyproject = true;
disabled = pythonOlder "3.7";
@ -22,9 +24,13 @@ buildPythonPackage rec {
owner = "exxamalte";
repo = "python-aio-geojson-geonetnz-volcano";
rev = "refs/tags/v${version}";
hash = "sha256-wJVFjy6QgYb6GX9pZTylYFvCRWmD2lAFZKnodsa8Yqo=";
hash = "sha256-ZmGDO9EROFMlxdj5txNh719M+3l/0jRFbB2h2AyZAdI=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aio-geojson-client
aiohttp
@ -34,9 +40,10 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;
nativeCheckInputs = [
aresponses
aioresponses
mock
pytest-asyncio
pytest-xdist
pytestCheckHook
];
@ -46,7 +53,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds";
homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano";
homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano";
changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];

View File

@ -1,16 +1,18 @@
{ lib
, async-interrupt
, bleak
, bleak-retry-connector
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "airthings-ble";
version = "0.5.6-4";
format = "pyproject";
version = "0.6.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -18,12 +20,12 @@ buildPythonPackage rec {
owner = "vincegio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Ft5A2ZGVH9VHoRDAqDcc0rBfnQRxoXMylCAwUSwmViE=";
hash = "sha256-T+KtB6kPrLahI73W/Bb3A9ws91v4n1EtURgm3RcLzW8=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'bleak-retry-connector = "^0.15.1"' 'bleak = "*"'
--replace "-v -Wdefault --cov=airthings_ble --cov-report=term-missing:skip-covered" ""
'';
nativeBuildInputs = [
@ -31,12 +33,14 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
async-interrupt
bleak
bleak-retry-connector
];
# Module has no tests
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"airthings_ble"

View File

@ -5,12 +5,13 @@
, pytestCheckHook
, pythonOlder
, requests
, setuptools
}:
buildPythonPackage rec {
pname = "aranet4";
version = "2.2.2";
format = "setuptools";
version = "2.2.3";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,9 +19,13 @@ buildPythonPackage rec {
owner = "Anrijs";
repo = "Aranet4-Python";
rev = "refs/tags/v${version}";
hash = "sha256-HiveHkGQUCvG4aqK2HSCbONObidT7yof4LzKSJPEOKU=";
hash = "sha256-Jd7yuddxwRrO7XFQsVGy5vRQxwIUZdwFSjiZZHdkE3g=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
bleak
requests

View File

@ -1,35 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitLab
, fetchFromGitHub
, flit-core
, python
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "asyncinotify";
version = "4.0.2";
format = "pyproject";
version = "4.0.6";
pyproject = true;
src = fetchFromGitLab {
owner = "Taywee";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "absperf";
repo = "asyncinotify";
rev = "v${version}";
hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw=";
rev = "refs/tags/v${version}";
hash = "sha256-RXx6i5dIB2oySVaLoHPRGD9VKgiO5OAXmrzVBq8Ad18=";
};
nativeBuildInputs = [
flit-core
];
checkPhase = ''
${python.pythonOnBuildForHost.interpreter} ${src}/test.py
'';
pythonImportsCheck = ["asyncinotify"];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"asyncinotify"
];
pytestFlagsArray = [
"test.py"
];
meta = with lib; {
description = "A simple optionally-async python inotify library, focused on simplicity of use and operation, and leveraging modern Python features";
homepage = "https://pypi.org/project/asyncinotify/";
changelog = "https://gitlab.com/Taywee/asyncinotify/-/blob/master/CHANGELOG.md";
description = "Module for inotify";
homepage = "https://github.com/absperf/asyncinotify/";
changelog = "https://github.com/absperf/asyncinotify/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ cynerd ];
};

View File

@ -1,8 +1,10 @@
{ lib
, stdenv
, buildPythonPackage
, cargo
, fetchFromGitHub
, frelatage
, libiconv
, maturin
, pytestCheckHook
, pythonOlder
@ -39,6 +41,10 @@ buildPythonPackage rec {
rustc
];
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
];
passthru.optional-dependencies = {
fuzz = [
frelatage

View File

@ -12,7 +12,7 @@
, pyopenssl
, pythonOlder
, requests
, requests_ntlm
, requests-ntlm
, unicrypto
}:
@ -47,7 +47,7 @@ buildPythonPackage rec {
pycryptodome
pyopenssl
requests
requests_ntlm
requests-ntlm
unicrypto
];

View File

@ -23,8 +23,8 @@
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
version = "6.3.0";
format = "pyproject";
version = "6.4.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = "cyclonedx-python-lib";
rev = "refs/tags/v${version}";
hash = "sha256-Q4mz6qNqR7lkZqb70COBkrXsv0+z5TEC149dnSpzhtI=";
hash = "sha256-WPXhla5VGyexZPxq9R86G9CNWuGyn79H+lPDCmWitN0=";
};
nativeBuildInputs = [

View File

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "django-hijack";
version = "3.4.3";
version = "3.4.5";
format = "setuptools";
src = fetchFromGitHub {
owner = "django-hijack";
repo = "django-hijack";
rev = "refs/tags/${version}";
hash = "sha256-D9IyuM+ZsvFZL0nhMt1VQ1DYcKg4CS8FPAgSWLtsXeE=";
hash = "sha256-FXh5OFMTjsKgjEeIS+CiOwyGOs4AisJA+g49rCILDsQ=";
};
postPatch = ''
@ -40,7 +40,7 @@ buildPythonPackage rec {
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-X3bJ6STFq6zGIzXHSd2C67d4kSOVJJR5aBSM3o5T850=";
hash = "sha256-cZEr/7FW4vCR8gpraT+/rPwYK9Xn22b5WH7lnuK5L4U=";
};
nativeBuildInputs = [

View File

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "django-simple-captcha";
version = "0.5.20";
version = "0.6.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-ICcwCae+tEKX6fbHpr0hraPS+pPDFNL2v145TO62opc=";
hash = "sha256-0YhRbTJvrdLVrQduuJZJ1VwCyrr+P9zCFUrBjp9tS5c=";
};
nativeCheckInputs = [

View File

@ -15,16 +15,16 @@
buildPythonPackage rec {
pname = "dvc-render";
version = "1.0.0";
format = "pyproject";
version = "1.0.1";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
repo = "dvc-render";
rev = "refs/tags/${version}";
hash = "sha256-OrfepQuLBNa5m3Sy4NzFOArtFFvaNtNNVJ8DNN3yT6s=";
hash = "sha256-7rmmhf6Y6teoHR8u1+Ce1Xq0rdtC1/MWLXb282OOEnc=";
};
nativeBuildInputs = [

View File

@ -58,7 +58,7 @@
buildPythonPackage rec {
pname = "dvc";
version = "3.40.1";
version = "3.41.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -67,7 +67,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "dvc";
rev = "refs/tags/${version}";
hash = "sha256-ik2WVq7cXhOc9kwBep38HELgvj0CGLtpx5EzzdJzAsc=";
hash = "sha256-j4UkPHav97s5GAuR9yYWaI1ObfKcsyozlTDC9jeBfK4=";
};
pythonRelaxDeps = [

View File

@ -1,21 +1,39 @@
{ lib
, buildPythonPackage
, datasets
, dvc
, dvc-render
, dvc-studio-client
, fastai
, fetchFromGitHub
, funcy
, gto
, jsonargparse
, lightgbm
, lightning
, matplotlib
, mmcv
, numpy
, optuna
, pandas
, pillow
, pytestCheckHook
, pythonOlder
, ruamel-yaml
, scikit-learn
, scmrepo
, setuptools-scm
, tabulate
, tensorflow
, torch
, transformers
, xgboost
}:
buildPythonPackage rec {
pname = "dvclive";
version = "3.5.1";
format = "pyproject";
version = "3.41.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +41,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-QsA8HZ6wIWKvtQ+f3nyRKKZRNJS56eZ1sKw+KNHxfXc=";
hash = "sha256-PbgazRK3+CoJISh1ZXGjxDfbKHY/XqSvVrkpycvPi7c=";
};
nativeBuildInputs = [
@ -32,12 +50,78 @@ buildPythonPackage rec {
propagatedBuildInputs = [
dvc
dvc-render
dvc-studio-client
funcy
gto
ruamel-yaml
scmrepo
];
passthru.optional-dependencies = {
all = [
jsonargparse
lightgbm
lightning
matplotlib
mmcv
numpy
optuna
pandas
pillow
scikit-learn
tensorflow
torch
transformers
xgboost
] ++ jsonargparse.optional-dependencies.signatures;
image = [
numpy
pillow
];
sklearn = [
scikit-learn
];
plots = [
pandas
scikit-learn
numpy
];
markdown = [
matplotlib
];
mmcv = [
mmcv
];
tf = [
tensorflow
];
xgb = [
xgboost
];
lgbm = [
lightgbm
];
huggingface = [
datasets
transformers
];
# catalyst = [
# catalyst
# ];
fastai = [
fastai
];
lightning = [
lightning
torch
jsonargparse
] ++ jsonargparse.optional-dependencies.signatures;
optuna = [
optuna
];
};
# Circular dependency with dvc
doCheck = false;

View File

@ -17,7 +17,7 @@
, pytz
, pyyaml
, requests
, requests_ntlm
, requests-ntlm
, requests-oauthlib
, requests-kerberos
, requests-mock
@ -57,7 +57,7 @@ buildPythonPackage rec {
oauthlib
pygments
requests
requests_ntlm
requests-ntlm
requests-oauthlib
requests-kerberos
tzdata

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "garminconnect";
version = "0.2.12";
version = "0.2.13";
pyproject = true;
disabled = pythonOlder "3.10";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cyberjunky";
repo = "python-garminconnect";
rev = "refs/tags/${version}";
hash = "sha256-uq3biWZvcORvrAMd/Ix0Cj1ol5fiqdDsO54zD82G2vA=";
hash = "sha256-9At9v+7jOt43qPOhZpFYBEXA2zUfp8MAGO4/676kcBU=";
};
nativeBuildInputs = [

View File

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, httpie
, requests_ntlm
, requests-ntlm
}:
buildPythonPackage rec {
@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "b1f757180c0bd60741ea16cf91fc53d47df402a5c287c4a61a14b335ea0552b3";
};
propagatedBuildInputs = [ httpie requests_ntlm ];
propagatedBuildInputs = [ httpie requests-ntlm ];
# Package have no tests
doCheck = false;

View File

@ -0,0 +1,109 @@
{ lib
, argcomplete
, attrs
, buildPythonPackage
, docstring-parser
, fetchFromGitHub
, fsspec
, jsonnet
, jsonschema
, omegaconf
, pydantic
, pytest-subtests
, pytestCheckHook
, pythonOlder
, pyyaml
, reconplogger
, requests
, responses
, ruyaml
, setuptools
, types-pyyaml
, types-requests
, typeshed-client
}:
buildPythonPackage rec {
pname = "jsonargparse";
version = "4.27.2";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "omni-us";
repo = "jsonargparse";
rev = "refs/tags/v${version}";
hash = "sha256-qvc0HpwgYXDayA0q0D598rCb+I3LuaPm2tmmd0E3rrk=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
pyyaml
];
passthru.optional-dependencies = {
all = [
argcomplete
fsspec
jsonnet
jsonschema
omegaconf
ruyaml
docstring-parser
typeshed-client
requests
];
argcomplete = [
argcomplete
];
fsspec = [
fsspec
];
jsonnet = [
jsonnet
# jsonnet-binary
];
jsonschema = [
jsonschema
];
omegaconf = [
omegaconf
];
reconplogger = [
reconplogger
];
ruyaml = [
ruyaml
];
signatures = [
docstring-parser
typeshed-client
];
urls = [
requests
];
};
nativeCheckInputs = [
pytest-subtests
pytestCheckHook
types-pyyaml
types-requests
];
pythonImportsCheck = [
"jsonargparse"
];
meta = with lib; {
description = "Module to mplement minimal boilerplate CLIs derived from various sources";
homepage = "https://github.com/omni-us/jsonargparse";
changelog = "https://github.com/omni-us/jsonargparse/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python-json-logger
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "logmatic-python";
version = "0.1.7";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "logmatic";
repo = "logmatic-python";
rev = "refs/tags/${version}";
hash = "sha256-UYKm00KhXnPQDkKJVm7s0gOwZ3GNY07O0oKbzPhAdVE=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
python-json-logger
];
# Only functional tests, no unit tests
doCheck = false;
pythonImportsCheck = [
"logmatic"
];
meta = with lib; {
description = "Python helpers to send logs to Logmatic.io";
homepage = "https://github.com/logmatic/logmatic-python";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -4,22 +4,27 @@
, msgpack
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "msgspec";
version = "0.18.5";
format = "setuptools";
version = "0.18.6";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "jcrist";
repo = pname;
repo = "msgspec";
rev = "refs/tags/${version}";
hash = "sha256-BcENL1vPCspzYdAHicC5AHs/7xZPWf+Yys37vKgbris=";
hash = "sha256-xqtV60saQNINPMpOnZRSDnicedPSPBUQwPSE5zJGrTo=";
};
nativeBuildInputs = [
setuptools
];
# Requires libasan to be accessible
doCheck = false;

View File

@ -2,13 +2,15 @@
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonAtLeast
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "ndeflib";
version = "0.3.3";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@ -19,6 +21,10 @@ buildPythonPackage rec {
hash = "sha256-cpfztE+/AW7P0J7QeTDfVGYc2gEkr7gzA352hC9bdTM=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];
@ -30,11 +36,14 @@ buildPythonPackage rec {
disabledTests = [
# AssertionError caused due to wrong size
"test_decode_error"
] ++ lib.optionals (pythonAtLeast "3.12") [
"test_encode_error"
];
meta = with lib; {
description = "Python package for parsing and generating NFC Data Exchange Format messages";
homepage = "https://github.com/nfcpy/ndeflib";
changelog = "https://github.com/nfcpy/ndeflib/releases/tag/v${version}";
license = licenses.isc;
maintainers = with maintainers; [ fab ];
};

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "podman";
version = "4.8.2";
version = "4.9.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "containers";
repo = "podman-py";
rev = "refs/tags/v${version}";
hash = "sha256-XJ+KD3HM+Sygq8Oxht80G9DnZadvR3fFyXrJsWny65g=";
hash = "sha256-fLuWOfv4kW5a9h658s8pBgXsBfcYdkXNp9+bWtgKHv8=";
};
nativeBuildInputs = [

View File

@ -11,16 +11,16 @@
buildPythonPackage rec {
pname = "py-serializable";
version = "0.17.1";
version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "madpah";
repo = "serializable";
rev = "refs/tags/v${version}";
hash = "sha256-G7bIsvWdL4qVg4akJ2KtXVS10DiJSFUYEzyQSp9ry9o=";
hash = "sha256-7WYe3X4wVUC7HyYoCVQYWm61C+J3r91Ci8IHNeWBTVE=";
};
nativeBuildInputs = [
@ -50,7 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Pythonic library to aid with serialisation and deserialisation to/from JSON and XML";
homepage = "https://github.com/madpah/serializable";
changelog = "https://github.com/madpah/serializable/blob/${version}/CHANGELOG.md";
changelog = "https://github.com/madpah/serializable/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};

View File

@ -6,23 +6,28 @@
, pytestCheckHook
, pythonOlder
, pyyaml
, setuptools
, toml
}:
buildPythonPackage rec {
pname = "pydeps";
version = "1.12.17";
format = "setuptools";
version = "1.12.18";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "thebjorn";
repo = pname;
repo = "pydeps";
rev = "refs/tags/v${version}";
hash = "sha256-DVSZeNuDz/y0jh/HimV+jFgNFevMhUKOu6EhZytMMqQ=";
hash = "sha256-89RrAf09n42mRiWOUdHFNP4JoCP9bXMofkISyVqd+4I=";
};
nativeBuildInputs = [
setuptools
];
buildInputs = [
graphviz
];

View File

@ -7,32 +7,32 @@
, pycryptodome
, pydantic
, pythonOlder
, pythonRelaxDepsHook
, setuptools
}:
buildPythonPackage rec {
pname = "pykoplenti";
version = "1.2.2";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "stegm";
repo = pname;
repo = "pykoplenti";
rev = "refs/tags/v${version}";
hash = "sha256-2sGkHCIGo1lzLurvQBmq+16sodAaK8v+mAbIH/Gd3+E=";
};
nativeBuildInputs = [
setuptools
pythonRelaxDeps = [
"pydantic"
];
postPatch = ''
# remove with 1.1.0
substituteInPlace setup.cfg \
--replace 'version = unreleased' 'version = ${version}'
'';
nativeBuildInputs = [
pythonRelaxDepsHook
setuptools
];
propagatedBuildInputs = [
aiohttp
@ -50,11 +50,14 @@ buildPythonPackage rec {
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pykoplenti" ];
pythonImportsCheck = [
"pykoplenti"
];
meta = with lib; {
description = "Python REST client API for Kostal Plenticore Inverters";
homepage = "https://github.com/stegm/pykoplenti/";
changelog = "https://github.com/stegm/pykoplenti/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "python-kasa";
version = "0.6.0";
version = "0.6.0.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "python-kasa";
repo = "python-kasa";
rev = "refs/tags/${version}";
hash = "sha256-JFd9Ka/96Y4nu2HnL/Waf5EBKb06+7rZdI72F8G472I=";
hash = "sha256-Vx2ZRcm/Ob0oWB/Th7hF4ctppWoeeNiqKGjYVNsidrE=";
};
nativeBuildInputs = [

View File

@ -5,7 +5,7 @@
, mock
, pytestCheckHook
, requests
, requests_ntlm
, requests-ntlm
, six
, xmltodict
}:
@ -24,7 +24,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
requests_ntlm
requests-ntlm
six
xmltodict
];

View File

@ -6,7 +6,7 @@
, nest-asyncio
, qiskit-terra
, requests
, requests_ntlm
, requests-ntlm
, websocket-client
# Visualization inputs
, withVisualization ? true
@ -57,7 +57,7 @@ buildPythonPackage rec {
nest-asyncio
qiskit-terra
requests
requests_ntlm
requests-ntlm
websocket-client
websockets
] ++ lib.optionals withVisualization visualizationPackages;

View File

@ -0,0 +1,63 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flask
, logmatic-python
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, setuptools
, testfixtures
}:
buildPythonPackage rec {
pname = "reconplogger";
version = "4.13.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "omni-us";
repo = "reconplogger";
rev = "refs/tags/v${version}";
hash = "sha256-eqo26u99nTO/8kgG9nqeVArWJiwP4wqkcisAju8vOPs=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
logmatic-python
pyyaml
];
passthru.optional-dependencies = {
all = [
flask
requests
];
};
nativeCheckInputs = [
pytestCheckHook
testfixtures
];
pythonImportsCheck = [
"reconplogger"
];
pytestFlagsArray = [
"reconplogger_tests.py"
];
meta = with lib; {
description = "Module to ease the standardization of logging within omni:us";
homepage = "https://github.com/omni-us/reconplogger";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, python
}:
buildPythonPackage rec {
@ -16,6 +15,12 @@ buildPythonPackage rec {
hash = "sha256-5CkUax7dGYssqTSiBGplZWxdMbDsiUu9YFUSf03q/xc=";
};
# AttributeError: 'Keccak_224Tests' object has no attribute 'failIf'.
postPatch = ''
substituteInPlace tests.py \
--replace "failIf" "assertFalse"
'';
pythonImportsCheck = [
"sha3"
];

View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "scmrepo";
version = "2.0.3";
version = "2.0.4";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-P+Mbf8adSvQPkUgnTSPrqzvHc6lR0ns2mJ0/x9YGPKs=";
hash = "sha256-gBGfL6Xet7ASdwRTFJ5nHpyeXi/pqlrL9o5nC3m48hk=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, importlib-resources
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "typeshed-client";
version = "2.4.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "JelleZijlstra";
repo = "typeshed_client";
rev = "refs/tags/v${version}";
hash = "sha256-g3FECKebKeM3JPWem6+Y9T27PcAxVxj1SiBd5siLSJ4=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
importlib-resources
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"typeshed_client"
];
pytestFlagsArray = [
"tests/test.py"
];
meta = with lib; {
description = "Retrieve information from typeshed and other typing stubs";
homepage = "https://github.com/JelleZijlstra/typeshed_client";
changelog = "https://github.com/JelleZijlstra/typeshed_client/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.1.67";
version = "3.1.69";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-mwXR4KEkbkvWIwqeHuQPgm+8W7EdBtAwcBkFx0YFlhs=";
hash = "sha256-hA0GmCNsds/dkSJ5PZYPiz1lsaISs62jb000k17aqAM=";
};
patches = [

View File

@ -17,20 +17,20 @@ let
}.${system} or (throw "Unsupported system: ${system}");
packageHash = {
x86_64-linux = "sha256-Fp1h1X5UFOHLqgaAcXXl3oSioCMVLJLaOURHd3uu8sA=";
aarch64-linux = "sha256-F6/h98qZvzImuxPOMYr1cGWBjr1qWGvoYztvZzw2GRg=";
x86_64-darwin = "sha256-WegiHPHi9Qw4PPTEB2a9AdIgMlyOzzSpTRdJH43IEjM=";
aarch64-darwin = "sha256-BJER3Fp4AItqtLNYh6pH/tNB98H3iTARr3fKyTXGcP8=";
x86_64-linux = "sha256-i06Zp176zl7y8P32Hss64QkMc/+vXtkQy/tkOPSX3dc=";
aarch64-linux = "sha256-HEm3TaLeaws8G73CU9BmxeplQdeF9nQbBSnbctaVhqI=";
x86_64-darwin = "sha256-mlshpN/4Od4qrXiqIEYo7G84Dtb+tp2nK2VnrRG2rto=";
aarch64-darwin = "sha256-aJH/vOidj0vbkttGDgelaAC/dMYguQPLjxl+V3pOVzI=";
}.${system} or (throw "Unsupported system: ${system}");
in stdenv.mkDerivation rec {
pname = "fermyon-spin";
version = "1.2.1";
version = "2.1.0";
src = fetchzip {
url = "https://github.com/fermyon/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz";
stripRoot = false;
sha256 = packageHash;
hash = packageHash;
};
nativeBuildInputs = lib.optionals stdenv.isLinux [

View File

@ -1,102 +1,60 @@
{ lib
, stdenv
, fetchurl
, makeWrapper
, python3
, jdk
}:
stdenv.mkDerivation rec {
let
timestamp = "202401111522";
in
stdenv.mkDerivation (finalAttrs: {
pname = "jdt-language-server";
version = "1.26.0";
timestamp = "202307271613";
version = "1.31.0";
src = fetchurl {
url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz";
sha256 = "sha256-ul/l7jsqg5UofiSu8gzm4Xg0z46HcRfmyqysamiKbFM=";
url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
hash = "sha256-bCX2LQt00d2SqxmvuvvlBB6wbCuFPqtX9/Qv5v6wH3w=";
};
sourceRoot = ".";
buildInputs = [
jdk
# Used for the included wrapper
python3
];
nativeBuildInputs = [
makeWrapper
];
postPatch = ''
# We store the plugins, config, and features folder in different locations
# than in the original package. In addition, hard-code the path to the jdk
# in the wrapper, instead of searching for it in PATH at runtime.
substituteInPlace bin/jdtls.py \
--replace "jdtls_base_path = Path(__file__).parent.parent" "jdtls_base_path = Path(\"$out/share/java/jdtls/\")" \
--replace "java_executable = get_java_executable(known_args.validate_java_version)" "java_executable = '${lib.getExe jdk}'"
'';
installPhase =
let
# The application ships with config directories for linux and mac
# The application ships with different config directories for each platform.
# Note the application come with ARM variants as well, although the
# current included wrapper doesn't use them.
configDir = if stdenv.isDarwin then "config_mac" else "config_linux";
in
''
# Copy jars
install -D -t $out/share/java/plugins/ plugins/*.jar
# Copy config directories for linux and mac
install -Dm 444 -t $out/share/config ${configDir}/*
# Get latest version of launcher jar
# e.g. org.eclipse.equinox.launcher_1.5.800.v20200727-1323.jar
launcher="$(ls $out/share/java/plugins/org.eclipse.equinox.launcher_* | sort -V | tail -n1)"
# The wrapper script will create a directory in the user's cache, copy in the config
# files since this dir can't be read-only, and by default use this as the runtime dir.
#
# The following options are required as per the upstream documentation:
#
# -Declipse.application=org.eclipse.jdt.ls.core.id1
# -Dosgi.bundles.defaultStartLevel=4
# -Declipse.product=org.eclipse.jdt.ls.core.product
# --add-modules=ALL-SYSTEM
# --add-opens java.base/java.util=ALL-UNNAMED
# --add-opens java.base/java.lang=ALL-UNNAMED
#
# The following options configure the server to run without writing logs to the nix store:
#
# -Dosgi.sharedConfiguration.area.readOnly=true
# -Dosgi.checkConfiguration=true
# -Dosgi.configuration.cascaded=true
# -Dosgi.sharedConfiguration.area=$out/share/config
#
# Other options which the caller may change:
#
# -Dlog.level:
# Log level.
# This can be overidden by setting JAVA_OPTS.
#
# The caller must specify the following:
#
# -data:
# The application stores runtime data here. We set this to <cache-dir>/$PWD
# so that projects don't collide with each other.
# This can be overidden by specifying -configuration to the wrapper.
#
# Java options, such as -Xms and Xmx can be specified by setting JAVA_OPTS.
#
makeWrapper ${jdk}/bin/java $out/bin/jdt-language-server \
--add-flags "-Declipse.application=org.eclipse.jdt.ls.core.id1" \
--add-flags "-Dosgi.bundles.defaultStartLevel=4" \
--add-flags "-Declipse.product=org.eclipse.jdt.ls.core.product" \
--add-flags "-Dosgi.sharedConfiguration.area=$out/share/config" \
--add-flags "-Dosgi.sharedConfiguration.area.readOnly=true" \
--add-flags "-Dosgi.checkConfiguration=true" \
--add-flags "-Dosgi.configuration.cascaded=true" \
--add-flags "-Dlog.level=ALL" \
--add-flags "\$JAVA_OPTS" \
--add-flags "-jar $launcher" \
--add-flags "--add-modules=ALL-SYSTEM" \
--add-flags "--add-opens java.base/java.util=ALL-UNNAMED" \
--add-flags "--add-opens java.base/java.lang=ALL-UNNAMED"
''
install -Dm444 -t $out/share/java/jdtls/plugins/ plugins/*
install -Dm444 -t $out/share/java/jdtls/features/ features/*
install -Dm444 -t $out/share/java/jdtls/${configDir} ${configDir}/*
install -Dm555 -t $out/bin bin/jdtls
install -Dm444 -t $out/bin bin/jdtls.py
'';
meta = with lib; {
meta = {
homepage = "https://github.com/eclipse/eclipse.jdt.ls";
description = "Java language server";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.epl20;
maintainers = with maintainers; [ matt-snider ];
platforms = platforms.all;
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.epl20;
maintainers = with lib.maintainers; [ matt-snider ];
platforms = lib.platforms.all;
mainProgram = "jdtls";
};
}
})

View File

@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "openttd-nml";
version = "0.7.1";
version = "0.7.4";
src = fetchFromGitHub {
owner = "OpenTTD";
repo = "nml";
rev = "refs/tags/${version}";
hash = "sha256-+TJZ6/JazxzXyKawFE4GVh0De1LTUI95vXQwryJ2NDk=";
hash = "sha256-7Q1H8BkLnVWoZU6/mdfgBPsMt9L7oLZK8GOvbw9TpzU=";
};
propagatedBuildInputs = with python3.pkgs; [

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "libnl-tiny";
version = "unstable-2023-07-27";
version = "unstable-2023-12-05";
src = fetchgit {
url = "https://git.openwrt.org/project/libnl-tiny.git";
rev = "bc92a280186f9becc53c0f17e4e43cfbdeec7e7b";
hash = "sha256-/d6so8hfBOyp8NbUhPZ0aRj6gXO/RLgwCQnAT7N/rF8=";
rev = "965c4bf49658342ced0bd6e7cb069571b4a1ddff";
hash = "sha256-kegTV7FXMERW7vjRZo/Xp4cbSBZmynBgge2lK71Fx94=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rdma-core";
version = "49.0";
version = "49.1";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${finalAttrs.version}";
hash = "sha256-4095U7fLIvixUY3K6l0iFJh7oWwwKAX/WcD3ziqdsLg=";
hash = "sha256-fAEHugGRlrn0rRazyeC649H4vc0V3dqTTSDAo1HY22A=";
};
strictDeps = true;

View File

@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
prePatch = ''
substituteInPlace src/common/env.c \
--replace "/bin/echo" "${coreutils}/bin/echo"
# Autoconf does not support split packages for pmix (libs and headers).
# Fix the path to the pmix libraries, so dlopen can find it.
substituteInPlace src/plugins/mpi/pmix/mpi_pmix.c \
--replace 'xstrfmtcat(full_path, "%s/", PMIXP_LIBPATH)' \
'xstrfmtcat(full_path, "${lib.getLib pmix}/lib/")'
'' + (lib.optionalString enableX11 ''
substituteInPlace src/common/x11_util.c \
--replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
@ -68,7 +75,7 @@ stdenv.mkDerivation rec {
"--with-yaml=${lib.getDev libyaml}"
"--with-ofed=${lib.getDev rdma-core}"
"--sysconfdir=/etc/slurm"
"--with-pmix=${pmix}"
"--with-pmix=${lib.getDev pmix}"
"--with-bpf=${libbpf}"
"--without-rpath" # Required for configure to pick up the right dlopen path
] ++ (optional enableGtk2 "--disable-gtktest")

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "limesurvey";
version = "6.1.2+230606";
version = "6.4.1+240108";
src = fetchFromGitHub {
owner = "LimeSurvey";
repo = "LimeSurvey";
rev = version;
hash = "sha256-a89Kdr9XV1TSCoWxYrU0j8ec7rAcIlU/bgLtRjdzqbg=";
hash = "sha256-Cpf8X6igF7LdRbFihGudFmx/8aY0Kf0BE7jHnEF1DYA=";
};
phpConfig = writeText "config.php" ''

View File

@ -1,66 +0,0 @@
{ stdenv
, lib
, fetchFromSourcehut
, gitUpdater
, hare
, hareThirdParty
}:
stdenv.mkDerivation rec {
pname = "bonsai";
version = "1.0.2";
src = fetchFromSourcehut {
owner = "~stacyharper";
repo = "bonsai";
rev = "v${version}";
hash = "sha256-Yosf07KUOQv4O5111tLGgI270g0KVGwzdTPtPOsTcP8=";
};
postPatch = ''
substituteInPlace Makefile \
--replace 'hare build' 'hare build $(HARE_TARGET_FLAGS)'
'';
nativeBuildInputs = [
hare
];
buildInputs = with hareThirdParty; [
hare-ev
hare-json
];
env.HARE_TARGET_FLAGS =
if stdenv.hostPlatform.isAarch64 then
"-a aarch64"
else if stdenv.hostPlatform.isRiscV64 then
"-a riscv64"
else if stdenv.hostPlatform.isx86_64 then
"-a x86_64"
else
"";
# TODO: hare setup-hook is supposed to do this for us.
# It does it correctly for native compilation, but not cross compilation: wrong offset?
env.HAREPATH = with hareThirdParty; "${hare-json}/src/hare/third-party:${hare-ev}/src/hare/third-party";
preConfigure = ''
export HARECACHE=$(mktemp -d)
'';
installFlags = [ "PREFIX=$(out)" ];
doCheck = true;
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = with lib; {
description = "Finite State Machine structured as a tree";
homepage = "https://git.sr.ht/~stacyharper/bonsai";
license = licenses.agpl3;
maintainers = with maintainers; [ colinsane ];
platforms = platforms.linux;
};
}

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "mbuffer";
version = "20231216";
version = "20240107";
src = fetchurl {
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
sha256 = "sha256-Sif2YhoG5/PdGohGR51rIuMhJgPzv4JaDoyTlAv3aJw=";
sha256 = "sha256-14YG4X3ZAmpTI21ezAenAgLSZC0X49kHRxzbWKBFiBQ=";
};
buildInputs = [

File diff suppressed because it is too large Load Diff

View File

@ -1,29 +1,24 @@
{ fetchFromGitHub, lib, rustPlatform, pkg-config, openssl, stdenv, Security }:
{ fetchFromGitHub, lib, rustPlatform, pkg-config, openssl, stdenv, Security, SystemConfiguration }:
rustPlatform.buildRustPackage rec {
pname = "vrc-get";
version = "1.3.0";
version = "1.5.2";
src = fetchFromGitHub {
owner = "anatawa12";
repo = pname;
rev = "v${version}";
hash = "sha256-FCLIc5c+50qGpBEbJ4bUSNAfQVdpeswNwiWrVcO91zI=";
hash = "sha256-DTiYyTZKYNprQSsAjHmpGdnS6dkXa3hSRGmIiLT/xr8=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
# Make openssl-sys use pkg-config.
OPENSSL_NO_VENDOR = 1;
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"async_zip-0.0.15" = "sha256-UXBVZy3nf20MUh9jQdYeS5ygrZfeRWtiNRtiyMvkdSs=";
};
};
cargoHash = "sha256-4bhle98/zfw1uGNx+m1/4H9n63DnIezg/ZdV+zj0JNA=";
meta = with lib; {
description = "Command line client of VRChat Package Manager, the main feature of VRChat Creator Companion (VCC)";

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "uqmi";
version = "unstable-2023-10-30";
version = "unstable-2024-01-16";
src = fetchgit {
url = "https://git.openwrt.org/project/uqmi.git";
rev = "eea292401c388a4eb59c0caf5d00aa046c6059f4";
hash = "sha256-Uz5GjGcSKatbii09CsvzsYMz8Vm+Am4RUeCZuFIK1Ag=";
rev = "c3488b831ce6285c8107704156b9b8ed7d59deb3";
hash = "sha256-O5CeLk0WYuBs3l5xBUk9kXDRMzFvYSRoqP28KJ5Ztos=";
};
postPatch = ''

View File

@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
pypsrp
pywerview
requests
requests_ntlm
requests-ntlm
termcolor
terminaltables
xmltodict

View File

@ -1754,8 +1754,6 @@ with pkgs;
bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { };
bonsai = callPackage ../tools/misc/bonsai { };
cie-middleware-linux = callPackage ../tools/security/cie-middleware-linux { };
cidrgrep = callPackage ../tools/text/cidrgrep { };
@ -2151,7 +2149,7 @@ with pkgs;
vprof = with python3Packages; toPythonApplication vprof;
vrc-get = callPackage ../tools/misc/vrc-get {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
vrrtest = callPackage ../tools/video/vrrtest { };
@ -33887,7 +33885,7 @@ with pkgs;
mm-common = callPackage ../development/libraries/mm-common { };
mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { };
mpc-qt = qt6Packages.callPackage ../applications/video/mpc-qt { };
mplayer = callPackage ../applications/video/mplayer ({
libdvdnav = libdvdnav_4_2_1;

View File

@ -24,6 +24,7 @@ let
"ghc948"
"ghc96"
"ghc963"
"ghc964"
"ghc98"
"ghc981"
"ghcHEAD"
@ -278,7 +279,25 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
llvmPackages = pkgs.llvmPackages_15;
};
ghc96 = compiler.ghc963;
ghc964 = callPackage ../development/compilers/ghc/9.6.4.nix {
bootPkgs =
# For GHC 9.2 no armv7l bindists are available.
if stdenv.hostPlatform.isAarch32 then
packages.ghc928
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
packages.ghc928
else
packages.ghc924Binary;
inherit (buildPackages.python3Packages) sphinx;
# Need to use apple's patched xattr until
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# Support range >= 11 && < 16
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
llvmPackages = pkgs.llvmPackages_15;
};
ghc96 = compiler.ghc964;
ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix {
# No bindist packaged for 9.4.* yet
bootPkgs = packages.ghc947;
@ -421,7 +440,12 @@ in {
ghc = bh.compiler.ghc963;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
};
ghc96 = packages.ghc963;
ghc964 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc964;
ghc = bh.compiler.ghc964;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
};
ghc96 = packages.ghc964;
ghc981 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc981;
ghc = bh.compiler.ghc981;

View File

@ -430,6 +430,7 @@ mapAliases ({
repoze_sphinx_autointerface = repoze-sphinx-autointerface; # added 2023-11-11
repoze_who = repoze-who; # added 2023-11-11
requests_download = requests-download; # added 2024-01-07
requests_ntlm = requests-ntlm; # added 2024-01-07
requests_oauthlib = requests-oauthlib; # added 2022-02-12
requests_toolbelt = requests-toolbelt; # added 2017-09-26
restructuredtext_lint = restructuredtext-lint; # added 2023-11-04

View File

@ -5875,6 +5875,8 @@ self: super: with self; {
json5 = callPackage ../development/python-modules/json5 { };
jsonargparse = callPackage ../development/python-modules/jsonargparse { };
jsonconversion = callPackage ../development/python-modules/jsonconversion { };
jsondate = callPackage ../development/python-modules/jsondate { };
@ -6641,6 +6643,8 @@ self: super: with self; {
logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { };
logmatic-python = callPackage ../development/python-modules/logmatic-python { };
logster = callPackage ../development/python-modules/logster { };
loguru = callPackage ../development/python-modules/loguru { };
@ -12464,6 +12468,8 @@ self: super: with self; {
recommonmark = callPackage ../development/python-modules/recommonmark { };
reconplogger = callPackage ../development/python-modules/reconplogger { };
recordlinkage = callPackage ../development/python-modules/recordlinkage { };
recurring-ical-events = callPackage ../development/python-modules/recurring-ical-events { };
@ -12566,7 +12572,7 @@ self: super: with self; {
requests-mock = callPackage ../development/python-modules/requests-mock { };
requests_ntlm = callPackage ../development/python-modules/requests_ntlm { };
requests-ntlm = callPackage ../development/python-modules/requests-ntlm { };
requests-oauthlib = callPackage ../development/python-modules/requests-oauthlib { };
@ -15556,6 +15562,8 @@ self: super: with self; {
typesentry = callPackage ../development/python-modules/typesentry { };
typeshed-client = callPackage ../development/python-modules/typeshed-client { };
typesystem = callPackage ../development/python-modules/typesystem { };
typical = callPackage ../development/python-modules/typical { };

View File

@ -71,6 +71,7 @@ let
ghc947
ghc948
ghc963
ghc964
ghc981
];