Merge remote-tracking branch 'origin/master' into haskell-updates

This commit is contained in:
sternenseemann 2024-01-23 21:05:45 +01:00
commit c0e251a92c
166 changed files with 4256 additions and 1045 deletions

13
.github/CODEOWNERS vendored
View File

@ -20,7 +20,7 @@
# Libraries # Libraries
/lib @infinisil /lib @infinisil
/lib/systems @alyssais @ericson2314 @amjoseph-nixpkgs /lib/systems @alyssais @ericson2314
/lib/generators.nix @infinisil @Profpatsch /lib/generators.nix @infinisil @Profpatsch
/lib/cli.nix @infinisil @Profpatsch /lib/cli.nix @infinisil @Profpatsch
/lib/debug.nix @infinisil @Profpatsch /lib/debug.nix @infinisil @Profpatsch
@ -41,10 +41,10 @@
/pkgs/top-level/stage.nix @Ericson2314 /pkgs/top-level/stage.nix @Ericson2314
/pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/splice.nix @Ericson2314
/pkgs/top-level/release-cross.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314
/pkgs/stdenv/generic @Ericson2314 @amjoseph-nixpkgs /pkgs/stdenv/generic @Ericson2314
/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @piegamesde /pkgs/stdenv/generic/check-meta.nix @Ericson2314 @piegamesde
/pkgs/stdenv/cross @Ericson2314 @amjoseph-nixpkgs /pkgs/stdenv/cross @Ericson2314
/pkgs/build-support/cc-wrapper @Ericson2314 @amjoseph-nixpkgs /pkgs/build-support/cc-wrapper @Ericson2314
/pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/bintools-wrapper @Ericson2314
/pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314
/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
@ -157,7 +157,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius
/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda /doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
# C compilers # C compilers
/pkgs/development/compilers/gcc @amjoseph-nixpkgs /pkgs/development/compilers/gcc
/pkgs/development/compilers/llvm @RaitoBezarius /pkgs/development/compilers/llvm @RaitoBezarius
/pkgs/development/compilers/emscripten @raitobezarius /pkgs/development/compilers/emscripten @raitobezarius
/doc/languages-frameworks/emscripten.section.md @raitobezarius /doc/languages-frameworks/emscripten.section.md @raitobezarius
@ -340,9 +340,6 @@ nixos/tests/zfs.nix @raitobezarius
/pkgs/development/compilers/zig @figsoda /pkgs/development/compilers/zig @figsoda
/doc/hooks/zig.section.md @figsoda /doc/hooks/zig.section.md @figsoda
# Linux Kernel
pkgs/os-specific/linux/kernel/manual-config.nix @amjoseph-nixpkgs
# Buildbot # Buildbot
nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq
nixos/tests/buildbot.nix @Mic92 @zowoq nixos/tests/buildbot.nix @Mic92 @zowoq

View File

