mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-14 08:31:40 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
a73d2d9b62
@ -12,7 +12,9 @@
|
||||
|
||||
## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
- `nvimpager` was updated to version 0.13.0, which changes the order of user and
|
||||
nvimpager settings: user commands in `-c` and `--cmd` now override the
|
||||
respective default settings because they are executed later.
|
||||
|
||||
## Other Notable Changes {#sec-release-24.11-notable-changes}
|
||||
|
||||
|
||||
@ -83,6 +83,15 @@ in
|
||||
} ++ (lib.mapAttrsToList (vhost: conf: {
|
||||
virtualHosts.${vhost} = {
|
||||
locations = {
|
||||
"/".extraConfig = ''
|
||||
# pass information via X-User and X-Email headers to backend, requires running with --set-xauthrequest flag
|
||||
proxy_set_header X-User $user;
|
||||
proxy_set_header X-Email $email;
|
||||
|
||||
# if you enabled --cookie-refresh, this is needed for it to work with auth_request
|
||||
add_header Set-Cookie $auth_cookie;
|
||||
'';
|
||||
|
||||
"/oauth2/auth" = let
|
||||
maybeQueryArg = name: value:
|
||||
if value == null then null
|
||||
@ -102,6 +111,7 @@ in
|
||||
proxy_pass_request_body off;
|
||||
'';
|
||||
};
|
||||
|
||||
"@redirectToAuth2ProxyLogin" = {
|
||||
return = "307 https://${cfg.domain}/oauth2/start?rd=$scheme://$host$request_uri";
|
||||
extraConfig = ''
|
||||
@ -114,16 +124,10 @@ in
|
||||
auth_request /oauth2/auth;
|
||||
error_page 401 = @redirectToAuth2ProxyLogin;
|
||||
|
||||
# pass information via X-User and X-Email headers to backend,
|
||||
# requires running with --set-xauthrequest flag
|
||||
# set variables being used in locations."/".extraConfig
|
||||
auth_request_set $user $upstream_http_x_auth_request_user;
|
||||
auth_request_set $email $upstream_http_x_auth_request_email;
|
||||
proxy_set_header X-User $user;
|
||||
proxy_set_header X-Email $email;
|
||||
|
||||
# if you enabled --cookie-refresh, this is needed for it to work with auth_request
|
||||
auth_request_set $auth_cookie $upstream_http_set_cookie;
|
||||
add_header Set-Cookie $auth_cookie;
|
||||
'';
|
||||
};
|
||||
}) cfg.virtualHosts)));
|
||||
|
||||
@ -135,7 +135,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit nixos-icons;
|
||||
inherit (perlPackages) ImageMagick;
|
||||
inherit (python3.pkgs) img2pdf;
|
||||
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
version = lib.head (lib.splitString "-" finalAttrs.version);
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stern";
|
||||
version = "1.29.0";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stern";
|
||||
repo = "stern";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8Tvhul7GwVbRJqJenbYID8OY5zGzFhIormUwEtLE0Lw=";
|
||||
sha256 = "sha256-sqRPX+NC58mQi0wvs3u3Lb81LBntaY1FzzlY1TIiz18=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RLcF7KfKtkwB+nWzaQb8Va9pau+TS2uE9AmJ0aFNsik=";
|
||||
|
||||
@ -52,13 +52,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdrangel";
|
||||
version = "7.20.1";
|
||||
version = "7.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4exb";
|
||||
repo = "sdrangel";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8v00JiPRCFqg+6wEZw5BrsHMvUYweigbroBHKQGOlHI=";
|
||||
hash = "sha256-TbOGuxFFBSjva1dbZxd2oQJs6X43QWYSU6VjlXKlDfk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "git-delete-merged-branches";
|
||||
version = "7.4.0";
|
||||
version = "7.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hartwork";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-17uFV3pjklqVW5ofeR54mgMh+q3uUCdqZG00Cc+4zFQ=";
|
||||
sha256 = "sha256-1CUwac2TPU5s1uLS1zPvtXZEGCWYwm1y935jqbI173Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@ -18,16 +18,16 @@ let
|
||||
gix = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/gix";
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "gitoxide";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "gitoxide";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Sl7nNYoiCdTZ50tIfJcq5x9KOBkgJsb5bq09chWbyQc=";
|
||||
hash = "sha256-HXuMcLY5BAC2dODlI6sgwCyGEBDW6ojlHRCBnIQ6P6A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-G1NWRkhcmFrcHaIxQ7nzvRejPZUuZQDiNonZykkt4qM=";
|
||||
cargoHash = "sha256-v+HVrYMPwbD0RDyxufv11KOnWGbTljpbx6ZlSJ46Olk=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
|
||||
|
||||
|
||||
@ -1,16 +1,19 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ablog";
|
||||
version = "0.11.8";
|
||||
version = "0.11.10";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PpNBfa4g14l8gm9+PxOFc2NDey031D7Ohutx2OGUeak=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunpy";
|
||||
repo = "ablog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8NyFLGtMJLUkojEhWpWNZz3zlfgGVgSvgk4dDEz1jzs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
@ -31,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
defusedxml
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
@ -39,6 +43,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "ABlog for blogging with Sphinx";
|
||||
mainProgram = "ablog";
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, getopt
|
||||
, ksh
|
||||
, bc
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, llvmPackages, elfutils, bcc
|
||||
, libbpf, libbfd, libopcodes
|
||||
, cereal, asciidoctor
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, dbus
|
||||
, file
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ buildGoModule
|
||||
, dependabot-cli
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, lib
|
||||
, testers
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ldc
|
||||
, curl
|
||||
}:
|
||||
|
||||
37
pkgs/by-name/fc/fcast-client/package.nix
Normal file
37
pkgs/by-name/fc/fcast-client/package.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitLab,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fcast-client";
|
||||
version = "0.1.0-unstable-2024-05-23";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.futo.org";
|
||||
owner = "videostreaming";
|
||||
repo = "fcast";
|
||||
rev = "cc07f95d2315406fcacf67cb3abb98efff5df5d9";
|
||||
hash = "sha256-vsD4xgrC5KbnZT6hPX3fi3M/CH39LtoRfa6nYD0iFew=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/clients/terminal";
|
||||
cargoHash = "sha256-VVG7AbwbbgCANMcFYNAIF76MQr7Fkmq5HXPxL3MnEhI=";
|
||||
|
||||
meta = {
|
||||
description = "FCast Client Terminal, a terminal open-source media streaming client";
|
||||
homepage = "https://fcast.org/";
|
||||
license = lib.licenses.gpl3;
|
||||
longDescription = ''
|
||||
FCast is a protocol designed for wireless streaming of audio and video
|
||||
content between devices. Unlike alternative protocols like Chromecast and
|
||||
AirPlay, FCast is an open source protocol that allows for custom receiver
|
||||
implementations, enabling third-party developers to create their own
|
||||
receiver devices or integrate the FCast protocol into their own apps.
|
||||
'';
|
||||
mainProgram = "fcast-client";
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, expat
|
||||
, flac
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, cmake
|
||||
, llvm
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, mbedtls
|
||||
, gtk3
|
||||
, pkg-config
|
||||
|
||||
@ -1,15 +1,11 @@
|
||||
# SolidPython is an unmaintained library with old dependencies.
|
||||
{ buildPythonPackage
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, lib
|
||||
, pythonRelaxDepsHook
|
||||
|
||||
, poetry-core
|
||||
, prettytable
|
||||
, pypng
|
||||
, ply
|
||||
, setuptools
|
||||
, euclid3
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, fetchzip
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, gettext
|
||||
, libtool
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcpuid";
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, zlib
|
||||
, openssl
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
atf,
|
||||
libiconvReal,
|
||||
meson,
|
||||
|
||||
40
pkgs/by-name/ls/lse/package.nix
Normal file
40
pkgs/by-name/ls/lse/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
bash,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lse";
|
||||
version = "4.14nw";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diego-treitos";
|
||||
repo = "linux-smart-enumeration";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qGLmrbyeyhHG6ONs7TJLTm68xpvxB1iAnMUApfTSqEk=";
|
||||
};
|
||||
|
||||
buildInputs = [ bash ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp lse.sh $out/bin/lse.sh
|
||||
wrapProgram $out/bin/lse.sh \
|
||||
--prefix PATH : ${lib.makeBinPath [ bash ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux enumeration tool with verbosity levels";
|
||||
homepage = "https://github.com/diego-treitos/linux-smart-enumeration";
|
||||
changelog = "https://github.com/diego-treitos/linux-smart-enumeration/releases/tag/${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "lse.sh";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, glfw
|
||||
, darwin
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, makeWrapper
|
||||
, writeText
|
||||
, shellspec
|
||||
, fetchpatch
|
||||
# usage:
|
||||
# pkgs.mommy.override {
|
||||
# mommySettings.sweetie = "catgirl";
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nuclei-templates";
|
||||
version = "9.8.6";
|
||||
version = "9.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3hJfWSBciJ/UutVBIGisptcxmtWfvSfTbx55cyWxs4k=";
|
||||
hash = "sha256-Masj0v9WGcLJKd/43T4klwyIM2uqhvuLSW5PBuKzsQg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, protobuf
|
||||
, go-protobuf
|
||||
, pkg-config
|
||||
, libnetfilter_queue
|
||||
, libnfnetlink
|
||||
, lib
|
||||
, coreutils
|
||||
, iptables
|
||||
, makeWrapper
|
||||
, protoc-gen-go-grpc
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
darwin,
|
||||
dlib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
hdf5,
|
||||
hmat-oss,
|
||||
ipopt,
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildBazelPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
bazel_6,
|
||||
jdk,
|
||||
elfutils,
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, perl
|
||||
# Needed if you want to use it for a perl script with dependencies.
|
||||
|
||||
30
pkgs/by-name/ra/rasm/package.nix
Normal file
30
pkgs/by-name/ra/rasm/package.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rasm";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdouardBERGE";
|
||||
repo = "rasm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cG/RZqZRS5uuXlQo7hylCEfbXXLBa68NXsr1iQCjhNc=";
|
||||
};
|
||||
|
||||
# by default the EXEC variable contains `rasm.exe`
|
||||
makeFlags = [ "EXEC=rasm" ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin rasm
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://rasm.wikidot.com/english-index:home";
|
||||
description = "Z80 assembler";
|
||||
mainProgram = "rasm";
|
||||
# use -n option to display all licenses
|
||||
license = licenses.mit; # expat version
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, requireFile
|
||||
, fetchpatch
|
||||
, runCommand
|
||||
, rcu
|
||||
, testers
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "reactphysics3d";
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitea, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests
|
||||
{ lib, stdenv, fetchFromGitea, fetchurl, lua, jemalloc, pkg-config, nixosTests
|
||||
, tcl, which, ps, getconf
|
||||
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
|
||||
# dependency ordering is broken at the moment when building with openssl
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, nixosTests
|
||||
}:
|
||||
let
|
||||
|
||||
66
pkgs/by-name/sh/share-preview/package.nix
Normal file
66
pkgs/by-name/sh/share-preview/package.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
rustc,
|
||||
cargo,
|
||||
wrapGAppsHook4,
|
||||
desktop-file-utils,
|
||||
libadwaita,
|
||||
openssl,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "share-preview";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafaelmardojai";
|
||||
repo = "share-preview";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
name = "share-preview-${finalAttrs.version}";
|
||||
hash = "sha256-Gh6bQZD1mlkj3XeGp+fF/NShC4PZCZSEqymrsSdX4Ec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
cargo
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optionals stdenv.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ]
|
||||
);
|
||||
|
||||
meta = {
|
||||
description = "Preview and debug websites metadata tags for social media share";
|
||||
homepage = "https://apps.gnome.org/SharePreview";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "share-preview";
|
||||
maintainers = with lib.maintainers; [ aleksana ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, cmake
|
||||
, expat
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "soju";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~emersion";
|
||||
repo = "soju";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nzaYa4h+UZcP6jqFHxVjgQ/F3q9aOeOPgVKFWBy6Fag=";
|
||||
hash = "sha256-K7Dgc1HQ6+GnjraQNcK9LOFxUIoKKWro1mWKDZFwLiE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JLght6bOrtc/VP3tfQboASa68VL2GGBTdK02DOC5EQk=";
|
||||
vendorHash = "sha256-4Yl87Gk/HykjIyNpRfgthLf6b+v7kxmONIhYBWVXi0I=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@ -50,6 +50,6 @@ buildGoModule rec {
|
||||
homepage = "https://soju.im";
|
||||
changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ azahi malte-v ];
|
||||
maintainers = with maintainers; [ azahi malte-v jtbx ];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config, scdoc, wayland-scanner
|
||||
, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
|
||||
}:
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, cmake
|
||||
, pkg-config
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "yamlscript";
|
||||
version = "0.1.58";
|
||||
version = "0.1.59";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
|
||||
hash = "sha256-rARUkbVq77uPrQZwfQ0NNM4XwYaVhSinLi0sCoVR63E=";
|
||||
hash = "sha256-I5Z9QB8ZmTyeMs/WxUhJZM65VpUIx+t7QKzCRuRdRG4=";
|
||||
};
|
||||
|
||||
executable = "ys";
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, SDL2
|
||||
, aalib
|
||||
, alsa-lib
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
, hicolor-icon-theme
|
||||
, gtk3
|
||||
@ -13,13 +12,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "elementary-icon-theme";
|
||||
version = "7.3.1";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "icons";
|
||||
rev = version;
|
||||
sha256 = "sha256-3qvbpY1O8E3sX+66yBoZXEOeWQrgyNu2rOT6PPbli58=";
|
||||
sha256 = "sha256-EPmQgE33+HBI78SlCBV3WlyLCP6AggvqsQa7gZuOMRM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,7 +26,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
librsvg
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
xcursorgen
|
||||
];
|
||||
|
||||
@ -42,11 +40,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
"-Dpalettes=false" # Don't install gimp and inkscape palette files
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/symlink.py
|
||||
patchShebangs meson/symlink.py
|
||||
'';
|
||||
|
||||
postFixup = "gtk-update-icon-cache $out/share/icons/elementary";
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gprbuild-boot
|
||||
, which
|
||||
, gnat
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }:
|
||||
{ lib, stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }:
|
||||
|
||||
let
|
||||
options = rec {
|
||||
|
||||
@ -41,6 +41,11 @@ edk2 = stdenv.mkDerivation rec {
|
||||
url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch";
|
||||
hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw=";
|
||||
})
|
||||
# https://github.com/tianocore/edk2/pull/5658
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tianocore/edk2/commit/a34ff4a8f69a7b8a52b9b299153a8fac702c7df1.patch";
|
||||
hash = "sha256-u+niqwjuLV5tNPykW4xhb7PW2XvUmXhx5uvftG1UIbU=";
|
||||
})
|
||||
];
|
||||
|
||||
srcWithVendoring = fetchFromGitHub {
|
||||
@ -88,8 +93,8 @@ edk2 = stdenv.mkDerivation rec {
|
||||
mv -v edksetup.sh $out
|
||||
# patchShebangs fails to see these when cross compiling
|
||||
for i in $out/BaseTools/BinWrappers/PosixLike/*; do
|
||||
substituteInPlace $i --replace '/usr/bin/env bash' ${buildPackages.bash}/bin/bash
|
||||
chmod +x "$i"
|
||||
patchShebangs --build "$i"
|
||||
done
|
||||
'';
|
||||
|
||||
@ -118,13 +123,13 @@ edk2 = stdenv.mkDerivation rec {
|
||||
|
||||
prePatch = ''
|
||||
rm -rf BaseTools
|
||||
ln -sv ${edk2}/BaseTools BaseTools
|
||||
ln -sv ${buildPackages.edk2}/BaseTools BaseTools
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
export WORKSPACE="$PWD"
|
||||
. ${edk2}/edksetup.sh BaseTools
|
||||
. ${buildPackages.edk2}/edksetup.sh BaseTools
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
, autoconf
|
||||
, automake
|
||||
, coreutils
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, fetchgit
|
||||
, perl
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, callPackage
|
||||
, gnat
|
||||
, zlib
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb
|
||||
# the default test target is sse4, but that is not supported by all Hydra agents
|
||||
, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
, ncurses
|
||||
, libX11, xorgproto, buildEnv
|
||||
, fetchpatch
|
||||
, useX11 ? stdenv.hostPlatform.isx86
|
||||
}:
|
||||
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
let
|
||||
version = {
|
||||
feature = "16";
|
||||
interim = "0";
|
||||
build = "36";
|
||||
interim = ".0.2-ga";
|
||||
build = "1";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
@ -20,13 +20,14 @@ let
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${version.feature}+${version.build}";
|
||||
version = "${version.feature}${version.interim}+${version.build}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jdk${version.feature}u";
|
||||
rev = "jdk-${version.feature}+${version.build}";
|
||||
sha256 = "165nr15dqfcxzsl5z95g4iklln4rlfkgdigdma576mx8813ldi44";
|
||||
rev = "jdk-${version.feature}${version.interim}";
|
||||
# rev = "jdk-${version.feature}${version.interim}+${version.build}";
|
||||
sha256 = "sha256-/8XHNrf9joCCXMCyPncT54JhqlF+KBL7eAf8hUW/BxU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||
|
||||
@ -11,7 +11,8 @@
|
||||
let
|
||||
version = {
|
||||
feature = "18";
|
||||
build = "36";
|
||||
interim = ".0.2.1";
|
||||
build = "1";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
@ -19,13 +20,13 @@ let
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${version.feature}+${version.build}";
|
||||
version = "${version.feature}${version.interim}+${version.build}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jdk${version.feature}u";
|
||||
rev = "jdk-${version.feature}+${version.build}";
|
||||
sha256 = "sha256-yGPC8VA983Ml6Fv/oiEgRrcVe4oe+Q4oCHbzOmFbZq8=";
|
||||
rev = "jdk-${version.feature}${version.interim}+${version.build}";
|
||||
sha256 = "sha256-L6dsN0kqWcfemM8LBg62qtHQdymwRQoV1ndc8r+0qn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
let
|
||||
version = {
|
||||
feature = "19";
|
||||
interim = ".0.2";
|
||||
build = "7";
|
||||
interim = "-ga";
|
||||
build = "";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
@ -23,13 +23,15 @@ let
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${version.feature}${version.interim}+${version.build}";
|
||||
version = "${version.feature}${version.interim}";
|
||||
# version = "${version.feature}${version.interim}+${version.build}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jdk${version.feature}u";
|
||||
rev = "jdk-${version.feature}${version.interim}+${version.build}";
|
||||
hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI=";
|
||||
rev = "jdk-${version.feature}${version.interim}";
|
||||
# rev = "jdk-${version.feature}${version.interim}+${version.build}";
|
||||
hash = "sha256-XbYTku/nWF+maBvYz2rJYIUBEgOmqICKjk9wufHqyj0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
let
|
||||
version = {
|
||||
feature = "20";
|
||||
interim = "";
|
||||
build = "36";
|
||||
interim = ".0.2";
|
||||
build = "9";
|
||||
};
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
@ -29,7 +29,7 @@ let
|
||||
owner = "openjdk";
|
||||
repo = "jdk${version.feature}u";
|
||||
rev = "jdk-${version.feature}${version.interim}+${version.build}";
|
||||
hash = "sha256-fXoSO8nq5qpUYbCtbrRr2C46XRdYX77Pxmk7GfmlZV4=";
|
||||
hash = "sha256-CZH2JwR+MrkTlLdcVYuFRB3McdrM0A+1YaSjNpjYwak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless
|
||||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless
|
||||
, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
|
||||
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand
|
||||
, withMedia ? true
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
let
|
||||
major = "20";
|
||||
update = "";
|
||||
build = "+19";
|
||||
update = ".0.2";
|
||||
build = "-ga";
|
||||
repover = "${major}${update}${build}";
|
||||
gradle_ = (gradle_7.override {
|
||||
# note: gradle does not yet support running on 19
|
||||
@ -30,9 +30,9 @@ let
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jfx";
|
||||
repo = "jfx20u";
|
||||
rev = repover;
|
||||
hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU=";
|
||||
hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o=";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless
|
||||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless
|
||||
, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
|
||||
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand
|
||||
, withMedia ? true
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, runCommand
|
||||
, writeText
|
||||
@ -26,8 +25,8 @@
|
||||
|
||||
let
|
||||
major = "22";
|
||||
update = "";
|
||||
build = "+30";
|
||||
update = ".0.1";
|
||||
build = "-ga";
|
||||
repover = "${major}${update}${build}";
|
||||
|
||||
icuVersionWithSep = s: "73${s}1";
|
||||
@ -45,9 +44,9 @@ let
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jfx";
|
||||
repo = "jfx22u";
|
||||
rev = repover;
|
||||
hash = "sha256-sZF7ZPC0kgTTxWgtkxmGtOlfroGPGVZcMw0/wSTJUxQ=";
|
||||
hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q=";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rasm";
|
||||
version = "0.117";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip";
|
||||
sha256 = "1hwily4cfays59qm7qd1ax48i7cpbxhs5l9mfpyn7m2lxsfqrl3z";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
buildPhase = ''
|
||||
# according to official documentation
|
||||
${stdenv.cc.targetPrefix}cc rasm_v*.c -O2 -lm -o rasm
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin rasm
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.roudoudou.com/rasm/";
|
||||
description = "Z80 assembler";
|
||||
mainProgram = "rasm";
|
||||
# use -n option to display all licenses
|
||||
license = licenses.mit; # expat version
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -3,7 +3,6 @@
|
||||
, boost
|
||||
, cmake
|
||||
, coreutils
|
||||
, fetchpatch
|
||||
, jq
|
||||
, ncurses
|
||||
, python3
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, bash-completion, perl, ncurses, zlib, sqlite, libffi
|
||||
, mcpp, cmake, bison, flex, doxygen, graphviz
|
||||
, makeWrapper
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook
|
||||
{ stdenv, lib, fetchurl, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook
|
||||
, gnome, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, vala, gobject-introspection
|
||||
}:
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ fetchpatch, mkDerivation }:
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "2.1.3";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# similar to interpreters/python/default.nix
|
||||
{ stdenv, config, lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, makeBinaryWrapper }:
|
||||
{ stdenv, config, lib, callPackage, fetchFromGitHub, fetchurl, makeBinaryWrapper }:
|
||||
|
||||
|
||||
let
|
||||
|
||||
@ -22,7 +22,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(CFLAGS="-O2 -std=c89")
|
||||
'';
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# ...-bash-5.2-p15/bin/bash: line 1: ...-s9fes-20181205/bin/s9help: No such file or directory
|
||||
# make: *** [Makefile:157: install-util] Error 1
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmer";
|
||||
version = "4.2.7";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wasmerio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jyA1DUouODq9giAWeGOw7VMGwA+FbyqpEU77jtCb5v4=";
|
||||
hash = "sha256-1bxxy0Dso54cYQIZC9UUjtkgL1eyd3oRbhaYCwI0otw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EpHM8YaT2Ty9IBX/gXEa9n8006A9Y5/fq/ueODxHlnc=";
|
||||
cargoHash = "sha256-3MwQZdFIWqHvELpIGlqsn/VKyobWki7OcMXQrjbxwKk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@ -0,0 +1,95 @@
|
||||
From 0259f2b936ee0d9288ff39c509c69a66f5b13b80 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Vigerske <svigerske@gams.com>
|
||||
Date: Mon, 11 Mar 2019 16:34:25 +0000
|
||||
Subject: [PATCH 1/2] change more reinterpret_cast from NULL to C-cast, see
|
||||
also #93
|
||||
|
||||
---
|
||||
Clp/src/AbcSimplex.cpp | 48 +++++++++++++++++++++---------------------
|
||||
Clp/src/ClpModel.cpp | 2 +-
|
||||
2 files changed, 25 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/Clp/src/AbcSimplex.cpp b/Clp/src/AbcSimplex.cpp
|
||||
index 0eacd91e..1715e6d8 100644
|
||||
--- a/Clp/src/AbcSimplex.cpp
|
||||
+++ b/Clp/src/AbcSimplex.cpp
|
||||
@@ -368,19 +368,19 @@ AbcSimplex::gutsOfInitialize(int numberRows,int numberColumns,bool doMore)
|
||||
// say Steepest pricing
|
||||
abcDualRowPivot_ = new AbcDualRowSteepest();
|
||||
abcPrimalColumnPivot_ = new AbcPrimalColumnSteepest();
|
||||
- internalStatus_ = newArray(reinterpret_cast<unsigned char *>(NULL),
|
||||
+ internalStatus_ = newArray((unsigned char *)NULL,
|
||||
sizeArray+maximumNumberTotal_);
|
||||
- abcLower_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- abcUpper_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- abcCost_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+maximumNumberTotal_);
|
||||
- abcDj_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- abcSolution_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+maximumNumberTotal_);
|
||||
- //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
|
||||
- //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
|
||||
- scaleFromExternal_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- offset_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- abcPerturbation_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- abcPivotVariable_ = newArray(reinterpret_cast<int *>(NULL),maximumAbcNumberRows_);
|
||||
+ abcLower_ = newArray((double *)NULL,sizeArray);
|
||||
+ abcUpper_ = newArray((double *)NULL,sizeArray);
|
||||
+ abcCost_ = newArray((double *)NULL,sizeArray+maximumNumberTotal_);
|
||||
+ abcDj_ = newArray((double *)NULL,sizeArray);
|
||||
+ abcSolution_ = newArray((double *)NULL,sizeArray+maximumNumberTotal_);
|
||||
+ //fromExternal_ = newArray((int *)NULL,sizeArray);
|
||||
+ //toExternal_ = newArray((int *)NULL,sizeArray);
|
||||
+ scaleFromExternal_ = newArray((double *)NULL,sizeArray);
|
||||
+ offset_ = newArray((double *)NULL,sizeArray);
|
||||
+ abcPerturbation_ = newArray((double *)NULL,sizeArray);
|
||||
+ abcPivotVariable_ = newArray((int *)NULL,maximumAbcNumberRows_);
|
||||
// Fill perturbation array
|
||||
setupPointers(maximumAbcNumberRows_,maximumAbcNumberColumns_);
|
||||
fillPerturbation(0,maximumNumberTotal_);
|
||||
@@ -554,19 +554,19 @@ AbcSimplex::createSubProblem(int numberColumns,const int * whichColumn)
|
||||
subProblem->maximumNumberTotal_= maximumAbcNumberRows_+numberColumns;
|
||||
subProblem->numberTotalWithoutFixed_= subProblem->numberTotal_;
|
||||
int sizeArray=2*subProblem->maximumNumberTotal_+maximumAbcNumberRows_;
|
||||
- subProblem->internalStatus_ = newArray(reinterpret_cast<unsigned char *>(NULL),
|
||||
+ subProblem->internalStatus_ = newArray((unsigned char *)NULL,
|
||||
sizeArray+subProblem->maximumNumberTotal_);
|
||||
- subProblem->abcLower_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- subProblem->abcUpper_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- subProblem->abcCost_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+subProblem->maximumNumberTotal_);
|
||||
- subProblem->abcDj_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- subProblem->abcSolution_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+subProblem->maximumNumberTotal_);
|
||||
- //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
|
||||
- //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
|
||||
- subProblem->scaleFromExternal_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- subProblem->offset_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- subProblem->abcPerturbation_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
|
||||
- subProblem->abcPivotVariable_ = newArray(reinterpret_cast<int *>(NULL),maximumAbcNumberRows_);
|
||||
+ subProblem->abcLower_ = newArray((double *)NULL,sizeArray);
|
||||
+ subProblem->abcUpper_ = newArray((double *)NULL,sizeArray);
|
||||
+ subProblem->abcCost_ = newArray((double *)NULL,sizeArray+subProblem->maximumNumberTotal_);
|
||||
+ subProblem->abcDj_ = newArray((double *)NULL,sizeArray);
|
||||
+ subProblem->abcSolution_ = newArray((double *)NULL,sizeArray+subProblem->maximumNumberTotal_);
|
||||
+ //fromExternal_ = newArray((int *)NULL,sizeArray);
|
||||
+ //toExternal_ = newArray((int *)NULL,sizeArray);
|
||||
+ subProblem->scaleFromExternal_ = newArray((double *)NULL,sizeArray);
|
||||
+ subProblem->offset_ = newArray((double *)NULL,sizeArray);
|
||||
+ subProblem->abcPerturbation_ = newArray((double *)NULL,sizeArray);
|
||||
+ subProblem->abcPivotVariable_ = newArray((int *)NULL,maximumAbcNumberRows_);
|
||||
subProblem->setupPointers(maximumAbcNumberRows_,numberColumns);
|
||||
// could use arrays - but for now be safe
|
||||
int * backward = new int [numberFullColumns+numberRows_];
|
||||
diff --git a/Clp/src/ClpModel.cpp b/Clp/src/ClpModel.cpp
|
||||
index 1fc905c4..83aa3b63 100644
|
||||
--- a/Clp/src/ClpModel.cpp
|
||||
+++ b/Clp/src/ClpModel.cpp
|
||||
@@ -3845,7 +3845,7 @@ ClpModel::writeMps(const char *filename,
|
||||
writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX,
|
||||
getColLower(), getColUpper(),
|
||||
objective,
|
||||
- reinterpret_cast<const char*> (NULL) /*integrality*/,
|
||||
+ (const char*)NULL /*integrality*/,
|
||||
getRowLower(), getRowUpper(),
|
||||
columnNames, rowNames);
|
||||
// Pass in array saying if each variable integer
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From b36a5bd502fbf6b8ad31b6bc35c7bab4aff24313 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Vigerske <svigerske@gams.com>
|
||||
Date: Mon, 20 Jul 2020 18:39:20 +0200
|
||||
Subject: [PATCH] use static_cast for static cast, fixes #319
|
||||
|
||||
---
|
||||
Cbc/src/CbcModel.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Cbc/src/CbcModel.cpp b/Cbc/src/CbcModel.cpp
|
||||
index 8603942b..239bf0b4 100644
|
||||
--- a/Cbc/src/CbcModel.cpp
|
||||
+++ b/Cbc/src/CbcModel.cpp
|
||||
@@ -5357,7 +5357,7 @@ void CbcModel::branchAndBound(int doStatistics)
|
||||
OsiClpSolverInterface * clpSolver
|
||||
= dynamic_cast<OsiClpSolverInterface *> (solver_);
|
||||
if (clpSolver)
|
||||
- clpSolver->setFakeObjective(reinterpret_cast<double *> (NULL));
|
||||
+ clpSolver->setFakeObjective(static_cast<double *> (NULL));
|
||||
}
|
||||
#endif
|
||||
moreSpecialOptions_ = saveMoreSpecialOptions;
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 4571de031e528bc145590d6a1be5ceb87bd8cdb5 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Vigerske <svigerske@gams.com>
|
||||
Date: Mon, 11 Mar 2019 16:29:20 +0000
|
||||
Subject: [PATCH 2/2] change reinterpret_cast of NULL to C-style case, fixes
|
||||
#93
|
||||
|
||||
---
|
||||
Clp/src/OsiClp/OsiClpSolverInterface.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Clp/src/OsiClp/OsiClpSolverInterface.cpp b/Clp/src/OsiClp/OsiClpSolverInterface.cpp
|
||||
index 55dd4dcd..a0217d42 100644
|
||||
--- a/Clp/src/OsiClp/OsiClpSolverInterface.cpp
|
||||
+++ b/Clp/src/OsiClp/OsiClpSolverInterface.cpp
|
||||
@@ -1448,7 +1448,7 @@ OsiClpSolverInterface::setupForRepeatedUse(int senseOfAdventure, int printOut)
|
||||
if (stopPrinting) {
|
||||
CoinMessages * messagesPointer = modelPtr_->messagesPointer();
|
||||
// won't even build messages
|
||||
- messagesPointer->setDetailMessages(100,10000,reinterpret_cast<int *> (NULL));
|
||||
+ messagesPointer->setDetailMessages(100,10000,(int*)NULL);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "CoinMP";
|
||||
@ -9,6 +9,22 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# backport build fixes for pkgsMusl.CoinMP
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coin-or/Cgl/commit/57d8c71cd50dc27a89eaeb4672499bca55f1fd72.patch";
|
||||
extraPrefix = "Cgl/";
|
||||
stripLen = 1;
|
||||
hash = "sha256-NdwXpIL1w6kHVfhBFscTlpriQOfUXx860/4x7pK+698=";
|
||||
})
|
||||
# https://github.com/coin-or/Clp/commit/b637e1d633425ae21ec041bf7f9e06f56b741de0
|
||||
./0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch
|
||||
# https://github.com/coin-or/Clp/commit/e749fe6b11a90006d744af2ca2691220862e3a59
|
||||
./0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch
|
||||
# https://github.com/coin-or/Cbc/commit/584fd12fba6a562d49864f44bedd13ee32d06999
|
||||
./0001-use-static_cast-for-static-cast-fixes-319.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
, elfutils
|
||||
, expat
|
||||
, fetchCrate
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, file
|
||||
, flex
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, generateSplicesForMkScope
|
||||
, makeScopeWithSplicing'
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchpatch2
|
||||
, makeSetupHook
|
||||
, makeWrapper
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocksdb";
|
||||
version = "9.1.1";
|
||||
version = "9.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc=";
|
||||
hash = "sha256-Zifn5Gu/4h6TaEqSaWQ2mFdryeAarqbHWW3fKUGGFac=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "symengine";
|
||||
version = "0.11.2";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symengine";
|
||||
repo = "symengine";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CwVDpDbx00r7Fys+5r1n0m/E86zTx1i4ti5JCcVp20g=";
|
||||
hash = "sha256-SfifujR2VM1OlPN0ZRUC3hWImXO/8PuiyrBdpyNoKW4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl
|
||||
, ocaml, findlib, ocamlbuild, ocaml_oasis
|
||||
, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, mmap, lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp
|
||||
, utop, libxml2, ncurses
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, cmdliner, ppxlib }:
|
||||
{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ppxlib }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "bisect_ppx";
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
{ lib
|
||||
, ocaml
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, buildDunePackage
|
||||
, base64
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ buildDunePackage, fetchpatch, git
|
||||
{ buildDunePackage, git
|
||||
, rresult, result, bigstringaf
|
||||
, fmt, bos, fpath, uri, digestif, logs, lwt
|
||||
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
|
||||
, decompress, domain-name, ipaddr, mtime
|
||||
, tcpip, awa-mirage, mirage-flow, mirage-unix
|
||||
, alcotest, alcotest-lwt, base64, cstruct
|
||||
, ke, mirage-crypto-rng, ocurl, git-binary
|
||||
, ke, mirage-crypto-rng, git-binary
|
||||
, ptime, mimic, ca-certs-nss, tls, tls-mirage
|
||||
, cacert, happy-eyeballs-lwt, git-mirage
|
||||
}:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage
|
||||
{ lib, fetchFromGitHub, buildDunePackage
|
||||
, angstrom, faraday, result, alcotest
|
||||
}:
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims, num }:
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, piqi, stdlib-shims, num }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.8";
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ buildDunePackage
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, utop
|
||||
, python3
|
||||
, stdcompat
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, cstruct
|
||||
, dune-configurator
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fmt
|
||||
, optint
|
||||
, mdx
|
||||
|
||||
@ -3,14 +3,12 @@
|
||||
IOString,
|
||||
buildPerlModule,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
kent,
|
||||
lib,
|
||||
libmysqlclient,
|
||||
libpng,
|
||||
openssl,
|
||||
perl
|
||||
}:
|
||||
|
||||
buildPerlModule rec {
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
lib,
|
||||
pcre2,
|
||||
fetchFromGitHub,
|
||||
php,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@ -1,62 +1,61 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
cython,
|
||||
oldest-supported-numpy,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
numpy,
|
||||
pandas,
|
||||
cramjam,
|
||||
cython,
|
||||
fetchFromGitHub,
|
||||
fsspec,
|
||||
thrift,
|
||||
python-lzo,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
git,
|
||||
numpy,
|
||||
oldest-supported-numpy,
|
||||
packaging,
|
||||
pandas,
|
||||
pytestCheckHook,
|
||||
python-lzo,
|
||||
python,
|
||||
pythonOlder,
|
||||
setuptools-scm,
|
||||
setuptools,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastparquet";
|
||||
version = "2024.2.0";
|
||||
version = "2024.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = "fastparquet";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-e0gnC/HMYdrYdEwy6qNOD1J52xgN2x81oCG03YNsYjg=";
|
||||
hash = "sha256-YiaVkpPzH8ZmTiEtCom9xLbKzByIt7Ilig/WlmGrYH4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"pytest-runner"' ""
|
||||
|
||||
sed -i \
|
||||
-e "/pytest-runner/d" \
|
||||
-e '/"git", "status"/d' setup.py
|
||||
--replace-fail "numpy>=2.0.0rc1" "oldest-supported-numpy"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
oldest-supported-numpy
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
git
|
||||
oldest-supported-numpy
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
cramjam
|
||||
fsspec
|
||||
numpy
|
||||
pandas
|
||||
thrift
|
||||
packaging
|
||||
pandas
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
@ -82,7 +81,8 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Implementation of the parquet format";
|
||||
homepage = "https://github.com/dask/fastparquet";
|
||||
license = with licenses; [ asl20 ];
|
||||
changelog = "https://github.com/dask/fastparquet/blob/${version}/docs/source/releasenotes.rst";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "goodwe";
|
||||
version = "0.4.3";
|
||||
version = "0.4.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "marcelblijleven";
|
||||
repo = "goodwe";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Hj/iTFGUqvMeFQso6wCbkUmoGOSCEtMsO8HaQ/UQKeM=";
|
||||
hash = "sha256-xWVYxOc0PibttftZIrnmClPcu4EnJCQ1Zob8Pg+FTBE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.45.1";
|
||||
version = "0.45.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = "griffe";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NmCnhImkdo2zAHhl2fLknV0rXXmJ9A+FL1uXUBF4IPk=";
|
||||
hash = "sha256-mWJNEZPZgpqJ15HuptpjD9e14CYh4TNFbE38zI42wRk=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pandas,
|
||||
dask,
|
||||
fastparquet,
|
||||
fetchFromGitHub,
|
||||
pandas,
|
||||
pyarrow,
|
||||
setuptools,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
versioneer,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -28,11 +29,17 @@ buildPythonPackage rec {
|
||||
# Break circular dependency
|
||||
substituteInPlace requirements.txt \
|
||||
--replace-fail "intake" ""
|
||||
|
||||
# Remove vendorized versioneer.py
|
||||
rm versioneer.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [
|
||||
setuptools
|
||||
versioneer
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
pandas
|
||||
dask
|
||||
fastparquet
|
||||
|
||||
@ -1,40 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
aiohttp,
|
||||
dataclasses-json,
|
||||
duckdb-engine,
|
||||
langchain,
|
||||
langchain-core,
|
||||
langsmith,
|
||||
lark,
|
||||
numpy,
|
||||
pandas,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pyyaml,
|
||||
requests,
|
||||
requests-mock,
|
||||
responses,
|
||||
sqlalchemy,
|
||||
syrupy,
|
||||
tenacity,
|
||||
toml,
|
||||
typer,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-community";
|
||||
version = "0.0.38";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "langchain_community";
|
||||
inherit version;
|
||||
hash = "sha256-En/Et1vGe2L+gnxmwC5xWnMP74/mm9ICPUZrqwa1gQ0=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
rev = "langchain-community==${version}";
|
||||
hash = "sha256-h8ZJiQYmyvzaRrEVNS7SamJTq4zY7J1IgYdQiVBFh4I=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/community";
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
dataclasses-json
|
||||
langchain-core
|
||||
langchain
|
||||
langsmith
|
||||
numpy
|
||||
pyyaml
|
||||
@ -49,12 +64,29 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "langchain_community" ];
|
||||
|
||||
# PyPI source does not have tests
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
duckdb-engine
|
||||
lark
|
||||
pandas
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
responses
|
||||
syrupy
|
||||
toml
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests/unit_tests" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = langchain-core.updateScript;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Community contributed LangChain integrations";
|
||||
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community";
|
||||
changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
|
||||
@ -1,33 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
anyio,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
freezegun,
|
||||
grandalf,
|
||||
jsonpatch,
|
||||
langsmith,
|
||||
numpy,
|
||||
packaging,
|
||||
poetry-core,
|
||||
pydantic,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
pyyaml,
|
||||
requests,
|
||||
syrupy,
|
||||
tenacity,
|
||||
writeScript,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-core";
|
||||
version = "0.1.52";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "langchain_core";
|
||||
inherit version;
|
||||
hash = "sha256-CEw/xFL1ppZsKKs+xdvIuNJvw/YzeAc5KPTinZC2OT8=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
rev = "langchain-core==${version}";
|
||||
hash = "sha256-D0y6kW5bWcCKW2TwVPlZcAUxqADgsOm9fWySAjHYYIg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/core";
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"langsmith"
|
||||
"packaging"
|
||||
@ -38,24 +48,46 @@ buildPythonPackage rec {
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies = [
|
||||
anyio
|
||||
jsonpatch
|
||||
langsmith
|
||||
packaging
|
||||
pydantic
|
||||
pyyaml
|
||||
requests
|
||||
tenacity
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "langchain_core" ];
|
||||
|
||||
# PyPI source does not have tests
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
freezegun
|
||||
grandalf
|
||||
numpy
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
syrupy
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests/unit_tests" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
|
||||
set -eu -o pipefail
|
||||
nix-update --commit --version-regex 'langchain-core==(.*)' python3Packages.langchain-core
|
||||
nix-update --commit --version-regex 'langchain-text-splitters==(.*)' python3Packages.langchain-text-splitters
|
||||
nix-update --commit --version-regex 'langchain==(.*)' python3Packages.langchain
|
||||
nix-update --commit --version-regex 'langchain-community==(.*)' python3Packages.langchain-community
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Building applications with LLMs through composability";
|
||||
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core";
|
||||
changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
|
||||
@ -1,41 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
langchain-core,
|
||||
lxml,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-text-splitters";
|
||||
version = "0.0.2";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "langchain_text_splitters";
|
||||
inherit version;
|
||||
hash = "sha256-rIkn3AugjrpwL2lhye19986tjeGan3EBqyteo0IBs8E=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
rev = "refs/tags/langchain-text-splitters==${version}";
|
||||
hash = "sha256-QrgZ0j/YdOgEgLeQNSKjOIwqdr/Izuw9Gh6eKQ/00tQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/text-splitters";
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
langchain-core
|
||||
lxml
|
||||
];
|
||||
|
||||
# PyPI source does not have tests
|
||||
doCheck = false;
|
||||
dependencies = [ langchain-core ];
|
||||
|
||||
pythonImportsCheck = [ "langchain_text_splitters" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests/unit_tests" ];
|
||||
|
||||
passthru = {
|
||||
inherit (langchain-core) updateScript;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Build context-aware reasoning applications";
|
||||
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters";
|
||||
changelog = "https://github.com/langchain-ai/langchain/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -10,13 +10,10 @@
|
||||
chardet,
|
||||
clarifai,
|
||||
cohere,
|
||||
dataclasses-json,
|
||||
esprima,
|
||||
fetchFromGitHub,
|
||||
freezegun,
|
||||
huggingface-hub,
|
||||
jsonpatch,
|
||||
langchain-community,
|
||||
langchain-core,
|
||||
langchain-text-splitters,
|
||||
langsmith,
|
||||
@ -51,7 +48,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain";
|
||||
version = "0.1.52";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -59,8 +56,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
rev = "refs/tags/langchain-core==${version}";
|
||||
hash = "sha256-H8rtysRIwyuJEUFI93vid3MsqReyRCER88xztsuYpOc=";
|
||||
rev = "refs/tags/langchain==${version}";
|
||||
hash = "sha256-cLJhdeft9XNLk5njSBaEBSuP31c2VFCJ1ET+ypo6mNY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/langchain";
|
||||
@ -71,9 +68,6 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
dataclasses-json
|
||||
jsonpatch
|
||||
langchain-community
|
||||
langchain-core
|
||||
langchain-text-splitters
|
||||
langsmith
|
||||
@ -166,6 +160,10 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "langchain" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = langchain-core.updateScript;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Building applications with LLMs through composability";
|
||||
homepage = "https://github.com/langchain-ai/langchain";
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "panel";
|
||||
version = "1.4.1";
|
||||
version = "1.4.3";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
# tries to fetch even more artifacts
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-x7ywbO2uY1r06bDXV/+X/7cs9f6jFawyDHeo8pLWZVE=";
|
||||
hash = "sha256-iIBQ9UEcmO6q3bS2faFK7tY4mPVaoIWS7bMzKLzkfWw=";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
};
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
numpy,
|
||||
libsamplerate,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "scikits-samplerate";
|
||||
version = "0.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cournape";
|
||||
repo = "samplerate";
|
||||
rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210";
|
||||
hash = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU=";
|
||||
};
|
||||
|
||||
buildInputs = [ libsamplerate ];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
preConfigure = ''
|
||||
cat > site.cfg << END
|
||||
[samplerate]
|
||||
library_dirs=${libsamplerate.out}/lib
|
||||
include_dirs=${lib.getDev libsamplerate}/include
|
||||
END
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cournape/samplerate";
|
||||
description = "High quality sampling rate convertion from audio data in numpy arrays";
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
54
pkgs/development/python-modules/weatherflow4py/default.nix
Normal file
54
pkgs/development/python-modules/weatherflow4py/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
aioresponses,
|
||||
buildPythonPackage,
|
||||
dataclasses-json,
|
||||
fetchFromGitHub,
|
||||
marshmallow,
|
||||
poetry-core,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
websockets,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weatherflow4py";
|
||||
version = "0.2.20";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeeftor";
|
||||
repo = "weatherflow4py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kkNGhFhciOfhrbjxLM01YC2IRmkdKEbk4EUyDJZJuxU=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
dataclasses-json
|
||||
marshmallow
|
||||
websockets
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "weatherflow4py" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to interact with the WeatherFlow REST API";
|
||||
homepage = "https://github.com/jeeftor/weatherflow4py";
|
||||
changelog = "https://github.com/jeeftor/weatherflow4py/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -28,7 +28,7 @@
|
||||
, bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
|
||||
, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml
|
||||
, cargo, rustc, rustPlatform
|
||||
, autoSignDarwinBinariesHook, fetchpatch
|
||||
, autoSignDarwinBinariesHook
|
||||
}@args:
|
||||
|
||||
let
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, writeText
|
||||
{ lib, stdenv, fetchurl, writeText
|
||||
, graphviz, doxygen
|
||||
, ocamlPackages, ltl2ba, coq, why3
|
||||
, gdk-pixbuf, wrapGAppsHook3
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPackages
|
||||
, pkg-config
|
||||
, meson
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, pkg-config, which, makeWrapper
|
||||
, libpfm, zlib, python3Packages, procps, gdb, capnproto
|
||||
}:
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gprbuild
|
||||
, gnat
|
||||
}:
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user