@ -12388,6 +12388,12 @@
fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9"; fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9";
}]; }];
}; };
mistydemeo = {
email = "misty@axo.dev";
github = "mistydemeo";
githubId = 780485;
name = "Misty De Méo";
};
misuzu = { misuzu = {
email = "bakalolka@gmail.com"; email = "bakalolka@gmail.com";
github = "misuzu"; github = "misuzu";

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). - [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} ## Backward Incompatibilities {#sec-release-24.05-incompatibilities}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@ -81,6 +83,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- Invidious has changed its default database username from `kemal` to `invidious`. Setups involving an externally provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857) - Invidious has changed its default database username from `kemal` to `invidious`. Setups involving an externally provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857)
- `inetutils` now has a lower priority to avoid shadowing the commonly used `util-linux`. If one wishes to restore the default priority, simply use `lib.setPrio 5 inetutils` or override with `meta.priority = 5`.
- `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`. - `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`.
- The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead. - The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead.

View File

@ -832,6 +832,7 @@
./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-dash.nix
./services/monitoring/riemann-tools.nix ./services/monitoring/riemann-tools.nix
./services/monitoring/riemann.nix ./services/monitoring/riemann.nix
./services/monitoring/rustdesk-server.nix
./services/monitoring/scollector.nix ./services/monitoring/scollector.nix
./services/monitoring/smartd.nix ./services/monitoring/smartd.nix
./services/monitoring/snmpd.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

@ -136,7 +136,6 @@ sub GetFs {
chomp $fs; chomp $fs;
my @fields = split / /, $fs; my @fields = split / /, $fs;
my $mountPoint = $fields[4]; my $mountPoint = $fields[4];
next unless -d $mountPoint;
my @mountOptions = split /,/, $fields[5]; my @mountOptions = split /,/, $fields[5];
# Skip the optional fields. # Skip the optional fields.
@ -155,6 +154,11 @@ sub GetFs {
# Is it better than our current match? # Is it better than our current match?
if (length($mountPoint) > length($bestFs->mount)) { if (length($mountPoint) > length($bestFs->mount)) {
# -d performs a stat, which can hang forever on network file systems,
# so we only make this call last, when it's likely that this is the mount point we need.
next unless -d $mountPoint;
$bestFs = Fs->new(device => $device, type => $fsType, mount => $mountPoint); $bestFs = Fs->new(device => $device, type => $fsType, mount => $mountPoint);
} }
} }

View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: { import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "dolibarr"; name = "dolibarr";
meta.maintainers = [ lib.maintainers.raitobezarius ]; meta.maintainers = [ ];
nodes.machine = nodes.machine =
{ ... }: { ... }:

View File

@ -1,6 +1,4 @@
{ pkgs { pkgs, ... }:
, testers
, ... }:
let let
inherit (pkgs) lib; inherit (pkgs) lib;
@ -21,7 +19,7 @@ let
passthru.override = args': testsForPackage (args // args'); passthru.override = args': testsForPackage (args // args');
}; };
testLegacyNetwork = { nixopsPkg, ... }: testers.nixosTest ({ testLegacyNetwork = { nixopsPkg, ... }: pkgs.testers.nixosTest ({
name = "nixops-legacy-network"; name = "nixops-legacy-network";
nodes = { nodes = {
deployer = { config, lib, nodes, pkgs, ... }: { deployer = { config, lib, nodes, pkgs, ... }: {

View File

@ -13,14 +13,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "qpwgraph"; pname = "qpwgraph";
version = "0.6.1"; version = "0.6.2";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";
owner = "rncbc"; owner = "rncbc";
repo = "qpwgraph"; repo = "qpwgraph";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-oB8/q0igSZoaDzKzgmGAECU0qJwO67t9qWw+fB2vfxg="; sha256 = "sha256-GlXUQz7tj7dfxVikvu0idzhQaq7raFC9jxJ2zFeHBQU=";
}; };
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

View File

@ -8,13 +8,13 @@
buildGoModule rec { buildGoModule rec {
pname = "op-geth"; pname = "op-geth";
version = "1.101305.0"; version = "1.101305.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ethereum-optimism"; owner = "ethereum-optimism";
repo = "op-geth"; repo = "op-geth";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-6Q36iTqYEY1sXt7K8UR8YFT/wvjzz+NzzpM5WgfhxFg="; hash = "sha256-4dsHYyoCkGGu68PiLw37y5yN5kNHroMruIIbnxl4uJE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -8,7 +8,7 @@
let let
pname = "trezor-suite"; pname = "trezor-suite";
version = "23.12.3"; version = "24.1.2";
name = "${pname}-${version}"; name = "${pname}-${version}";
suffix = { suffix = {
@ -19,8 +19,8 @@ let
src = fetchurl { src = fetchurl {
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
aarch64-linux = "sha512-miD4SzLzETW+2cLj2VwRy9ZuL8nTw8kKG1uU9EmLRJPukyhY9Od3yeMmxztEafodqE7wv6TxEx4Fi/XIbyC2lQ=="; aarch64-linux = "sha512-/D3mwyF00YWgDVq0GNDyegc8mLF63cxCOe/vnpGyLz9/Oj5aBl3oG32cj+c8e11+eHYigkKb72nFz5zBoPx8Bw==";
x86_64-linux = "sha512-IZZmRaWU0POy+Ufx6Ct4/fLzRy+NbSmI+YqdMZd9uTUh0jhPf3BQ2JLwANlUUFZzM+USSTUCjFl0PQ4QQpjI6Q=="; x86_64-linux = "sha512-ehIIOksVzKLGYs6GNZ8w5XvellFRb9sHVORS7MOXmwbbikjgkNX/nlfjwmUKOysxI4PwPzIbqtuX2GYyC9lXHw==";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
}; };

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config , pkg-config
, wrapGAppsHook , wrapGAppsHook
, libX11, libXv , libX11, libXv
@ -36,6 +36,14 @@ stdenv.mkDerivation {
# be set to $out, so this will result in the .app ending up in the # be set to $out, so this will result in the .app ending up in the
# Applications directory in the current nix profile. # Applications directory in the current nix profile.
./macos-copy-app-to-prefix.patch ./macos-copy-app-to-prefix.patch
# Fix build against gcc-13:
# https://github.com/DerKoun/bsnes-hd/pull/124
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/DerKoun/bsnes-hd/commit/587e496f667970d60b6ea29976c171da1681388e.patch";
hash = "sha256-7KBXh8b4xGTzgV2Pt8B1eFZHOaXcCKXKzqGOf0rFG0c=";
})
]; ];
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]

View File

@ -4,11 +4,11 @@
lib, lib,
}: let }: let
pname = "upscayl"; pname = "upscayl";
version = "2.9.5"; version = "2.9.8";
src = fetchurl { src = fetchurl {
url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
hash = "sha256-zEqdHWfMbxdOoZ3NfvOPZL0osrFVMxFN32gXfEjbKLs="; hash = "sha256-hLK9AX87WbJdKTV/rzEzNeaUWeDz1+bvp/R2LkjHp+w=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View File

@ -1,5 +1,5 @@
{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libepoxy, libXi, libX11, libXext, libXrender , libepoxy, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile , libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages , libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages
, openvdb, libXxf86vm, tbb, alembic , openvdb, libXxf86vm, tbb, alembic
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: rec {
] ]
++ lib.optionals waylandSupport [ pkg-config ]; ++ lib.optionals waylandSupport [ pkg-config ];
buildInputs = buildInputs =
[ boost ffmpeg gettext glew ilmbase [ boost ffmpeg gettext glew
freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp
opencolorio openexr openimageio openjpeg python zlib zstd fftw fftwFloat jemalloc opencolorio openexr openimageio openjpeg python zlib zstd fftw fftwFloat jemalloc
alembic alembic
@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: rec {
"-DOPTIX_ROOT_DIR=${optix}" "-DOPTIX_ROOT_DIR=${optix}"
]; ];
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
# Since some dependencies are built with gcc 6, we need gcc 6's # Since some dependencies are built with gcc 6, we need gcc 6's
# libstdc++ in our RPATH. Sigh. # libstdc++ in our RPATH. Sigh.

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "hcl2json"; pname = "hcl2json";
version = "0.6.0"; version = "0.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tmccombs"; owner = "tmccombs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-XdPRata9B8cK58eyAKxEBBwKAum+z0yoGgUGSkmhXfw="; sha256 = "sha256-6DCxpnTizTg3uhHIIze2IyA8IKcjIv44XoId7exdQZI=";
}; };
vendorHash = "sha256-F7G8K0tfXyLHQgqd2PE9eRXlhkFgijAO9LKKj9mvvwc="; vendorHash = "sha256-Ay6Sgdm7X+NxtLkFM0AT8aoWLdASjUhcidRUiV2K+us=";
subPackages = [ "." ]; subPackages = [ "." ];

View File

@ -1,13 +1,13 @@
{ lib, stdenv, buildEnv, fetchurl, mono }: { lib, stdenv, buildEnv, fetchurl, mono }:
let let
version = "1.14.0"; version = "1.16.0";
drv = stdenv.mkDerivation { drv = stdenv.mkDerivation {
pname = "keepassrpc"; pname = "keepassrpc";
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
sha256 = "1c410cc93c0252e7cfdb02507b8172c13e18d12c97f08630b721d897dc9b8b24"; hash = "sha256-p5dYluCrXAKhBhlm6sQ3QQE3gLMJzEZsHXwGnVeXFos=";
}; };
meta = with lib; { meta = with lib; {

View File

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchurl , fetchurl
, substituteAll , substituteAll
, cmake , cmake
@ -44,13 +45,14 @@
let let
inherit (python3.pkgs) paramiko pycairo pyodbc; inherit (python3.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec { in
stdenv.mkDerivation (finalAttrs: {
pname = "mysql-workbench"; pname = "mysql-workbench";
version = "8.0.34"; version = "8.0.34";
src = fetchurl { src = fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-ub/D6HRtXOvX+lai71t1UjMmMzBsz5ljCrJCuf9aq7U="; hash = "sha256-ub/D6HRtXOvX+lai71t1UjMmMzBsz5ljCrJCuf9aq7U=";
}; };
patches = [ patches = [
@ -75,6 +77,9 @@ in stdenv.mkDerivation rec {
src = ./fix-swig-build.patch; src = ./fix-swig-build.patch;
cairoDev = "${cairo.dev}"; cairoDev = "${cairo.dev}";
}) })
# a newer libxml2 version has changed some interfaces
./fix-xml2.patch
]; ];
# 1. have it look for 4.12.0 instead of 4.11.1 # 1. have it look for 4.12.0 instead of 4.11.1
@ -138,6 +143,10 @@ in stdenv.mkDerivation rec {
patchShebangs tools/get_wb_version.sh patchShebangs tools/get_wb_version.sh
''; '';
# GCC 13: error: 'int64_t' in namespace 'std' does not name a type
# when updating the version make sure this is still needed
env.CXXFLAGS = "-include cstdint";
env.NIX_CFLAGS_COMPILE = toString ([ env.NIX_CFLAGS_COMPILE = toString ([
# error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated
"-Wno-error=deprecated-declarations" "-Wno-error=deprecated-declarations"
@ -183,7 +192,7 @@ in stdenv.mkDerivation rec {
done done
''; '';
meta = with lib; { meta = {
description = "Visual MySQL database modeling, administration and querying tool"; description = "Visual MySQL database modeling, administration and querying tool";
longDescription = '' longDescription = ''
MySQL Workbench is a modeling tool that allows you to design MySQL Workbench is a modeling tool that allows you to design
@ -191,11 +200,10 @@ in stdenv.mkDerivation rec {
and query development modules where you can manage MySQL server instances and query development modules where you can manage MySQL server instances
and execute SQL queries. and execute SQL queries.
''; '';
homepage = "http://wb.mysql.com/"; homepage = "http://wb.mysql.com/";
license = licenses.gpl2; license = lib.licenses.gpl2Only;
maintainers = [ ];
platforms = platforms.linux;
mainProgram = "mysql-workbench"; mainProgram = "mysql-workbench";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = lib.platforms.linux;
}; };
} })

View File

@ -0,0 +1,25 @@
diff --git a/library/grt/src/grt.h b/library/grt/src/grt.h
index 47bfd63..59e664b 100644
--- a/library/grt/src/grt.h
+++ b/library/grt/src/grt.h
@@ -35,6 +35,7 @@
#include <stdexcept>
#include <boost/function.hpp>
#include <libxml/xmlmemory.h>
+#include <libxml/tree.h>
#include "base/threading.h"
#include <string>
#include <gmodule.h>
diff --git a/library/grt/src/unserializer.cpp b/library/grt/src/unserializer.cpp
index 6dda76d..a6f6a3c 100644
--- a/library/grt/src/unserializer.cpp
+++ b/library/grt/src/unserializer.cpp
@@ -401,7 +401,7 @@ ValueRef internal::Unserializer::unserialize_xmldata(const char *data, size_t si
xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT);
if (!doc) {
- xmlErrorPtr error = xmlGetLastError();
+ const xmlError* error = xmlGetLastError();
if (error)
throw std::runtime_error(base::strfmt("Could not parse XML data. Line %d, %s", error->line, error->message));

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pe-bear"; pname = "pe-bear";
version = "0.6.7"; version = "0.6.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hasherezade"; owner = "hasherezade";
repo = "pe-bear"; repo = "pe-bear";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-O5vBmcQXwde63OKc2LI66/tEqPzs0pK8loYkhILg2oY="; sha256 = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -1,8 +1,5 @@
{ stdenv { stdenv
, lib , lib
, openexr
, jemalloc
, c-blosc
, binutils , binutils
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
@ -63,9 +60,7 @@ let
hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY="; hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
}; };
}); });
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_8; };
buildInputs = [ openexr boost tbb_2021_8 jemalloc c-blosc ilmbase ];
});
wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override; wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override;
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {

View File

@ -1,20 +1,20 @@
{ {
stable = import ./browser.nix { stable = import ./browser.nix {
channel = "stable"; channel = "stable";
version = "120.0.2210.77"; version = "120.0.2210.144";
revision = "1"; revision = "1";
hash = "sha256-mSIx/aYutmA/hGycNapvm8/BnADtXA6NRlMmns+yM5k="; hash = "sha256-O/7LdopcMfSYx8cg9BNDU6KxbPfnF9rYXD7Q6jugBLU=";
}; };
beta = import ./browser.nix { beta = import ./browser.nix {
channel = "beta"; channel = "beta";
version = "121.0.2277.4"; version = "121.0.2277.71";
revision = "1"; revision = "1";
hash = "sha256-Qn0H5JUMZUASqfaJfM1cpKj9E6XHjArvZ3jE+GpREOs="; hash = "sha256-PsfUZJ5ftHxSFGaXjzFMEff7Czfq88yL31mqNkFilNM=";
}; };
dev = import ./browser.nix { dev = import ./browser.nix {
channel = "dev"; channel = "dev";
version = "121.0.2277.4"; version = "122.0.2348.0";
revision = "1"; revision = "1";
hash = "sha256-41hOoZANy5hWrHAzxZGLX69apNMoAn7PiarWl6wicPA="; hash = "sha256-Vsnrc43d70fLDncMeQeYhZJhnYex2LsIV1U2KPlkP9U=";
}; };
} }

View File

@ -1,33 +0,0 @@
# This file was generated by go2nix.
{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
buildGoPackage rec {
pname = "machine";
version = "0.16.2";
goPackagePath = "github.com/docker/machine";
src = fetchFromGitHub {
rev = "v${version}";
owner = "docker";
repo = "machine";
sha256 = "sha256-Mo2OGpem3p6hCNJ46+RH3BfC7kmKB4yk4Vzo38K88UM=";
};
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
pushd go/src/${goPackagePath}/contrib/completion
installShellCompletion --bash bash/*
installShellCompletion --zsh zsh/*
popd
'';
meta = with lib; {
homepage = "https://docs.docker.com/machine/";
description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts";
license = licenses.asl20;
maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
};
}

View File

@ -1,21 +0,0 @@
# This file was generated by go2nix.
[
{
goPackagePath = "github.com/docker/machine";
fetch = {
type = "git";
url = "https://github.com/docker/machine";
rev = "457c02d06a155827c1c4af9b5ab38c0b6b4e48ea";
sha256 = "0hx5bhjc7q9ml6h6d2a5csqg6vqwjj68599q0cccw3pcfrb34gmd";
};
}
{
goPackagePath = "github.com/libvirt/libvirt-go";
fetch = {
type = "git";
url = "https://github.com/libvirt/libvirt-go";
rev = "e9642325d747c353ca7b76b4893d5dbdc81c296f";
sha256 = "1822b2kbwyxb2gigbiashcs7v4fsyw7k3sdlqh43ga0l6058fmhl";
};
}
]

View File

@ -1,28 +0,0 @@
# This file was generated by go2nix.
{ lib, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }:
buildGoPackage rec {
pname = "docker-machine-kvm";
version = "0.10.0";
goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
goDeps = ./kvm-deps.nix;
src = fetchFromGitHub {
rev = "v${version}";
owner = "dhiltgen";
repo = "docker-machine-kvm";
sha256 = "0ch4zwb6h7hnr5l3skj1daypvpyms2i666lbnmakpw1fw3zvjmgy";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libvirt ];
meta = with lib; {
homepage = "https://github.com/dhiltgen/docker-machine-kvm";
description = "KVM driver for docker-machine";
license = licenses.asl20;
maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
};
}

View File

@ -1,41 +0,0 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkg-config, cctools, Hypervisor, vmnet }:
buildGoPackage rec {
pname = "docker-machine-xhyve";
version = "0.4.0";
goPackagePath = "github.com/zchee/docker-machine-driver-xhyve";
# https://github.com/machine-drivers/docker-machine-driver-xhyve/pull/225
patches = fetchpatch {
url = "https://github.com/machine-drivers/docker-machine-driver-xhyve/commit/546256494bf2ccc33e4125bf45f504b0e3027d5a.patch";
sha256 = "1i8wxqccqkxvqrbsyd0g9s0kdskd8xi2jv0c1bji9aj4rq0a8cgz";
};
preBuild = ''
make -C go/src/${goPackagePath} CC=${stdenv.cc}/bin/cc LIBTOOL=${cctools}/bin/libtool GIT_CMD=: lib9p
export CGO_CFLAGS=-I$(pwd)/go/src/${goPackagePath}/vendor/github.com/jceel/lib9p
export CGO_LDFLAGS=$(pwd)/go/src/${goPackagePath}/vendor/build/lib9p/lib9p.a
'';
tags = [ "lib9p" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "machine-drivers";
repo = "docker-machine-driver-xhyve";
sha256 = "0000v97fr8xc5b39v44hsa87wrbk4bcwyaaivxv4hxlf4vlgg863";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ Hypervisor vmnet ];
meta = with lib; {
homepage = "https://github.com/machine-drivers/docker-machine-driver-xhyve";
description = "Xhyve driver for docker-machine";
license = licenses.bsd3;
maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

View File

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubedog"; pname = "kubedog";
version = "0.12.0"; version = "0.12.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "werf"; owner = "werf";
repo = "kubedog"; repo = "kubedog";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-faCHL5+C2dACDnKY6LdIgLMrTnwQXNY018k7JgW4PPw="; hash = "sha256-B6ITVr+Zk1+uMU9RAupvUIBwj8SICp7UyXi0RfIFiME=";
}; };
vendorHash = "sha256-DcnNFoT7yhkugTQRSvez5SZR0/EquHO/sHeGcYniULo="; vendorHash = "sha256-lLyIVA7Mkj1bfA/u8VMTwmKmhNfibYpT+dgIWFdOiPs=";
subPackages = [ "cmd/kubedog" ]; subPackages = [ "cmd/kubedog" ];

View File

@ -1,16 +1,20 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub, go_1_21 }:
buildGoModule rec { buildGoModule rec {
pname = "terraform-docs"; pname = "terraform-docs";
version = "0.16.0"; version = "0.17.0";
go = go_1_21;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terraform-docs"; owner = "terraform-docs";
repo = pname; repo = pname;
rev = "v${version}"; 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 = [ "." ]; subPackages = [ "." ];

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
, imagemagick , imagemagick
, mesa , mesa
, libdrm , libdrm
, flutter313 , flutter
, pulseaudio , pulseaudio
, makeDesktopItem , makeDesktopItem
, gnome , gnome
@ -14,19 +14,20 @@
let let
libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ]; libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ];
pubspecLock = lib.importJSON ./pubspec.lock.json;
in in
flutter313.buildFlutterApplication (rec { flutter.buildFlutterApplication (rec {
pname = "fluffychat-${targetFlutterPlatform}"; pname = "fluffychat-${targetFlutterPlatform}";
version = "1.14.1"; version = "1.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "krille-chan"; owner = "krille-chan";
repo = "fluffychat"; repo = "fluffychat";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-VTpZvoyZXJ5SCKr3Ocfm4iT6Z/+AWg+SCw/xmp68kMg="; hash = "sha256-SCZtdmpUaCwORIJgT9lQO/It+WSzkhBOd6liLzPBerU=";
}; };
pubspecLock = lib.importJSON ./pubspec.lock.json; inherit pubspecLock;
gitHashes = { gitHashes = {
keyboard_shortcuts = "sha256-U74kRujftHPvpMOIqVT0Ph+wi1ocnxNxIFA1krft4Os="; keyboard_shortcuts = "sha256-U74kRujftHPvpMOIqVT0Ph+wi1ocnxNxIFA1krft4Os=";
@ -82,8 +83,7 @@ flutter313.buildFlutterApplication (rec {
# https://github.com/krille-chan/fluffychat/blob/v1.17.1/scripts/prepare-web.sh # https://github.com/krille-chan/fluffychat/blob/v1.17.1/scripts/prepare-web.sh
let let
# Use Olm 1.3.2, the oldest version, for FluffyChat 1.14.1 which depends on olm_flutter 1.2.0. # Use Olm 1.3.2, the oldest version, for FluffyChat 1.14.1 which depends on olm_flutter 1.2.0.
# In the future, this should be changed to use self.pubspecLock.dependencyVersions.flutter_olm as the script does. olmVersion = pubspecLock.packages.flutter_olm.version;
olmVersion = "1.3.2";
olmJs = fetchzip { olmJs = fetchzip {
url = "https://github.com/famedly/olm/releases/download/v${olmVersion}/olm.zip"; url = "https://github.com/famedly/olm/releases/download/v${olmVersion}/olm.zip";
stripRoot = false; stripRoot = false;

View File

@ -36,14 +36,14 @@ let
in in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.2.0"; version = "4.2.1";
pname = "weechat"; pname = "weechat";
hardeningEnable = [ "pie" ]; hardeningEnable = [ "pie" ];
src = fetchurl { src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
hash = "sha256-Mvam8hP7Y025MeKrjwGtuam1Dnf6ocUsoRbvoyBXWko="; hash = "sha256-JT3fCG9shFAxot0pSxVShR1rBMwIovnaSu37Pi+Rvc0=";
}; };
# Why is this needed? https://github.com/weechat/weechat/issues/2031 # Why is this needed? https://github.com/weechat/weechat/issues/2031

View File

@ -13,11 +13,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "twingate"; pname = "twingate";
version = "2023.250.97595"; version = "2024.018.111147";
src = fetchurl { src = fetchurl {
url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb";
hash = "sha256-JTkyJLbcAEcmftPKejMnxwIY+ICkaFar2fahKeXk3fs="; hash = "sha256-lOW4Y2zRP1UGMgBSC3K92mF5172kp0B1nwfRpE1QX/M=";
}; };
buildInputs = [ buildInputs = [

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "treesheets"; pname = "treesheets";
version = "unstable-2024-01-03"; version = "unstable-2024-01-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aardappel"; owner = "aardappel";
repo = "treesheets"; repo = "treesheets";
rev = "a8641361b839ed0720f9c6e043420945ac2427a7"; rev = "c14f5ef716b9a565ec1d7fbc2e86c73ad144c447";
sha256 = "MTRcG9fsyypDmVHRgtQFqbbSb0n7X7kXuEM6oYy/OVc="; sha256 = "8QcMdkLkYaN7PA9vNYbzM8wwqZR4k7/mcn6USvSNKXk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, { lib, stdenv, fetchFromGitHub, cmake, makeWrapper,
perlPackages, perlPackages,
libminc, EBTKS }: libminc, ebtks }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "N3"; pname = "N3";
@ -13,11 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "06hci7gzhy8p34ggvx7gah2k9yxpwhgmq1cgw8pcd1r82g4rg6kd"; sha256 = "06hci7gzhy8p34ggvx7gah2k9yxpwhgmq1cgw8pcd1r82g4rg6kd";
}; };
postPatch = ''
substituteInPlace src/VolumeHist/DHistogram.cc \
--replace "register " ""
'';
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ libminc EBTKS ]; buildInputs = [ libminc ebtks ];
propagatedBuildInputs = with perlPackages; [ perl MNI-Perllib GetoptTabular ]; propagatedBuildInputs = with perlPackages; [ perl MNI-Perllib GetoptTabular ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${EBTKS}/lib/" ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${ebtks}/lib/" ];
postFixup = '' postFixup = ''
for p in $out/bin/*; do for p in $out/bin/*; do

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, { lib, stdenv, fetchFromGitHub, cmake, makeWrapper,
perlPackages, perlPackages,
libminc, EBTKS }: libminc, ebtks }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "inormalize"; pname = "inormalize";
@ -15,11 +15,16 @@ stdenv.mkDerivation rec {
patches = [ ./lgmask-interp.patch ./nu_correct_norm-interp.patch ]; patches = [ ./lgmask-interp.patch ./nu_correct_norm-interp.patch ];
postPatch = ''
substituteInPlace inormalize.cc \
--replace "clamp" "::clamp"
'';
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ libminc EBTKS ]; buildInputs = [ libminc ebtks ];
propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${EBTKS}/lib/" ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${ebtks}/lib/" ];
postFixup = '' postFixup = ''
for p in $out/bin/*; do for p in $out/bin/*; do

View File

@ -0,0 +1,38 @@
diff --git a/3rdp/build/GNUmakefile b/3rdp/build/GNUmakefile
index fdf54565834a6a418f7267f4f8bf2269b80eab41..804dd76feb1a2d3b0278686f5326f7c2302e5fde 100644
--- a/3rdp/build/GNUmakefile
+++ b/3rdp/build/GNUmakefile
@@ -67,7 +67,7 @@
$(CRYPT_IDIR): | $(3RDPODIR)
$(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR)
-$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
+$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch $(3RDP_ROOT)/build/cl-linux-yield.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
@echo Creating $@ ...
$(QUIET)-rm -rf $(CRYPT_SRC)/*
$(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC)
@@ -112,6 +112,7 @@
$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-fix-ssh-ecc-ephemeral.patch
$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-just-use-cc.patch
$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-learn-numbers.patch
+ $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-linux-yield.patch
ifeq ($(CC),mingw32-gcc)
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make toolscripts
diff --git a/3rdp/build/cl-linux-yield.patch b/3rdp/build/cl-linux-yield.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8cdfc8eafd3fd85f39bf0f8b519f25a31078fee4
--- /dev/null
+++ b/3rdp/build/cl-linux-yield.patch
@@ -0,0 +1,11 @@
+--- old/thread.h 2021-10-19 12:34:08.766649958 -0700
++++ kernel/thread.h 2021-10-19 12:34:43.794072316 -0700
+@@ -3005,7 +3005,7 @@
+ #endif /* Slowaris 5.7 / 7.x or newer */
+ #elif defined( _AIX ) || defined( __Android__ ) || defined( __CYGWIN__ ) || \
+ ( defined( __hpux ) && ( OSVERSION >= 11 ) ) || \
+- defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ )
++ defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ ) || defined(__linux__)
+ #define THREAD_YIELD() sched_yield()
+ #elif defined( __XMK__ )
+ /* The XMK underlying scheduling object is the process context, for which

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, perl, unzip, autoPatchelfHook, ncurses, SDL2, alsa-lib }: { lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, unzip, autoPatchelfHook, ncurses, SDL2, alsa-lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "syncterm"; pname = "syncterm";
@ -8,7 +8,18 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/${pname}/${pname}-${version}-src.tgz"; url = "mirror://sourceforge/${pname}/${pname}-${version}-src.tgz";
sha256 = "19m76bisipp1h3bc8mbq83b851rx3lbysxb0azpbr5nbqr2f8xyi"; sha256 = "19m76bisipp1h3bc8mbq83b851rx3lbysxb0azpbr5nbqr2f8xyi";
}; };
sourceRoot = "${pname}-${version}/src/syncterm";
patches = [
# Cherry-picks from the upstream Synchronet tree, removing calls to `pthread_yield`.
# See upstream issue: https://gitlab.synchro.net/main/sbbs/-/issues/299
(fetchpatch {
url = "https://gitlab.synchro.net/main/sbbs/-/commit/851627df99f48d8eaad33d3a98ef309b4371f359.patch";
hash = "sha256-DbFAeJnrwFyfEpZgZFN8etqX6vQ3ca2TJwaqp0aHeo4=";
})
./0001-use-sched-yield-53264f2b.patch
];
# We can't use sourceRoot, as the cherry-picked patches apply to files outside of it.
postPatch = ''cd src/syncterm'';
CFLAGS = [ CFLAGS = [
"-DHAS_INTTYPES_H" "-DHAS_INTTYPES_H"
@ -32,8 +43,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
# error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin' # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin'
# broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
broken = true; # sendmsg.c:(.text+0x1099): undefined reference to `pthread_yield'
homepage = "https://syncterm.bbsdev.net/"; homepage = "https://syncterm.bbsdev.net/";
description = "BBS terminal emulator"; description = "BBS terminal emulator";
maintainers = with maintainers; [ embr ]; maintainers = with maintainers; [ embr ];

View File

@ -5,11 +5,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "legit"; pname = "legit";
version = "1.2.0"; version = "1.2.0.post0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c"; sha256 = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

View File

@ -2,6 +2,7 @@
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, qmake , qmake
, pkg-config
, qtbase , qtbase
, qtquickcontrols2 , qtquickcontrols2
, qtwebsockets , qtwebsockets
@ -15,29 +16,27 @@
mkDerivation rec { mkDerivation rec {
pname = "anilibria-winmaclinux"; pname = "anilibria-winmaclinux";
version = "1.2.12"; version = "1.2.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anilibria"; owner = "anilibria";
repo = "anilibria-winmaclinux"; repo = "anilibria-winmaclinux";
rev = version; rev = "d941607f078c72fca104ee1e7916cc0ddcc0acf5";
sha256 = "sha256-J9MBnHrVnDaJ8Ykf/n8OkWKbK/JfMxorH9E+mKe3T8k="; sha256 = "sha256-G4KlYAjOT1UV29vcX7Q8dMTj0BX0rsJcLtK2MQag5nU=";
}; };
sourceRoot = "source/src"; sourceRoot = "source/src";
qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ];
patches = [ patches = [
./0001-fix-installation-paths.patch ./0001-fix-installation-paths.patch
./0002-disable-version-check.patch ./0002-disable-version-check.patch
./0003-build-with-vlc.patch
]; ];
preConfigure = '' preConfigure = ''
substituteInPlace AniLibria.pro \ substituteInPlace AniLibria.pro \
--replace "\$\$PREFIX" '${placeholder "out"}' \ --replace "\$\$PREFIX" '${placeholder "out"}'
--replace '@VLC_PATH@' '${libvlc}/include'
''; '';
qtWrapperArgs = [ qtWrapperArgs = [
@ -52,6 +51,7 @@ mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
qmake qmake
pkg-config
wrapQtAppsHook wrapQtAppsHook
copyDesktopItems copyDesktopItems
]; ];

View File

@ -94,6 +94,14 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/obsproject/obs-studio/commit/6e080a68067b27fe5463f0f4eee7df690451f3d7.patch"; url = "https://github.com/obsproject/obs-studio/commit/6e080a68067b27fe5463f0f4eee7df690451f3d7.patch";
hash = "sha256-nbn/q3uszoHaDvaW8Et1MS1sgQzMsJRmjGSMHzUxV70="; hash = "sha256-nbn/q3uszoHaDvaW8Et1MS1sgQzMsJRmjGSMHzUxV70=";
}) })
# Fix libobs.pc for plugins on non-x86 systems
(fetchpatch {
name = "fix-arm64-cmake.patch";
url = "https://git.alpinelinux.org/aports/plain/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b";
hash = "sha256-yRSw4VWDwMwysDB3Hw/tsmTjEQUhipvrVRQcZkbtuoI=";
includes = [ "*/CompilerConfig.cmake" ];
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -121,6 +121,7 @@ stdenv.mkDerivation rec {
downloadPage = "https://github.com/streamlink/streamlink-twitch-gui/releases"; downloadPage = "https://github.com/streamlink/streamlink-twitch-gui/releases";
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit; license = licenses.mit;
mainProgram = "streamlink-twitch-gui";
maintainers = with maintainers; [ rileyinman ]; maintainers = with maintainers; [ rileyinman ];
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
}; };

View File

@ -0,0 +1,34 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "bankstown-lv2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "chadmed";
repo = "bankstown";
rev = version;
hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg=";
};
cargoSha256 = "sha256-yRzM4tcYc6mweTpLnnlCeKgP00L2wRgHamtUzK9Kstc=";
installPhase = ''
export LIBDIR=$out/lib
mkdir -p $LIBDIR
make
make install
'';
meta = with lib; {
homepage = "https://github.com/chadmed/bankstown";
description = "Halfway-decent three-stage psychoacoustic bass approximation";
license = licenses.mit;
maintainers = with maintainers; [ yuka ];
platforms = platforms.linux;
};
}

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

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "clipcat"; pname = "clipcat";
version = "0.16.2"; version = "0.16.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xrelkd"; owner = "xrelkd";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-01vjCs9ktDrULPL8IZraMPpa5+cw8vLtt4cKHKxHjK4="; hash = "sha256-571qS6pgXyt8GNVFMGFU3bKgOFDG/k4K53LK+UJgPKc=";
}; };
cargoHash = "sha256-9L6w7adoQflOW5vxkIJf4FLF7xACx36sKaSPjJAtt3Y="; cargoHash = "sha256-Ey7GOKtHLlljzyiEtoCH7zrKo4s4kJivHDPB7x0C3k0=";
nativeBuildInputs = [ nativeBuildInputs = [
protobuf protobuf

View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, cmake, libminc }: { lib, stdenv, fetchFromGitHub, cmake, libminc }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "EBTKS"; pname = "ebtks";
version = "unstable-2017-09-23"; version = "unstable-2017-09-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BIC-MNI"; owner = "BIC-MNI";
repo = pname; repo = "EBTKS";
rev = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; rev = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c";
sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq";
}; };
@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace templates/EBTKS/SimpleArray.h \ substituteInPlace templates/EBTKS/SimpleArray.h \
--replace "#define FINITE(x) finite(x)" "#define FINITE(x) isfinite(x)" --replace "#define FINITE(x) finite(x)" "#define FINITE(x) isfinite(x)"
''
# error: ISO C++17 does not allow 'register' storage class specifier
+ ''
find . -type f -exec sed -i -e 's/register //g' {} +
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/BIC-MNI/${pname}"; homepage = "https://github.com/BIC-MNI/EBTKS";
description = "Library for working with MINC files"; description = "Library for working with MINC files";
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix; platforms = platforms.unix;

View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "files-cli"; pname = "files-cli";
version = "2.12.22"; version = "2.12.24";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "files-cli"; repo = "files-cli";
owner = "files-com"; owner = "files-com";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xjHPlZenkxZCJ9KwjyWsrAd1LiQRRuS9Z2fsRdHV7eA="; hash = "sha256-Ne386WK0icQcsW2tqfkiW5udI7Umq10v+954bfjQiHM=";
}; };
vendorHash = "sha256-JzIafJOSlZUWwewp6sJaM7x3U+vZMdY4gBx/NfI7p5I="; vendorHash = "sha256-en2gLeYZr7MwZnz47qAxQo48ZIsDZPXoCkMV2c4LHSU=";
ldflags = [ ldflags = [
"-s" "-s"

View File

@ -4,6 +4,8 @@
, hare , hare
, scdoc , scdoc
, nix-update-script , nix-update-script
, makeWrapper
, bash
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "haredo"; pname = "haredo";
@ -20,9 +22,16 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
hare hare
makeWrapper
scdoc scdoc
]; ];
enableParallelChecking = true;
doCheck = true;
dontConfigure = true;
preBuild = '' preBuild = ''
HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)" HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)"
export HARECACHE export HARECACHE
@ -40,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
./bin/haredo test ./bin/haredo ''${enableParallelChecking:+-j$NIX_BUILD_CORES} test
runHook postCheck runHook postCheck
''; '';
@ -53,8 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall runHook postInstall
''; '';
dontConfigure = true; postFixup = ''
doCheck = true; wrapProgram $out/bin/haredo \
--prefix PATH : "${lib.makeBinPath [bash]}"
'';
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;

View File

@ -21,16 +21,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ironbar"; pname = "ironbar";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JakeStanger"; owner = "JakeStanger";
repo = "ironbar"; repo = "ironbar";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-e79eJGc/kxQjRwa1HnF7V/pCbrMTstJsBOl1Luo6i0g="; hash = "sha256-NRQAR412m14SHozYjJmlnb/TJyCroiWdqY0NLvCOQSE=";
}; };
cargoHash = "sha256-N8uAisQ50W/9zCr9bRX6tZ0slEoe1zCEMDXuvmoWEs4="; cargoHash = "sha256-EzLcmOppzUtTg1dOdZcx2rweiELPXv2Mt/we7hMr4m4=";
buildInputs = [ buildInputs = [
gtk3 gtk3

View File

@ -7,7 +7,7 @@
buildGoModule rec { buildGoModule rec {
pname = "kubo"; pname = "kubo";
version = "0.25.0"; # When updating, also check if the repo version changed and adjust repoVersion below version = "0.26.0"; # When updating, also check if the repo version changed and adjust repoVersion below
rev = "v${version}"; rev = "v${version}";
passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version
@ -15,7 +15,7 @@ buildGoModule rec {
# Kubo makes changes to its source tarball that don't match the git source. # Kubo makes changes to its source tarball that don't match the git source.
src = fetchurl { src = fetchurl {
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
hash = "sha256-+Mk3rDdtjhETmdaOOSXEFdLTJ0nX9G3qUxctsu5vrSc="; hash = "sha256-qvn5VqEPLkehFWamtPGRuDLJ06bd5bn1qZRp05jP2AY=";
}; };
# tarball contains multiple files/directories # tarball contains multiple files/directories

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

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "qrtool"; pname = "qrtool";
version = "0.10.2"; version = "0.10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sorairolake"; owner = "sorairolake";
repo = "qrtool"; repo = "qrtool";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-caQoV0qAj2VXbEaYHsGOqCZCVyb4s1JJbBl7H0X5xEI="; sha256 = "sha256-b1dNGEdjmY2RSZ3M7lwWVeookMij2rUsVtevsYYNtw0=";
}; };
cargoHash = "sha256-V9TopADUGBR0MdOTIq1Tiee3NEzLa76zRq5bjULoLVI="; cargoHash = "sha256-9Zd4zETDy8iM/rrZI55NOybpa4Sn9AzYsNYmLDzxL+Q=";
nativeBuildInputs = [ asciidoctor installShellFiles ]; nativeBuildInputs = [ asciidoctor installShellFiles ];

View File

@ -0,0 +1,55 @@
{ lib
, stdenv
, fetchFromGitHub
, perl
, perlPackages
, runtimeShell
}:
stdenv.mkDerivation rec {
pname = "regripper";
version = "unstable-2023-07-23";
src = fetchFromGitHub {
owner = "keydet89";
repo = "RegRipper3.0";
rev = "cee174fb6f137b14c426e97d17945ddee0d31051";
hash = "sha256-vejIRlcVjxQJpxJabJJcljODYr+lLJjYINVtAPObvkQ=";
};
propagatedBuildInputs = [ perl perlPackages.ParseWin32Registry ];
postPatch = ''
substituteInPlace rip.pl rr.pl \
--replace \"plugins/\" \"$out/share/regripper/plugins/\" \
--replace \"plugins\" \"$out/share/regripper/plugins\"
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share}
rm -r *.md *.exe *.bat *.dll
cp -aR . "$out/share/regripper/"
cat > "$out/bin/${pname}" << EOF
#!${runtimeShell}
exec ${perl}/bin/perl $out/share/regripper/rip.pl "\$@"
EOF
chmod u+x "$out/bin/${pname}"
runHook postInstall
'';
meta = with lib; {
description = "Open source forensic software used as a Windows Registry data extraction command line";
mainProgram = "regripper";
homepage = "https://github.com/keydet89/RegRipper3.0";
maintainers = with maintainers; [ d3vil0p3r ];
platforms = platforms.unix;
license = licenses.mit;
};
}

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

@ -1,5 +1,5 @@
{ lib { lib
, stdenv , stdenvNoCC
, fetchFromGitHub , fetchFromGitHub
, gtk-engine-murrine , gtk-engine-murrine
, breeze-icons , breeze-icons
@ -8,72 +8,72 @@
, jdupes , jdupes
}: }:
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "nordic"; pname = "nordic";
version = "unstable-2023-10-17"; version = "2.2.0-unstable-2024-01-20";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = pname; repo = pname;
rev = "e97d2bcf4494f8ab502e33d13c74b396469a42f4"; rev = "218a1a8679fdb97aa0aa7997fdf8c5344d68fb2f";
hash = "sha256-7WfCE3eoJ7maAYqgQNb0mlw8u3zc6NAwTJN+PVojDcE="; hash = "sha256-a315U4HsQP1omluTJjq9U76L3ANP7uN831mCY54vZnk=";
name = "Nordic"; name = "Nordic";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = pname; repo = pname;
rev = "73ed3490c13b2df6c3d27d6b3bcba0c087297f4a"; rev = "59873a54c8524adb36411d17d473eb7b7c910eac";
hash = "sha256-fRmGiqtjfGFIfr5hRBS3ZPFYEpQx391WoxphB5gRTJo="; hash = "sha256-RisW5W0onNrtsSPHtFW66OdrQWOQX3uDmLiM+5ckzSY=";
name = "Nordic-standard-buttons"; name = "Nordic-standard-buttons";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = pname; repo = pname;
rev = "4b1fc2942bad203a0aa035cbb688b28005bb1011"; rev = "6e2b8fb8017c34344ec6b70884f09ebb44863efb";
hash = "sha256-VU5Bo39l8xdR6QmbTR0Qic6XkSfDFrhyjoHaMm9SBYM="; hash = "sha256-B4qH8L5r16gaPS1wpiIHPyS3g/g53Xi2C6F0rcZKgWk=";
name = "Nordic-darker"; name = "Nordic-darker";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = pname; repo = pname;
rev = "6d57a16eef66c25f0212b7d2f02e208f2afdf4f9"; rev = "2160a7bc69f55dd0b9efa64f029344256a4ef086";
hash = "sha256-Sq5ZXOh+HA+udQHL2wUw5azgKwAVVvHGNb3SiuOn0nQ="; hash = "sha256-1WdorWByZE4sXTfwsjFxvvSI0qQcAcfFoPXN5fGhEpc=";
name = "Nordic-darker-standard-buttons"; name = "Nordic-darker-standard-buttons";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = pname; repo = pname;
rev = "566e38c40bca86df93d0e9226c33d5d525d34454"; rev = "63e0844bc04e1500e4b0ef8031cb3812e15e12fb";
hash = "sha256-Wl/m2O0tVCFgZhPC/gcNgKr0JqQbiyQBpGEcp8g6kvY="; hash = "sha256-b0Zs2WsD913Ai8wvi7mPraFme93WZXm+7rnwhDvGuZM=";
name = "Nordic-bluish-accent"; name = "Nordic-bluish-accent";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = pname; repo = pname;
rev = "b43efee28129634fdefe70f2a03c401efc7dc22f"; rev = "53e44ca5045a57903c0024197fa7a7a267432afb";
hash = "sha256-rLOWkfTMFEnVU2tuw5M2fvbNMPfxIu+gzi+3gnBEhx4="; hash = "sha256-vF2f4PuQP0QkmPT6kR35eWYvQ9xLCYihEsobERURuBk=";
name = "Nordic-bluish-accent-standard-buttons"; name = "Nordic-bluish-accent-standard-buttons";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = "${pname}-polar"; repo = "${pname}-polar";
rev = "2192acfce55fbb9a2982886abe25e623d0e7ff66"; rev = "4ec6f09782394d24d4d8cc78ac53c4692ec28985";
hash = "sha256-B/sAy4I+9gX9dHXUldcN5t0vlOL2Jnoan/hRV+tNnSo="; hash = "sha256-Z50ciafgfTHBahjpcVTapnsU88ioPUZ1RjggNpruJP0=";
name = "Nordic-Polar"; name = "Nordic-Polar";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = "${pname}-polar"; repo = "${pname}-polar";
rev = "a24b42411d8ea0dc63bf0778e443be251858e586"; rev = "c6c7ee8e642a9df07f7d69ed048a6ef37a26153c";
hash = "sha256-02z4eMFtok1+SeW+ai7vZCXZb6ZhU4l4ch1Zc/GyhYM="; hash = "sha256-e+B9oUKbPr2MKmaz+l5GTOP4iVmw24vVpS98mAxEekA=";
name = "Nordic-Polar-standard-buttons"; name = "Nordic-Polar-standard-buttons";
}) })
]; ];
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
# Propagate sddm theme dependencies to user env otherwise sddm # Propagate sddm theme dependencies to user env otherwise sddm
# does find them. Putting them in buildInputs is not enough. # does not find them. Putting them in buildInputs is not enough.
mkdir -p $sddm/nix-support mkdir -p $sddm/nix-support

View File

@ -5,16 +5,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "assemblyscript"; pname = "assemblyscript";
version = "0.27.22"; version = "0.27.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AssemblyScript"; owner = "AssemblyScript";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8j012eAM+tl8AH5vNhg9xKDRJt5pZKV9KNwJFmUgXMY="; sha256 = "sha256-pKb46AfL5MGKiH1AjyPeHw7ZeLnIiPYmf8b2bOkuRe0=";
}; };
npmDepsHash = "sha256-y7gY9VhbR+xfXf3OvKvpcohk2mwfa0uOQO7Nmg+L6ug="; npmDepsHash = "sha256-io/3T0LE1kupjtMg8rpQlRmIn048X0jqhKKj/W7Ilo0=";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/AssemblyScript/${pname}"; homepage = "https://github.com/AssemblyScript/${pname}";

View File

@ -1,22 +1,22 @@
# Generated by update.sh script # Generated by update.sh script
{ {
"version" = "21.0.1"; "version" = "21.0.2";
"hashes" = { "hashes" = {
"aarch64-linux" = { "aarch64-linux" = {
sha256 = "0vb1bdbn4lqig4jihynacbyrj551m1pcmj6qh86kdwx0kn9400yy"; sha256 = "0yndazvc4kyr9widfn8ql5vd57m4m5inqz2wcpsarw38rs8ycjx3";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-aarch64_bin.tar.gz"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-aarch64_bin.tar.gz";
}; };
"x86_64-linux" = { "x86_64-linux" = {
sha256 = "1gvkxqmbsh7pklh9bkhndh08nnjcmgq0xpzc96dgacqnlr4fx0sj"; sha256 = "0j5ffszcaqv3fq159hyb611jm8w1q4n1cywmbd7vi69smad0cj5h";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-x64_bin.tar.gz"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-x64_bin.tar.gz";
}; };
"x86_64-darwin" = { "x86_64-darwin" = {
sha256 = "0sks663ldc0m3rhc882mzn44kipzbjw7325dhkpwy874p47j9zns"; sha256 = "1qfrn1068idnkzd6mdpw1x17sqrj59rz9avphj8225sxlhzsk2ks";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-x64_bin.tar.gz"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_macos-x64_bin.tar.gz";
}; };
"aarch64-darwin" = { "aarch64-darwin" = {
sha256 = "0i7zzq1czgc4lk1z278zp4cml4kdryafhrma5rqaja75933jpi2h"; sha256 = "1dssa3nhix7bqygdkkfp0b9myjg5f91dlgm8mf6r7qf7mj9klpji";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-aarch64_bin.tar.gz"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_macos-aarch64_bin.tar.gz";
}; };
}; };
} }

View File

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "svdtools"; pname = "svdtools";
version = "0.3.8"; version = "0.3.9";
src = fetchCrate { src = fetchCrate {
inherit version pname; inherit version pname;
hash = "sha256-daATz1bd5fwfYnfVbweJd/I6SsQyg2CC+MEZ5WLyZBw="; hash = "sha256-agIr2jM0BqLSXod5V+p//bxcnrXe2+wW5RMq8GAAwnI=";
}; };
cargoHash = "sha256-TSLUBkPRab6cwlXJw8tHpqYjhLtVa+QJZq13Qj/0UzU="; cargoHash = "sha256-z9GmFjABgvh2xf4nujnZUgHvKvChfP4Guox89PuuxV8=";
meta = with lib; { meta = with lib; {
description = "Tools to handle vendor-supplied, often buggy SVD files"; description = "Tools to handle vendor-supplied, often buggy SVD files";

View File

@ -5,15 +5,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "starlark-rust"; pname = "starlark-rust";
version = "0.10.0"; version = "0.11.0";
src = fetchCrate { src = fetchCrate {
pname = "starlark_bin"; pname = "starlark_bin";
inherit version; inherit version;
hash = "sha256-7AoNRTLyTYsUass9bMJMBUN+GrfUzEGM9cED5VsRESs="; hash = "sha256-/dy9uzXLZipKzFaslOmlzeEsOD89pprwFTopYpsmHGM=";
}; };
cargoHash = "sha256-Q00JJRiubrxnI0nFQqUTbxTTB70XV93HJycjdlvV+74="; cargoHash = "sha256-Ict1Lh+JPZ5dmC+ul0phcQug9nYeaILLCtaHQOI6qBk=";
meta = with lib; { meta = with lib; {
description = "A Rust implementation of the Starlark language"; description = "A Rust implementation of the Starlark language";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe, ilmbase }: { lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe }:
stdenv.mkDerivation rec stdenv.mkDerivation rec
{ {
@ -20,13 +20,7 @@ stdenv.mkDerivation rec
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
# NOTE: Alembic also support imath instead of ilmbase, but some users of Alembic (e.g. Blender) buildInputs = [ openexr hdf5-threadsafe ];
# are incompatible with the imath version of Alembic
buildInputs = [ openexr hdf5-threadsafe ilmbase ];
# Downstream packages trying to use Alembic via CMake need ilmbase as well
# For some reason this won't be picked up correctly otherwise
propagatedBuildInputs = [ ilmbase ];
# These flags along with the postPatch step ensure that all artifacts end up # These flags along with the postPatch step ensure that all artifacts end up
# in the correct output without needing to move anything # in the correct output without needing to move anything

View File

@ -3,28 +3,27 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, pkg-config , pkg-config
, fftw
, libpng , libpng
, libjpeg , libjpeg
, libwebp , libwebp
, openblas , blas
, lapack
, config
, guiSupport ? false , guiSupport ? false
, libX11 , libX11
# see http://dlib.net/compile.html
, sse4Support ? stdenv.hostPlatform.sse4_1Support , sse4Support ? stdenv.hostPlatform.sse4_1Support
, avxSupport ? stdenv.hostPlatform.avxSupport , avxSupport ? stdenv.hostPlatform.avxSupport
, cudaSupport ? true , cudaSupport ? config.cudaSupport
}: , cudaPackages
}@inputs:
stdenv.mkDerivation rec { (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec {
pname = "dlib"; pname = "dlib";
version = "19.24.2"; version = "19.24.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "davisking"; owner = "davisking";
repo = "dlib"; repo = "dlib";
rev ="v${version}"; rev = "v${version}";
sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk="; sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk=";
}; };
@ -33,20 +32,53 @@ stdenv.mkDerivation rec {
''; '';
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "USE_DLIB_USE_CUDA" cudaSupport)
(lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support) (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support)
(lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport) (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport)
(lib.cmakeBool "DLIB_USE_CUDA" cudaSupport)
] ++ lib.optionals cudaSupport [
(lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (builtins.concatStringsSep "," (with cudaPackages.flags; map dropDot cudaCapabilities)))
]; ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_nvcc
]);
buildInputs = [ buildInputs = [
fftw
libpng libpng
libjpeg libjpeg
libwebp libwebp
openblas blas
] ++ lib.optional guiSupport libX11; lapack
]
++ lib.optionals guiSupport [ libX11 ]
++ lib.optionals config.cudaSupport (with cudaPackages; [
cuda_cudart.dev
cuda_cudart.lib
cuda_cudart.static
cuda_nvcc.dev
libcublas.dev
libcublas.lib
libcublas.static
libcurand.dev
libcurand.lib
libcurand.static
libcusolver.dev
libcusolver.lib
libcusolver.static
cudnn.dev
cudnn.lib
cudnn.static
cuda_cccl.dev
]);
passthru = {
inherit
cudaSupport cudaPackages
sse4Support avxSupport;
};
meta = with lib; { meta = with lib; {
description = "A general purpose cross-platform C++ machine learning library"; description = "A general purpose cross-platform C++ machine learning library";

View File

@ -0,0 +1,32 @@
{ lib
, fetchurl
, fetchpatch
, stdenv
, zlib
, openssl
, libuuid
, pkg-config
, bzip2
}:
stdenv.mkDerivation rec {
pname = "libewf-ewf";
version = "20140814";
src = fetchurl {
url = "https://github.com/libyal/libewf-legacy/releases/download/${version}/libewf-${version}.tar.gz";
hash = "sha256-OM3QXwnaIDeo66UNjzmu6to53SxgCMn/rE9VTPlX5BQ=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib openssl libuuid ]
++ lib.optionals stdenv.isDarwin [ bzip2 ];
meta = {
description = "Legacy library for support of the Expert Witness Compression Format";
homepage = "https://sourceforge.net/projects/libewf/";
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ d3vil0p3r ];
platforms = lib.platforms.unix;
};
}

View File

@ -11,9 +11,10 @@
}: }:
let let
tableVer = "20240108";
table = fetchurl { table = fetchurl {
url = "https://download.fcitx-im.org/data/table.tar.gz"; url = "https://download.fcitx-im.org/data/table-${tableVer}.tar.gz";
sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; hash = "sha256-cpxZbYaQfecnx00Pw/0kHEBsXevStMt07v4CI4funa4=";
}; };
arpaVer = "20230712"; arpaVer = "20230712";
arpa = fetchurl { arpa = fetchurl {
@ -28,13 +29,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libime"; pname = "libime";
version = "1.1.4"; version = "1.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fcitx"; owner = "fcitx";
repo = "libime"; repo = "libime";
rev = version; rev = version;
sha256 = "sha256-cjlclemt4xsQcpmZ8CflN79QkOE4m07O4hLOQcLF1nA="; hash = "sha256-AvlQOpjrHSifUtWSTft2bywlWhwka26VcqqReqAlcv8=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -3,7 +3,6 @@
, boost , boost
, cmake , cmake
, giflib , giflib
, ilmbase
, libjpeg , libjpeg
, libpng , libpng
, libtiff , libtiff
@ -41,7 +40,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost boost
giflib giflib
ilmbase
libjpeg libjpeg
libpng libpng
libtiff libtiff

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: { lib, stdenv, fetchFromGitHub, cmake, boost, jemalloc, c-blosc, tbb, zlib }:
stdenv.mkDerivation rec stdenv.mkDerivation rec
{ {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; buildInputs = [ boost tbb jemalloc c-blosc zlib ];
cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ]; cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ];

View File

@ -105,8 +105,9 @@ qtModule {
which which
gn gn
nodejs nodejs
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
autoSignDarwinBinariesHook autoSignDarwinBinariesHook
] ++ lib.optionals stdenv.isDarwin [
bootstrap_cmds bootstrap_cmds
cctools cctools
xcbuild xcbuild

View File

@ -507,7 +507,7 @@ let
installPhase = '' installPhase = ''
mkdir -pv $out mkdir -pv $out
cp -r * $out cp -r * $out
rm -v $out/nyxt rm -fv $out/nyxt
mkdir -p $out/bin mkdir -p $out/bin
cp -v nyxt $out/bin cp -v nyxt $out/bin
wrapProgram $out/bin/nyxt \ wrapProgram $out/bin/nyxt \

View File

@ -49,6 +49,7 @@ mapAliases {
"@mermaid-js/mermaid-cli" = pkgs.mermaid-cli; # added 2023-10-01 "@mermaid-js/mermaid-cli" = pkgs.mermaid-cli; # added 2023-10-01
"@nerdwallet/shepherd" = pkgs.shepherd; # added 2023-09-30 "@nerdwallet/shepherd" = pkgs.shepherd; # added 2023-09-30
"@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
"@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22
"@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09
alloy = pkgs.titanium-alloy; # added 2023-08-17 alloy = pkgs.titanium-alloy; # added 2023-08-17
antennas = pkgs.antennas; # added 2023-07-30 antennas = pkgs.antennas; # added 2023-07-30

View File

@ -14,7 +14,6 @@
"@commitlint/cli" = "commitlint"; "@commitlint/cli" = "commitlint";
"@gitbeaker/cli" = "gitbeaker"; "@gitbeaker/cli" = "gitbeaker";
"@prisma/language-server" = "prisma-language-server"; "@prisma/language-server" = "prisma-language-server";
"@tailwindcss/language-server" = "tailwindcss-language-server";
"@uppy/companion" = "companion"; "@uppy/companion" = "companion";
"@vue/cli" = "vue"; "@vue/cli" = "vue";
"@webassemblyjs/repl-1.11.1" = "wasm"; "@webassemblyjs/repl-1.11.1" = "wasm";

View File

@ -9,7 +9,6 @@
, "@shopify/cli" , "@shopify/cli"
, "@tailwindcss/aspect-ratio" , "@tailwindcss/aspect-ratio"
, "@tailwindcss/forms" , "@tailwindcss/forms"
, "@tailwindcss/language-server"
, "@tailwindcss/line-clamp" , "@tailwindcss/line-clamp"
, "@tailwindcss/typography" , "@tailwindcss/typography"
, "@uppy/companion" , "@uppy/companion"

View File

@ -64405,24 +64405,6 @@ in
bypassCache = true; bypassCache = true;
reconstructLock = true; reconstructLock = true;
}; };
"@tailwindcss/language-server" = nodeEnv.buildNodePackage {
name = "_at_tailwindcss_slash_language-server";
packageName = "@tailwindcss/language-server";
version = "0.0.16";
src = fetchurl {
url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.16.tgz";
sha512 = "9zmvTppvma6WaA8L1VLwa+YeVgpEhsUOuslDFNzHt5lJ04SdHTc9VwF9EeOximFohXyts8Q3qSn3PWbFVBDNVg==";
};
buildInputs = globalBuildInputs;
meta = {
description = "Tailwind CSS Language Server";
homepage = "https://github.com/tailwindlabs/tailwindcss-intellisense/tree/HEAD/packages/tailwindcss-language-server#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"@tailwindcss/line-clamp" = nodeEnv.buildNodePackage { "@tailwindcss/line-clamp" = nodeEnv.buildNodePackage {
name = "_at_tailwindcss_slash_line-clamp"; name = "_at_tailwindcss_slash_line-clamp";
packageName = "@tailwindcss/line-clamp"; packageName = "@tailwindcss/line-clamp";

View File

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "adafruit-platformdetect"; pname = "adafruit-platformdetect";
version = "3.58.0"; version = "3.59.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "Adafruit-PlatformDetect"; pname = "Adafruit-PlatformDetect";
inherit version; inherit version;
hash = "sha256-9pucdj4rXCLitoNqu1ddETY9XUmIlIfC0hIoKJ54Ks8="; hash = "sha256-zzPoLRZPFG8O45Bih54Mq6VeAYJU25czWFZtl849RgI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -365,14 +365,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3-stubs"; pname = "boto3-stubs";
version = "1.34.23"; version = "1.34.25";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-VNez2P7s72huTjRfNBvkxZGsjcxkExn7aSCudhuAt4Q="; hash = "sha256-l8uuaUto4toyW6wGbE6+iwugtf1HQl5kSsiZoXCdJw8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore-stubs"; pname = "botocore-stubs";
version = "1.34.23"; version = "1.34.25";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "botocore_stubs"; pname = "botocore_stubs";
inherit version; inherit version;
hash = "sha256-aSfRj6JrFOhTJXO/BmIEDb+OOUOg9uNTEhziVXnlyUI="; hash = "sha256-cyIZICHgSSIE0iOqyIDU0r39OQ8+fzh00enhmPgkg2c=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "clarifai-grpc"; pname = "clarifai-grpc";
version = "10.0.3"; version = "10.0.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Clarifai"; owner = "Clarifai";
repo = "clarifai-python-grpc"; repo = "clarifai-python-grpc";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-mIiUwqagFlZXkm/diQlCXMBDAbnWNG4BNMHVedo5u/M="; hash = "sha256-jhM+UfyaliVmUH6e3ArZvZokB8lDKS/fx8376cZwlQM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,15 +2,17 @@
, fetchPypi , fetchPypi
, lib , lib
# propagates # propagates
, click , click
, dlib , dlib
, face-recognition-models , face-recognition-models
, numpy , numpy
, pillow , pillow
# tests # tests
, pytestCheckHook , pytestCheckHook
, config
, cudaSupport ? config.cudaSupport
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -18,7 +20,7 @@ buildPythonPackage rec {
version = "1.3.0"; version = "1.3.0";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
pname = "face_recognition"; pname = "face_recognition";
inherit version; inherit version;
hash = "sha256-Xl790WhqpWavDTzBMTsTHksZdleo/9A2aebT+tknBew="; hash = "sha256-Xl790WhqpWavDTzBMTsTHksZdleo/9A2aebT+tknBew=";
@ -36,6 +38,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
# Disables tests when running with cuda due to https://github.com/NixOS/nixpkgs/issues/225912
doCheck = !config.cudaSupport;
meta = with lib; { meta = with lib; {
license = licenses.mit; license = licenses.mit;
homepage = "https://github.com/ageitgey/face_recognition"; homepage = "https://github.com/ageitgey/face_recognition";

View File

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-resource-manager"; pname = "google-cloud-resource-manager";
version = "1.10.4"; version = "1.11.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-RWsl3do9TNJ0iKcnNrvDrwTXE64v42VcAbZqM50o1nk="; hash = "sha256-pkumu1lWNOzSRyuLAyLo8BKnYyd1Zlmi3enzktf6GvI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -48,8 +48,8 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Google Cloud Resource Manager API client library"; description = "Google Cloud Resource Manager API client library";
homepage = "https://github.com/googleapis/python-resource-manager"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager";
changelog = "https://github.com/googleapis/python-resource-manager/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${version}/packages/google-cloud-resource-manager/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

View File

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-secret-manager"; pname = "google-cloud-secret-manager";
version = "2.16.4"; version = "2.17.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-Nx3HL5FFrzI+ioE8jlA4DmrEvWpdvNQtzzFi2PN+UIA="; hash = "sha256-glTilgwGqNyRrqw8iUr7oIk6Z0WC8ODs/CL4lOYXPC8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -42,8 +42,8 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Secret Manager API API client library"; description = "Secret Manager API API client library";
homepage = "https://github.com/googleapis/python-secret-manager"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-secret-manager";
changelog = "https://github.com/googleapis/python-secret-manager/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-secret-manager-v${version}/packages/google-cloud-secret-manager/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ siriobalmelli ]; maintainers = with maintainers; [ siriobalmelli ];
}; };

View File

@ -19,14 +19,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "heudiconv"; pname = "heudiconv";
version = "1.0.0"; version = "1.0.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-cW6G2NtPZiyqqJ3w9a3Y/6blEaXtR9eGG5epPknimsw="; hash = "sha256-KMEvuxRFFbnyAez+cpcHKDDXdrHfeZcqlGNwy8RWTxg=";
}; };
postPatch = '' postPatch = ''

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "huggingface-hub"; pname = "huggingface-hub";
version = "0.20.2"; version = "0.20.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "huggingface"; owner = "huggingface";
repo = "huggingface_hub"; repo = "huggingface_hub";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-LYfkZVoQ+Jph7cyJYOIaAjtH8+fC/w8V+IWAqc1lHp4="; hash = "sha256-21Ay8RVS2vtQIh4bBUxE8jFk6F+yeFBJ3XgvRRNtNgI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -6,6 +6,7 @@
, jinja2 , jinja2
, lib , lib
, mock , mock
, openssh
, packaging , packaging
, pexpect , pexpect
, psutil , psutil
@ -13,6 +14,7 @@
, pytestCheckHook , pytestCheckHook
, pytest-dependency , pytest-dependency
, pytest-mock , pytest-mock
, pythonRelaxDepsHook
, pyudev , pyudev
, pyusb , pyusb
, pyyaml , pyyaml
@ -25,16 +27,17 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "labgrid"; pname = "labgrid";
version = "23.0.4"; version = "23.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "labgrid-project"; owner = "labgrid-project";
repo = "labgrid"; repo = "labgrid";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-EEPQSIHKAmLPudv7LLm9ol3Kukgz8edYKfDi+wvERpk="; hash = "sha256-jrapbSrybuLT3V11rvV342tOr7/sRwBMgAdNWDG5obA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pythonRelaxDepsHook
setuptools setuptools
setuptools-scm setuptools-scm
wheel wheel
@ -57,8 +60,25 @@ buildPythonPackage rec {
xmodem xmodem
]; ];
pythonRelaxDeps = [
"attrs"
"autobahn"
"jinja2"
"packaging"
"pexpect"
"pytest"
"pyudev"
"requests"
"xmodem"
];
pythonRemoveDeps = [
"pyserial-labgrid"
];
nativeCheckInputs = [ nativeCheckInputs = [
mock mock
openssh
psutil psutil
pytestCheckHook pytestCheckHook
pytest-mock pytest-mock

View File

@ -52,7 +52,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "langchain"; pname = "langchain";
version = "0.1.0"; version = "0.1.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -61,7 +61,7 @@ buildPythonPackage rec {
owner = "langchain-ai"; owner = "langchain-ai";
repo = "langchain"; repo = "langchain";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-izaSah1S0INsskdzE9b7Iw4yWBsNmN5fBI6BQgaHgE4="; hash = "sha256-cQz4u6FeVZLNbix4pyc6ulfj+nb/tARMJniusy7Q46A=";
}; };
sourceRoot = "${src.name}/libs/langchain"; sourceRoot = "${src.name}/libs/langchain";

View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "meraki"; pname = "meraki";
version = "1.41.0"; version = "1.42.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-aXcGMRqkiVPnLEYrzIMLDiFXWurBRNlMg4OnRd5jlrY="; hash = "sha256-PZ875cjJUUE92aBoKfgQ3tY8tVN3ksB7nITc8MK0g+w=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -45,7 +45,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mitmproxy"; pname = "mitmproxy";
version = "10.2.1"; version = "10.2.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -54,7 +54,7 @@ buildPythonPackage rec {
owner = "mitmproxy"; owner = "mitmproxy";
repo = "mitmproxy"; repo = "mitmproxy";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-BO7oQ4TVuZ4dCtROq2M24V6HVo0jzyBdQfb67dYA07U="; hash = "sha256-oxhpaFW++on3eRXm0anXZDRo6g/X5IflTcZkFF8Kcps=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,7 +2,6 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
, pythonRelaxDepsHook
, hatchling , hatchling
# propagated # propagated
, httpx , httpx
@ -11,6 +10,7 @@
, anyio , anyio
, distro , distro
, sniffio , sniffio
, cached-property
, tqdm , tqdm
# optional # optional
, numpy , numpy
@ -26,38 +26,32 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "openai"; pname = "openai";
version = "1.7.1"; version = "1.9.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7.1"; disabled = pythonOlder "3.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openai"; owner = "openai";
repo = "openai-python"; repo = "openai-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-NXZ+7gDA3gMGSrmgceHxcR45LrXdazXbYuhcoUsNXew="; hash = "sha256-+3tCttKWbWt3Nsf5E6NWYt0yLRV0kfj7Qz6PhaOmBsY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
hatchling hatchling
pythonRelaxDepsHook
];
pythonRelaxDeps = [
# https://github.com/openai/openai-python/issues/921
"anyio"
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
httpx httpx
pydantic pydantic
typing-extensions
anyio anyio
distro distro
sniffio sniffio
tqdm tqdm
] ++ lib.optionals (pythonOlder "3.8") [ ] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions cached-property
]; ];
passthru.optional-dependencies = { passthru.optional-dependencies = {
@ -80,15 +74,13 @@ buildPythonPackage rec {
dirty-equals dirty-equals
]; ];
pytestFlagsArray = [ disabledTests = [
"-W" "ignore::DeprecationWarning" # makes network requests
"test_streaming_response"
]; ];
OPENAI_API_KEY = "sk-foo";
disabledTestPaths = [ disabledTestPaths = [
# makes network requests # makes network requests
"tests/test_client.py"
"tests/api_resources" "tests/api_resources"
]; ];

View File

@ -4,23 +4,28 @@
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, requests , requests
, setuptools
, testfixtures , testfixtures
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "openerz-api"; pname = "openerz-api";
version = "0.2.0"; version = "0.3.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "misialq"; owner = "misialq";
repo = pname; repo = "openerz-api";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-6q0mKWyTTlNJ/DCeAsck1meM5dQovYBcV2EqmjlABvc="; hash = "sha256-CwK61StspZJt0TALv76zfibUzlriwp9HRoYOtX9bU+c=";
}; };
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
requests requests
]; ];
@ -34,11 +39,6 @@ buildPythonPackage rec {
"openerz_api" "openerz_api"
]; ];
disabledTests = [
# Assertion issue
"test_sensor_make_api_request"
];
meta = with lib; { meta = with lib; {
description = "Python module to interact with the OpenERZ API"; description = "Python module to interact with the OpenERZ API";
homepage = "https://github.com/misialq/openerz-api"; homepage = "https://github.com/misialq/openerz-api";

View File

@ -14,7 +14,7 @@
let let
self = buildPythonPackage rec { self = buildPythonPackage rec {
pname = "opentelemetry-api"; pname = "opentelemetry-api";
version = "1.21.0"; version = "1.22.0";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
# to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta
@ -22,7 +22,7 @@ let
owner = "open-telemetry"; owner = "open-telemetry";
repo = "opentelemetry-python"; repo = "opentelemetry-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-igG0oHRa6M4d7pMp7fgBo13x5XADZeYgFAL8WzDXsyw="; hash = "sha256-6BmBmooVaH1FOpgXpFlYth0r9XaNtmb9UezeP8hWEok=";
}; };
sourceRoot = "${src.name}/opentelemetry-api"; sourceRoot = "${src.name}/opentelemetry-api";

View File

@ -0,0 +1,45 @@
{ buildPythonPackage
, flask
, hatchling
, opentelemetry-api
, opentelemetry-instrumentation
, opentelemetry-instrumentation-wsgi
, opentelemetry-semantic-conventions
, opentelemetry-test-utils
, opentelemetry-util-http
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage {
inherit (opentelemetry-instrumentation) version src;
pname = "opentelemetry-instrumentation-flask";
disabled = pythonOlder "3.7";
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-flask";
format = "pyproject";
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [
flask
opentelemetry-api
opentelemetry-instrumentation
opentelemetry-instrumentation-wsgi
opentelemetry-semantic-conventions
opentelemetry-util-http
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.instrumentation.flask" ];
meta = opentelemetry-instrumentation.meta // {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-flask";
description = "Flask Middleware for OpenTelemetry based on the WSGI middleware";
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "opentelemetry-instrumentation"; pname = "opentelemetry-instrumentation";
version = "1.16.0"; version = "0.43b0";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
# to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "open-telemetry"; owner = "open-telemetry";
repo = "opentelemetry-python-contrib"; repo = "opentelemetry-python-contrib";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-6tGQjPBej2zv5yJN0S46le3kyD7q3TELYyDmyxlp5Wo="; hash = "sha256-fUyA3cPXAxO506usEWxOUX9xiapc8Ocnbx73LP6ghRE=";
}; };
sourceRoot = "${src.name}/opentelemetry-instrumentation"; sourceRoot = "${src.name}/opentelemetry-instrumentation";

View File

@ -33,6 +33,12 @@ buildPythonPackage {
pytestCheckHook pytestCheckHook
]; ];
# https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1940
disabledTests = [
"test_nonstandard_method"
"test_nonstandard_method_allowed"
];
pythonImportsCheck = [ "opentelemetry.util.http" ]; pythonImportsCheck = [ "opentelemetry.util.http" ];
meta = opentelemetry-instrumentation.meta // { meta = opentelemetry-instrumentation.meta // {

View File

@ -23,7 +23,7 @@
, ptex , ptex
, embree , embree
, alembic , alembic
, openexr , imath
, flex , flex
, bison , bison
, qt6 , qt6
@ -94,7 +94,7 @@ buildPythonPackage rec {
ptex ptex
embree embree
alembic.dev alembic.dev
openexr imath
flex flex
bison bison
boost boost

View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pglast"; pname = "pglast";
version = "5.8"; version = "6.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-+3ysQuGrAH5xCBKaP0T/PLfbmLuxiKHPB+76D32GG9E="; hash = "sha256-XdQQsknvZ4Nlmlsh/Lnp0bGjaduqaoH8IKPTOqBWhrU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -14,7 +14,7 @@
}: }:
let let
pname = "posthog"; pname = "posthog";
version = "3.3.1"; version = "3.3.2";
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
@ -24,7 +24,7 @@ buildPythonPackage {
owner = "PostHog"; owner = "PostHog";
repo = "posthog-python"; repo = "posthog-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-aF2Q3ztoFV7j47edtHiLddw+PZyMz6EHj3Zu55rOcF8="; hash = "sha256-7Bs0KDa799qt8sKwmj6oO0L/nWzczI+UXGWNXGv7B7s=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pot"; pname = "pot";
version = "0.9.2"; version = "0.9.3";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "PythonOT"; owner = "PythonOT";
repo = "POT"; repo = "POT";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-sq8jIWC2DD0T6675W4THbNethm7a//U8HuccKuK0Hjo="; hash = "sha256-fdqDM0V6zTFe1lcqi53ZZNHAfmuR2I7fdX4SN9qeNn8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -6,14 +6,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyasyncore"; pname = "pyasyncore";
version = "1.0.2"; version = "1.0.3";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simonrob"; owner = "simonrob";
repo = "pyasyncore"; repo = "pyasyncore";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-8U46q1QIjBkFh04NkAHZ0XRutlzpJHZWAqDZJj3tdEk="; hash = "sha256-e1iHC9mbQYlfpIdLk033wvoA5z5WcHjOZm6oFTfpRTA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -10,14 +10,14 @@ let
inherit (darwin) autoSignDarwinBinariesHook; inherit (darwin) autoSignDarwinBinariesHook;
in buildPythonPackage (rec { in buildPythonPackage (rec {
pname = "PyQtWebEngine"; pname = "PyQtWebEngine";
version = "5.15.4"; version = "5.15.6";
format = "pyproject"; format = "pyproject";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f"; sha256 = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE=";
}; };
postPatch = '' postPatch = ''

View File

@ -2,26 +2,26 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, appdirs , appdirs
, requests , httpx
, setuptools , setuptools
, pythonOlder , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyradios"; pname = "pyradios";
version = "2.0.0"; version = "2.1.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-Uqg/owmf2popAhyanAUIdSWpXAGCWkQja4P944BpNhc="; hash = "sha256-XTpw8bgFZo35PJngr9oweU6fY3KAphJsrEhkKzWHLIA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
appdirs appdirs
requests httpx
setuptools setuptools
]; ];

View File

@ -16,12 +16,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-openstackclient"; pname = "python-openstackclient";
version = "6.3.0"; version = "6.4.0";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-m6C9+NAwh+WFtAqNzEKc673V/ewkwdYKECv58zEyDfE="; hash = "sha256-DGq0AWjqUf7WiBmqJR+CU96aYdrMlt0bZHOfGJ/CGD8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "scikit-hep-testdata"; pname = "scikit-hep-testdata";
version = "0.4.35"; version = "0.4.37";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "scikit-hep"; owner = "scikit-hep";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-1SROsrl7zBaZRDju1M6wlKLZypk9OswA8kromiJGeqw="; hash = "sha256-/zg6B1vBDaHXRSMo+Wy+CuQaBXP7v1hX2X2cK/7Djlk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

Some files were not shown because too many files have changed in this diff Show More