Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
56f5b9fafc
@ -11,12 +11,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "famistudio";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-fRNjboCfymBhr7Eg5ENnO1fchX0oTdeaJJ0SC3BKTVI=";
|
||||
hash = "sha256-zETivzQBkKOhsZryiwv3dDeXPO8CKWFfjERdPJXbj5U=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mympd";
|
||||
version = "10.3.3";
|
||||
version = "11.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LqIaRFAXB3XMidC1Dypax/ucayot/IJPAvPwzHQeH9k=";
|
||||
sha256 = "sha256-pDM9igAX1iUi/yC8/Jqobaixkw6klEVcd0sAn0Ufdjk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -45,18 +45,17 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_LUA=ON"
|
||||
# Otherwise, it tries to parse $out/etc/mympd.conf on startup.
|
||||
"-DCMAKE_INSTALL_SYSCONFDIR=/etc"
|
||||
# similarly here
|
||||
"-DCMAKE_INSTALL_LOCALSTATEDIR=/var/lib/mympd"
|
||||
];
|
||||
hardeningDisable = [
|
||||
# See https://github.com/jcorporation/myMPD/issues/315
|
||||
"strictoverflow"
|
||||
# causes redefinition of _FORTIFY_SOURCE
|
||||
"fortify3"
|
||||
];
|
||||
# 5 tests out of 23 fail, probably due to the sandbox...
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://jcorporation.github.io/myMPD";
|
||||
|
||||
@ -19,13 +19,13 @@ let
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "picard";
|
||||
version = "2.9";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metabrainz";
|
||||
repo = "picard";
|
||||
rev = "refs/tags/release-${version}";
|
||||
hash = "sha256-ultpLz4u2wBxoL4YbNeZ4Z4NEXBvqpxJ8mzFeGQTt4A=";
|
||||
hash = "sha256-KCLva8pc+hyz+3MkPsghXrDYGVqP0aeffG9hOYJzI+Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snarkos";
|
||||
version = "2.1.4";
|
||||
version = "2.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AleoHQ";
|
||||
repo = "snarkOS";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zZbFK5CVmJ0vCeVhUFw1j//1uzqJVs56Jy1LY7E1mFE=";
|
||||
sha256 = "sha256-S79u9jAtYHsCFwvhNTRKrQL/CUBrzt8twx4mzwNtxhs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AxGHWFCyaq8ZDIT8mvO7bhezVshnZeOdgcHHAouFFL4=";
|
||||
cargoHash = "sha256-cDyViA3TuUoQsU9OnEF3UDgwQhPhgg4mTcqDy2VIA9c=";
|
||||
|
||||
# buildAndTestSubdir = "cli";
|
||||
|
||||
|
||||
@ -11,10 +11,10 @@ buildGoModule rec {
|
||||
owner = "mingrammer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09brjr3h4qnhlidxlki1by5anahxy16ai078zm4k7ryl579amzdw";
|
||||
hash = "sha256-vP2q0inU5zNJ/eiAqEzwHSqril8hTtpbpNBiAkeWeSU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calcurse";
|
||||
version = "4.8.0";
|
||||
version = "4.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://calcurse.org/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-SKc2ZmzEtrUwEtc7OqcBUsGLQebHtIB/qw8WjWRa4yw=";
|
||||
hash = "sha256-2GuzcBT9abjYPMuQSsl5xrjd9Z7j28gPWidFJeTVgwo=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ];
|
||||
@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://git.calcurse.org/calcurse.git/plain/CHANGES.md?h=v${version}";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.9.1";
|
||||
version = "3.9.3";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XXmqDZJ5rjoBarhIYlzC2O9jf97SWJiILWLsHDgM78Q=";
|
||||
hash = "sha256-IP6rVOrhIWrEWqrA0BCthAbCD2pRNnDzvY7bP4ANTCc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -21,14 +21,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wpsoffice";
|
||||
version = "11.1.0.11698";
|
||||
version = "11.1.0.11704";
|
||||
|
||||
src = if useChineseVersion then fetchurl {
|
||||
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb";
|
||||
sha256 = "sha256-m7BOE2IF2m75mV/4X3HY9UJcidL0S0biqkidddp4LbQ=";
|
||||
hash = "sha256-ffLSon9FpQZDQ1uapchBUkVaHOXs+H/6kHJLNiWqwiE=";
|
||||
} else fetchurl {
|
||||
url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb";
|
||||
sha256 = "sha256-spqxQK/xTE8yFPmGbSbrDY1vSxkan2kwAWpCWIExhgs=";
|
||||
hash = "sha256-nxpMEWKiNjjEUoVJkhpvjnCuWBCCGjPk+sUlKz+KjMI=";
|
||||
};
|
||||
|
||||
unpackCmd = "dpkg -x $src .";
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "last";
|
||||
version = "1460";
|
||||
version = "1471";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mcfrith";
|
||||
repo = "last";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9Er15zsq9Xrw66M8QOmARC1S/O5NvmpdUvOZUGc92P0=";
|
||||
hash = "sha256-HQ2C7SFfJS6TOJZUm6szhu+hMm41BnH8A7DZE5yh9fM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{lib, nimPackages, fetchFromGitHub, pcre}:
|
||||
{ lib, nimPackages, fetchFromGitHub, docopt, hts, pcre }:
|
||||
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "mosdepth";
|
||||
@ -12,7 +12,8 @@ nimPackages.buildNimPackage rec {
|
||||
sha256 = "sha256-7uteYTCbAaXedPqk0WtHpqTfUWH/+rRW8aSlFixkEko=";
|
||||
};
|
||||
|
||||
buildInputs = with nimPackages; [ docopt hts-nim pcre ];
|
||||
buildInputs = [ docopt hts pcre ];
|
||||
nimFlags = hts.nimFlags ++ [ "--threads:off" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing";
|
||||
|
||||
25
pkgs/applications/version-management/git-bars/default.nix
Normal file
25
pkgs/applications/version-management/git-bars/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, lib, fetchFromGitHub, python3Packages, git }:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "git-bars";
|
||||
version = "unstable-2023-08-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knadh";
|
||||
repo = "git-bars";
|
||||
rev = "f15fbc15345d9ef021e5a9b278e352bb532dcee8";
|
||||
hash = "sha256-jHP6LqhUQv6hh97tSXAdOruWdtp2FXM6ANlpWoA+fHQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
git
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/knadh/git-bars";
|
||||
description = "A utility for visualising git commit activity as bars on the terminal";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetube";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
|
||||
sha256 = "sha256-7IxmlkExM8Q1yyq44ajZ6on4EMPyGt23QmzmBZmofts=";
|
||||
sha256 = "0yr5k9s3r4yvcx85bzwn6y4m03964ljnmhz7nf068zj87m9q8rcc";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "arteplussept";
|
||||
namespace = "plugin.video.arteplussept";
|
||||
version = "1.1.10";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
|
||||
hash = "sha256-EDpoeS9FnFsn6jvg6EFKr089YixKipLi9yzxdi7YUmA=";
|
||||
hash = "sha256-m7DHQVg0pcLGCHTdecCTGfanUWhuPMHdllbg+47hxEI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, nestopia }:
|
||||
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "libretro-nestopia";
|
||||
namespace = "game.libretro.nestopia";
|
||||
version = "1.52.0.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-game";
|
||||
repo = "game.libretro.nestopia";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-DmBO+HcfIBcz7p16dND09iwXWeObtU/doo/mJ0IZGGg=";
|
||||
};
|
||||
|
||||
extraCMakeFlags = [
|
||||
"-DNESTOPIA_LIB=${nestopia}/lib/retroarch/cores/nestopia_libretro.so"
|
||||
];
|
||||
|
||||
extraBuildInputs = [ nestopia ];
|
||||
propagatedBuildInputs = [
|
||||
libretro
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kodi-game/game.libretro.nestopia";
|
||||
description = "Nintendo - NES / Famicom (Nestopia UE) GameClient for Kodi";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "myconnpy";
|
||||
namespace = "script.module.myconnpy";
|
||||
version = "8.0.18+matrix.1";
|
||||
version = "8.0.33";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "sha256-E1S1EThukF3noU4LC6MDQseRQhSsZr/9qnPSxH/Do7M=";
|
||||
sha256 = "sha256-NlLMq9RAdWu8rVsMc0FDe1HmQiVp5T7iBXbIH7HB5bI=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-iptvsimple";
|
||||
namespace = "pvr.iptvsimple";
|
||||
version = "20.10.1";
|
||||
version = "20.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.iptvsimple";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-3bE6x1d3IMXN5miBAeb+1qRBbx8Ni386iEhSwT0znR8=";
|
||||
sha256 = "sha256-58Dma0UtD6Uy4zu4aQT2FY0emLiQpA4RChhnneMzFZI=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-terminal";
|
||||
version = "6.0.5";
|
||||
version = "6.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pRTdvR3hyiJVpi38Ex58X74ns+rSWuytsOXemvdW1Rk=";
|
||||
hash = "sha256-LzCbh+BErgh7Ojbw314oHB8QvyS6UeJkDUkNngzVm+A=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
@ -157,7 +157,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $GOROOT_FINAL
|
||||
cp -a bin pkg src lib misc api doc $GOROOT_FINAL
|
||||
cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL
|
||||
mkdir -p $out/bin
|
||||
ln -s $GOROOT_FINAL/bin/* $out/bin
|
||||
runHook postInstall
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# https://nim-lang.org/docs/nimc.html
|
||||
|
||||
{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub
|
||||
, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped
|
||||
, nimble-unwrapped, Security }:
|
||||
, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, Security, nim-unwrapped
|
||||
, nim-unwrapped-2, nimble-unwrapped, nim }:
|
||||
|
||||
let
|
||||
parseCpu = platform:
|
||||
@ -72,25 +72,15 @@ let
|
||||
nimHost = parsePlatform stdenv.hostPlatform;
|
||||
nimTarget = parsePlatform stdenv.targetPlatform;
|
||||
|
||||
bootstrapCompiler = stdenv.mkDerivation {
|
||||
pname = "nim-bootstrap";
|
||||
inherit (nim-unwrapped) version src preBuild;
|
||||
enableParallelBuilding = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dt $out/bin bin/nim
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in {
|
||||
|
||||
nim-unwrapped = stdenv.mkDerivation rec {
|
||||
nim-unwrapped = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nim-unwrapped";
|
||||
version = "1.6.14";
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
|
||||
url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-0HDS8oriQA33/kpJ7OufRc1TmQaxB0gYVqCveo+oLck=";
|
||||
};
|
||||
|
||||
@ -108,7 +98,18 @@ in {
|
||||
# Mangle store paths of modules to prevent runtime dependence.
|
||||
] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch;
|
||||
|
||||
configurePhase = ''
|
||||
configurePhase = let
|
||||
bootstrapCompiler = stdenv.mkDerivation {
|
||||
pname = "nim-bootstrap";
|
||||
inherit (finalAttrs) version src preBuild;
|
||||
enableParallelBuilding = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dt $out/bin bin/nim
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in ''
|
||||
runHook preConfigure
|
||||
cp ${bootstrapCompiler}/bin/nim bin/
|
||||
echo 'define:nixbuild' >> config/nim.cfg
|
||||
@ -154,7 +155,25 @@ in {
|
||||
mainProgram = "nim";
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
nim-unwrapped-2 = nim-unwrapped.overrideAttrs (finalAttrs: rec {
|
||||
version = "2.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
|
||||
hash = "sha256-vWEB2EADb7eOk6ad9s8/n9DCHNdUtpX/hKO0rdjtCvc=";
|
||||
};
|
||||
patches = [
|
||||
./NIM_CONFIG_DIR.patch
|
||||
# Override compiler configuration via an environmental variable
|
||||
|
||||
./nixbuild.patch
|
||||
# Load libraries at runtime by absolute path
|
||||
|
||||
./extra-mangling.patch
|
||||
# Mangle store paths of modules to prevent runtime dependence.
|
||||
];
|
||||
});
|
||||
|
||||
nimble-unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "nimble-unwrapped";
|
||||
@ -169,8 +188,7 @@ in {
|
||||
};
|
||||
|
||||
depsBuildBuild = [ nim-unwrapped ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];
|
||||
|
||||
@ -194,147 +212,157 @@ in {
|
||||
mainProgram = "nimble";
|
||||
};
|
||||
};
|
||||
} // (let
|
||||
wrapNim = { nim', nimble', patches }:
|
||||
let
|
||||
targetPlatformConfig = stdenv.targetPlatform.config;
|
||||
self = stdenv.mkDerivation (finalAttrs: {
|
||||
name = "${targetPlatformConfig}-nim-wrapper-${nim'.version}";
|
||||
inherit (nim') version;
|
||||
preferLocalBuild = true;
|
||||
strictDeps = true;
|
||||
|
||||
nim = let
|
||||
nim' = buildPackages.nim-unwrapped;
|
||||
nimble' = buildPackages.nimble-unwrapped;
|
||||
inherit (stdenv) targetPlatform;
|
||||
self = stdenv.mkDerivation {
|
||||
name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
|
||||
inherit (nim') version;
|
||||
preferLocalBuild = true;
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
# Needed for any nim package that uses the standard library's
|
||||
# 'std/sysrand' module.
|
||||
depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
# Needed for any nim package that uses the standard library's
|
||||
# 'std/sysrand' module.
|
||||
depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
|
||||
inherit patches;
|
||||
|
||||
patches = [
|
||||
./nim.cfg.patch
|
||||
# Remove configurations that clash with ours
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
tar xf ${nim'.src} nim-$version/config
|
||||
cd nim-$version
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase =
|
||||
# Configure the Nim compiler to use $CC and $CXX as backends
|
||||
# The compiler is configured by two configuration files, each with
|
||||
# a different DSL. The order of evaluation matters and that order
|
||||
# is not documented, so duplicate the configuration across both files.
|
||||
''
|
||||
runHook preBuild
|
||||
cat >> config/config.nims << WTF
|
||||
|
||||
switch("os", "${nimTarget.os}")
|
||||
switch("cpu", "${nimTarget.cpu}")
|
||||
switch("define", "nixbuild")
|
||||
|
||||
# Configure the compiler using the $CC set by Nix at build time
|
||||
import strutils
|
||||
let cc = getEnv"CC"
|
||||
if cc.contains("gcc"):
|
||||
switch("cc", "gcc")
|
||||
elif cc.contains("clang"):
|
||||
switch("cc", "clang")
|
||||
WTF
|
||||
|
||||
mv config/nim.cfg config/nim.cfg.old
|
||||
cat > config/nim.cfg << WTF
|
||||
os = "${nimTarget.os}"
|
||||
cpu = "${nimTarget.cpu}"
|
||||
define:"nixbuild"
|
||||
WTF
|
||||
|
||||
cat >> config/nim.cfg < config/nim.cfg.old
|
||||
rm config/nim.cfg.old
|
||||
|
||||
cat >> config/nim.cfg << WTF
|
||||
|
||||
clang.cpp.exe %= "\$CXX"
|
||||
clang.cpp.linkerexe %= "\$CXX"
|
||||
clang.exe %= "\$CC"
|
||||
clang.linkerexe %= "\$CC"
|
||||
gcc.cpp.exe %= "\$CXX"
|
||||
gcc.cpp.linkerexe %= "\$CXX"
|
||||
gcc.exe %= "\$CC"
|
||||
gcc.linkerexe %= "\$CC"
|
||||
WTF
|
||||
|
||||
runHook postBuild
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
tar xf ${nim'.src} nim-$version/config
|
||||
cd nim-$version
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [
|
||||
"--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
|
||||
placeholder "out"
|
||||
}/bin"
|
||||
# Used by nim-gdb
|
||||
dontConfigure = true;
|
||||
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
|
||||
# These libraries may be referred to by the standard library.
|
||||
# This is broken for cross-compilation because the package
|
||||
# set will be shifted back by nativeBuildInputs.
|
||||
buildPhase =
|
||||
# Configure the Nim compiler to use $CC and $CXX as backends
|
||||
# The compiler is configured by two configuration files, each with
|
||||
# a different DSL. The order of evaluation matters and that order
|
||||
# is not documented, so duplicate the configuration across both files.
|
||||
''
|
||||
runHook preBuild
|
||||
cat >> config/config.nims << WTF
|
||||
|
||||
"--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
|
||||
# Use the custom configuration
|
||||
];
|
||||
switch("os", "${nimTarget.os}")
|
||||
switch("cpu", "${nimTarget.cpu}")
|
||||
switch("define", "nixbuild")
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
# Configure the compiler using the $CC set by Nix at build time
|
||||
import strutils
|
||||
let cc = getEnv"CC"
|
||||
if cc.contains("gcc"):
|
||||
switch("cc", "gcc")
|
||||
elif cc.contains("clang"):
|
||||
switch("cc", "clang")
|
||||
WTF
|
||||
|
||||
mkdir -p $out/bin $out/etc
|
||||
mv config/nim.cfg config/nim.cfg.old
|
||||
cat > config/nim.cfg << WTF
|
||||
os = "${nimTarget.os}"
|
||||
cpu = "${nimTarget.cpu}"
|
||||
define:"nixbuild"
|
||||
WTF
|
||||
|
||||
cp -r config $out/etc/nim
|
||||
cat >> config/nim.cfg < config/nim.cfg.old
|
||||
rm config/nim.cfg.old
|
||||
|
||||
cat >> config/nim.cfg << WTF
|
||||
|
||||
clang.cpp.exe %= "\$CXX"
|
||||
clang.cpp.linkerexe %= "\$CXX"
|
||||
clang.exe %= "\$CC"
|
||||
clang.linkerexe %= "\$CC"
|
||||
gcc.cpp.exe %= "\$CXX"
|
||||
gcc.cpp.linkerexe %= "\$CXX"
|
||||
gcc.exe %= "\$CC"
|
||||
gcc.linkerexe %= "\$CC"
|
||||
WTF
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [
|
||||
"--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
|
||||
placeholder "out"
|
||||
}/bin"
|
||||
# Used by nim-gdb
|
||||
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
|
||||
# These libraries may be referred to by the standard library.
|
||||
# This is broken for cross-compilation because the package
|
||||
# set will be shifted back by nativeBuildInputs.
|
||||
|
||||
"--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
|
||||
# Use the custom configuration
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/etc
|
||||
|
||||
cp -r config $out/etc/nim
|
||||
|
||||
for binpath in ${nim'}/bin/nim?*; do
|
||||
local binname=`basename $binpath`
|
||||
makeWrapper \
|
||||
$binpath $out/bin/${targetPlatformConfig}-$binname \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatformConfig}-$binname $out/bin/$binname
|
||||
done
|
||||
|
||||
for binpath in ${nim'}/bin/nim?*; do
|
||||
local binname=`basename $binpath`
|
||||
makeWrapper \
|
||||
$binpath $out/bin/${targetPlatform.config}-$binname \
|
||||
${nim'}/nim/bin/nim $out/bin/${targetPlatformConfig}-nim \
|
||||
--set-default CC $(command -v $CC) \
|
||||
--set-default CXX $(command -v $CXX) \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
|
||||
done
|
||||
ln -s $out/bin/${targetPlatformConfig}-nim $out/bin/nim
|
||||
|
||||
makeWrapper \
|
||||
${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
|
||||
--set-default CC $(command -v $CC) \
|
||||
--set-default CXX $(command -v $CXX) \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
|
||||
makeWrapper \
|
||||
${nim'}/bin/testament $out/bin/${targetPlatformConfig}-testament \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament
|
||||
|
||||
makeWrapper \
|
||||
${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
|
||||
'' + lib.strings.optionalString (nimble' != null) ''
|
||||
makeWrapper \
|
||||
${nimble'}/bin/nimble $out/bin/${targetPlatformConfig}-nimble \
|
||||
--suffix PATH : $out/bin
|
||||
ln -s $out/bin/${targetPlatformConfig}-nimble $out/bin/nimble
|
||||
|
||||
makeWrapper \
|
||||
${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
|
||||
--suffix PATH : $out/bin
|
||||
ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
passthru = {
|
||||
nim = nim';
|
||||
nimble = nimble';
|
||||
};
|
||||
|
||||
passthru = {
|
||||
nim = nim';
|
||||
nimble = nimble';
|
||||
};
|
||||
|
||||
meta = nim'.meta // {
|
||||
description = nim'.meta.description
|
||||
+ " (${targetPlatform.config} wrapper)";
|
||||
platforms = with lib.platforms; unix ++ genode;
|
||||
};
|
||||
meta = nim'.meta // {
|
||||
description = nim'.meta.description
|
||||
+ " (${targetPlatformConfig} wrapper)";
|
||||
platforms = with lib.platforms; unix ++ genode;
|
||||
};
|
||||
});
|
||||
in self // {
|
||||
pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; };
|
||||
};
|
||||
in self // {
|
||||
pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; };
|
||||
in {
|
||||
|
||||
nim = wrapNim {
|
||||
nim' = buildPackages.nim-unwrapped;
|
||||
nimble' = buildPackages.nimble-unwrapped;
|
||||
patches = [ ./nim.cfg.patch ];
|
||||
};
|
||||
|
||||
}
|
||||
nim2 = wrapNim {
|
||||
nim' = buildPackages.nim-unwrapped-2;
|
||||
nimble' = null;
|
||||
patches = [ ./nim2.cfg.patch ];
|
||||
};
|
||||
})
|
||||
|
||||
41
pkgs/development/compilers/nim/nim2.cfg.patch
Normal file
41
pkgs/development/compilers/nim/nim2.cfg.patch
Normal file
@ -0,0 +1,41 @@
|
||||
diff --git a/config/nim.cfg b/config/nim.cfg
|
||||
index 1470de780..8a12f741a 100644
|
||||
--- a/config/nim.cfg
|
||||
+++ b/config/nim.cfg
|
||||
@@ -9,8 +9,6 @@
|
||||
# Environment variables can be accessed like so:
|
||||
# gcc.path %= "$CC_PATH"
|
||||
|
||||
-cc = gcc
|
||||
-
|
||||
# additional options always passed to the compiler:
|
||||
--parallel_build: "0" # 0 to auto-detect number of processors
|
||||
|
||||
@@ -22,27 +20,6 @@ cc = gcc
|
||||
|
||||
threads:on
|
||||
|
||||
-# Examples of how to setup a cross-compiler:
|
||||
-# Nim can target architectures and OSes different than the local host
|
||||
-# Syntax: <arch>.<os>.gcc.exe = "<compiler executable>"
|
||||
-# <arch>.<os>.gcc.linkerexe = "<linker executable>"
|
||||
-
|
||||
-# ARM e.g. Raspberry Pi 2: gcc-arm-linux-gnueabihf package on Debian/Ubuntu
|
||||
-arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc"
|
||||
-arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc"
|
||||
-# ARM64/aarch64 e.g. Raspberry Pi 3: gcc-aarch64-linux-gnu package on Debian/Ubuntu
|
||||
-arm64.linux.gcc.exe = "aarch64-linux-gnu-gcc"
|
||||
-arm64.linux.gcc.linkerexe = "aarch64-linux-gnu-gcc"
|
||||
-# RISC-V: gcc-riscv64-linux-gnu package on Debian/Ubuntu
|
||||
-riscv32.linux.gcc.exe = "riscv64-linux-gnu-gcc"
|
||||
-riscv32.linux.gcc.linkerexe = "riscv64-linux-gnu-gcc"
|
||||
-riscv64.linux.gcc.exe = "riscv64-linux-gnu-gcc"
|
||||
-riscv64.linux.gcc.linkerexe = "riscv64-linux-gnu-gcc"
|
||||
-
|
||||
-# For OpenWRT, you will also need to adjust PATH to point to your toolchain.
|
||||
-mips.linux.gcc.exe = "mips-openwrt-linux-gcc"
|
||||
-mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc"
|
||||
-
|
||||
|
||||
path="$lib/deprecated/core"
|
||||
path="$lib/deprecated/pure"
|
||||
39
pkgs/development/compilers/zig/shell-completions.nix
Normal file
39
pkgs/development/compilers/zig/shell-completions.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zig-shell-completions";
|
||||
version = "unstable-2023-08-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = "shell-completions";
|
||||
rev = "de9f83166d792cce6a0524e63d2755952dd9872c";
|
||||
hash = "sha256-92n41/AWbHYkXiBtbWw+hXZKJCE7KW9igd8cLSBQfHo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
installShellCompletion --bash --name zig.bash _zig.bash
|
||||
installShellCompletion --zsh --name _zig _zig
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ziglang/shell-completions";
|
||||
description = "Shell completions for the Zig compiler";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ftxui";
|
||||
version = "4.1.1";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArthurSonzogni";
|
||||
repo = "ftxui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qFgCLV7sgGxlL18sThqpl+vyXL68GXcbYqMG7mXhsB4=";
|
||||
sha256 = "sha256-IF6G4wwQDksjK8nJxxAnxuCw2z2qvggCmRJ2rbg00+E=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
30
pkgs/development/libraries/libz/default.nix
Normal file
30
pkgs/development/libraries/libz/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libz";
|
||||
version = "unstable-2018-03-31";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sortix";
|
||||
repo = "libz";
|
||||
rev = "752c1630421502d6c837506d810f7918ac8cdd27";
|
||||
hash = "sha256-AQuZ0BOl1iP5Nub+tVwctlE2tfJe4Sq/KDGkjwBbsV4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputDoc = "dev"; # single tiny man3 page
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://sortix.org/libz/";
|
||||
description = "A clean fork of zlib";
|
||||
license = [ lib.licenses.zlib ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "htslib";
|
||||
version = "1.17";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-djd5KIxA8HZG7HrZi5bDeMc5Fx0WKtmDmIaHg7chg58";
|
||||
sha256 = "sha256-8atTpZOiMgob+t9O+RXa54QAbFtckiyKgXTXUwqa8Y8=";
|
||||
};
|
||||
|
||||
# perl is only used during the check phase.
|
||||
|
||||
@ -46,7 +46,7 @@ let
|
||||
};
|
||||
in {
|
||||
wt4 = generic {
|
||||
version = "4.9.1";
|
||||
sha256 = "sha256-Qm0qqYB/CLVHUgKE9N83MgAWQ2YFdumrB0i84qYNto8=";
|
||||
version = "4.10.0";
|
||||
sha256 = "sha256-05WZnyUIwXwJA24mQi5ATCqRZ6PE/tiw2/MO1qYHRsY=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,6 +3,6 @@
|
||||
fetchFromGitHub {
|
||||
owner = "krux02";
|
||||
repo = "ast-pattern-matching";
|
||||
rev = "87f7d163421af5a4f5e5cb6da7b93278e6897e96";
|
||||
sha256 = "19mb5bb6riia8380p5dpc3q0vwgrj958dd6p7vw8vkvwiqrzg6zq";
|
||||
rev = "eb8b99d595517fd5d41ccc954edb896267f2db78";
|
||||
hash = "sha256-wPIiFr8OfXM7Hyh5o2aQXnlgkqLf0FennN6zzVTGgY4=";
|
||||
}
|
||||
|
||||
@ -1,7 +1,18 @@
|
||||
{ fetchNimble }:
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
fetchNimble {
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "chroma";
|
||||
version = "0.2.5";
|
||||
hash = "sha256-6lNHpO2aMorgkaPfo6kRcOs9r5R6T/kislVmkeoulw8=";
|
||||
}
|
||||
version = "0.2.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "treeform";
|
||||
repo = "chroma";
|
||||
rev = final.version;
|
||||
hash = "sha256-QSl8n60HO56kJ4BKKe/FjUC/cRNxqL2L56FqPwhmJl4=";
|
||||
};
|
||||
meta = final.src.meta // {
|
||||
description = "Everything you want to do with colors";
|
||||
homepage = "https://github.com/treeform/chroma";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
})
|
||||
|
||||
19
pkgs/development/nim-packages/db_connector/default.nix
Normal file
19
pkgs/development/nim-packages/db_connector/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "db_connector";
|
||||
version = "unstable-2023-02-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nim-lang";
|
||||
repo = "db_connector";
|
||||
rev = "e65693709dd042bc723c8f1d46cc528701f1c479";
|
||||
hash = "sha256-g5X51VbES8OxR5m9WexK70Yo6S2PnroKLabj1cUu1P0=";
|
||||
};
|
||||
doCheck = false; # tests only worked in the Nim sources
|
||||
meta = final.src.meta // {
|
||||
description = "Unified db connector in Nim";
|
||||
homepage = "https://github.com/nim-lang/db_connector";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
})
|
||||
@ -1,13 +0,0 @@
|
||||
if [ -e .attrs.sh ]; then source .attrs.sh; fi
|
||||
source $stdenv/setup
|
||||
export HOME=$NIX_BUILD_TOP
|
||||
|
||||
nimble --accept --noSSLCheck develop "${pkgname}@${version}"
|
||||
# TODO: bring in the certificates for Nimble to verify the fetch of
|
||||
# the package list.
|
||||
|
||||
pkgdir=${NIX_BUILD_TOP}/${pkgname}
|
||||
|
||||
find "$pkgdir" -name .git -print0 | xargs -0 rm -rf
|
||||
|
||||
cp -a "$pkgdir" "$out"
|
||||
@ -1,20 +0,0 @@
|
||||
{ lib, makeOverridable, stdenv, gitMinimal, nim, cacert }:
|
||||
|
||||
makeOverridable (
|
||||
|
||||
{ pname, version, hash ? lib.fakeHash,
|
||||
|
||||
meta ? { }, passthru ? { }, preferLocalBuild ? true }:
|
||||
stdenv.mkDerivation {
|
||||
inherit version meta passthru preferLocalBuild;
|
||||
pname = pname + "-src";
|
||||
pkgname = pname;
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [ gitMinimal nim ];
|
||||
outputHash = hash;
|
||||
outputHashAlgo = null;
|
||||
outputHashMode = "recursive";
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars
|
||||
++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ];
|
||||
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
})
|
||||
@ -1,21 +1,21 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
buildNimPackage rec {
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "flatty";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "treeform";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "flatty";
|
||||
rev = final.version;
|
||||
hash = "sha256-ZmhjehmEJHm5qNlsGQvyYLajUdwhWt1+AtRppRrNtgA=";
|
||||
};
|
||||
|
||||
doCheck = false; # tests fail with Nim-2.0.0
|
||||
|
||||
meta = with lib;
|
||||
src.meta // {
|
||||
description = "Tools and serializer for plain flat binary files";
|
||||
license = [ licenses.mit ];
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
};
|
||||
}
|
||||
meta = final.src.meta // {
|
||||
description = "Tools and serializer for plain flat binary files";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = [ lib.maintainers.ehmry ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
{ buildNimPackage, fetchFromGitHub, htslib }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "hts-nim";
|
||||
version = "0.3.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "brentp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7";
|
||||
};
|
||||
propagatedBuildInputs = [ htslib ];
|
||||
doCheck = false;
|
||||
}
|
||||
21
pkgs/development/nim-packages/hts/default.nix
Normal file
21
pkgs/development/nim-packages/hts/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub, htslib }:
|
||||
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "hts";
|
||||
version = "0.3.23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "brentp";
|
||||
repo = "hts-nim";
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-o27yOtzW4hk8dpicqjW4D8zxqXHdxcz+e84PyK+yBq8=";
|
||||
};
|
||||
propagatedBuildInputs = [ htslib ];
|
||||
nimFlags = [ "--mm:refc" ];
|
||||
doCheck = false;
|
||||
meta = final.src.meta // {
|
||||
description = "Nim wrapper for htslib for parsing genomics data files";
|
||||
homepage = "https://brentp.github.io/hts-nim/";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
})
|
||||
@ -150,7 +150,7 @@ proc checkPhase*() =
|
||||
proc before(idx: int) =
|
||||
echo "check job ", idx, ": ", cmds[idx]
|
||||
for path in walkPattern("tests/t*.nim"):
|
||||
cmds.add("nim r $#" % [path])
|
||||
cmds.add("nim r $# $#" % [getenv("nimFlags"), path])
|
||||
let err = execProcesses(
|
||||
cmds, n = 1,
|
||||
beforeRunEvent = before)
|
||||
|
||||
@ -1,7 +1,18 @@
|
||||
{ fetchNimble }:
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
fetchNimble {
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "nimsimd";
|
||||
version = "1.0.0";
|
||||
hash = "sha256-kp61fylAJ6MSN9hLYLi7CU2lxVR/lbrNCvZTe0LJLGo=";
|
||||
}
|
||||
version = "1.2.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "guzba";
|
||||
repo = "nimsimd";
|
||||
rev = final.version;
|
||||
hash = "sha256-EYLzpzmNUwEOEndAwnUXCqpIUMmpinpiZq+P6zO0Kk8=";
|
||||
};
|
||||
meta = final.src.meta // {
|
||||
description = "Pleasant Nim bindings for SIMD instruction sets";
|
||||
homepage = "https://github.com/guzba/nimsimd";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -9,6 +9,7 @@ buildNimPackage rec {
|
||||
rev = version;
|
||||
hash = "sha256-kN91cp50ZL4INeRWqwrRK6CAkVXUq4rN4YlcN6WL/3Y=";
|
||||
};
|
||||
nimFlags = [ "--threads:off" ];
|
||||
meta = src.meta // {
|
||||
description = "NPeg is a pure Nim pattern matching library";
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
|
||||
@ -14,6 +14,7 @@ buildNimPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ bumpy chroma flatty nimsimd vmath zippy ];
|
||||
|
||||
doCheck = false; # doesn't find dependencies
|
||||
|
||||
meta = with lib;
|
||||
src.meta // {
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
{ lib, stdenv, buildNimPackage, fetchFromGitea, nim-unwrapped, npeg }:
|
||||
|
||||
buildNimPackage rec {
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "preserves";
|
||||
version = "20230530";
|
||||
version = "20230801";
|
||||
src = fetchFromGitea {
|
||||
domain = "git.syndicate-lang.org";
|
||||
owner = "ehmry";
|
||||
repo = "${pname}-nim";
|
||||
rev = version;
|
||||
hash = "sha256-IRIBGjv4po8VyL873v++ovqz8Vg6a9Qbh/M1fxpQXvY=";
|
||||
repo = "preserves-nim";
|
||||
rev = final.version;
|
||||
hash = "sha256-60QsbXMYYfEWvXQAXu7XSpvg2J9YaGKDkDrfclcK6pc=";
|
||||
};
|
||||
propagatedBuildInputs = [ npeg ];
|
||||
nimFlags = [ "--path:${nim-unwrapped}/nim" ];
|
||||
nimFlags = [ "--mm:refc" "--path:${nim-unwrapped}/nim" "--threads:off" ];
|
||||
doCheck = !stdenv.isDarwin;
|
||||
meta = src.meta // {
|
||||
meta = final.src.meta // {
|
||||
description = "Nim implementation of the Preserves data language";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,16 +1,20 @@
|
||||
{ lib, buildNimPackage, fetchNimble, SDL2 }:
|
||||
{ lib, buildNimPackage, fetchFromGitHub, SDL2 }:
|
||||
|
||||
buildNimPackage (finalAttrs: {
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "sdl2";
|
||||
version = "2.0.4";
|
||||
src = fetchNimble {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
|
||||
version = "2.0.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nim-lang";
|
||||
repo = "sdl2";
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-oUTUWuBphoR0pBMkcJBVDW+dnnF8KK23F7eW3lOLNO4=";
|
||||
};
|
||||
propagatedBuildInputs = [ SDL2 ];
|
||||
meta = {
|
||||
meta = final.src.meta // {
|
||||
description = "Nim wrapper for SDL 2.x";
|
||||
platforms = lib.platforms.linux; # Problems with Darwin.
|
||||
homepage = "https://github.com/nim-lang/sdl2";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
18
pkgs/development/nim-packages/smtp/default.nix
Normal file
18
pkgs/development/nim-packages/smtp/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "smtp";
|
||||
version = "unstable-2023-03-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nim-lang";
|
||||
repo = "smtp";
|
||||
rev = "8013aa199dedd04905d46acf3484a232378de518";
|
||||
hash = "sha256-7jPykp79nAY1G0CSajyn6Jw/Ad+XCulBk9HjtKMPEQ4=";
|
||||
};
|
||||
meta = final.src.meta // {
|
||||
description = "SMTP client";
|
||||
homepage = "https://github.com/nim-lang/smtp";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
})
|
||||
@ -1,19 +1,20 @@
|
||||
{ lib, buildNimPackage, fetchFromGitea, hashlib, preserves }:
|
||||
|
||||
buildNimPackage rec {
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "syndicate";
|
||||
version = "20230530";
|
||||
version = "20230801";
|
||||
src = fetchFromGitea {
|
||||
domain = "git.syndicate-lang.org";
|
||||
owner = "ehmry";
|
||||
repo = "${pname}-nim";
|
||||
rev = version;
|
||||
hash = "sha256-lUHoMSQwUlz9EDMvpFL9GlrwbwMvZDILSmuakONwe50=";
|
||||
repo = "syndicate-nim";
|
||||
rev = final.version;
|
||||
hash = "sha256-/mZGWVdQ5FtZf2snPIjTG2tNFVzxQmxvkKuLCAGARYs=";
|
||||
};
|
||||
propagatedBuildInputs = [ hashlib preserves ];
|
||||
meta = src.meta // {
|
||||
nimFlags = [ "--mm:refc" "--threads:off" ];
|
||||
meta = final.src.meta // {
|
||||
description = "Nim implementation of the Syndicated Actor model";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -11,6 +11,8 @@ buildNimPackage rec {
|
||||
hash = "sha256-/v0lQIOMogTxFRtbssziW4W6VhMDepM6Si8igLgcx30=";
|
||||
};
|
||||
|
||||
nimFlags = [ "--mm:refc" ];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib;
|
||||
|
||||
@ -548,7 +548,8 @@ with self;
|
||||
|
||||
ppx_bench = janePackage {
|
||||
pname = "ppx_bench";
|
||||
hash = "0bc0gbm922417wqisafxh35jslcp7xy1s0h0a1q32rhx0ivxx3g6";
|
||||
version = "0.15.1";
|
||||
hash = "sha256-2uk3NfpAODScoQtqiU+ZaOE8zOqkayn/jpfn3GQ4vQg=";
|
||||
minimalOCamlVersion = "4.04.2";
|
||||
meta.description = "Syntax extension for writing in-line benchmarks in ocaml code";
|
||||
propagatedBuildInputs = [ ppx_inline_test ];
|
||||
|
||||
17
pkgs/development/ocaml-modules/qcheck/lin.nix
Normal file
17
pkgs/development/ocaml-modules/qcheck/lin.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ buildDunePackage
|
||||
, qcheck-multicoretests-util
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "qcheck-lin";
|
||||
|
||||
inherit (qcheck-multicoretests-util) version src;
|
||||
|
||||
propagatedBuildInputs = [ qcheck-multicoretests-util ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = qcheck-multicoretests-util.meta // {
|
||||
description = "A multicore testing library for OCaml";
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage
|
||||
, qcheck-core
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "qcheck-multicoretests-util";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-multicore";
|
||||
repo = "multicoretests";
|
||||
rev = version;
|
||||
hash = "sha256-U1ZqfWMwpAvbPq5yp2U9YTFklT4MypzTSfNvcKJfaYE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ qcheck-core ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ocaml-multicore/multicoretests";
|
||||
description = "Utility functions for property-based testing of multicore programs";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
17
pkgs/development/ocaml-modules/qcheck/stm.nix
Normal file
17
pkgs/development/ocaml-modules/qcheck/stm.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ buildDunePackage
|
||||
, qcheck-multicoretests-util
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "qcheck-stm";
|
||||
|
||||
inherit (qcheck-multicoretests-util) src version;
|
||||
|
||||
propagatedBuildInputs = [ qcheck-multicoretests-util ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = qcheck-multicoretests-util.meta // {
|
||||
description = "State-machine testing library for sequential and parallel model-based tests";
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,85 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
# build_requires
|
||||
, cython_3
|
||||
# install_requires
|
||||
, certifi
|
||||
, importlib-metadata
|
||||
, urllib3
|
||||
, pytz
|
||||
, zstandard
|
||||
, lz4
|
||||
# extras_require
|
||||
, sqlalchemy
|
||||
, numpy
|
||||
, pandas
|
||||
, pyarrow
|
||||
, orjson
|
||||
# not in tests_require, but should be
|
||||
, pytest-dotenv
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "clickhouse-connect";
|
||||
version = "0.6.8";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "clickhouse-connect";
|
||||
owner = "ClickHouse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T1vUXhOngPvA4wrg5jVzIiqj0B0gEnk/BS5OdopHgkA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython_3 ];
|
||||
setupPyBuildFlags = [ "--inplace" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
importlib-metadata
|
||||
urllib3
|
||||
pytz
|
||||
zstandard
|
||||
lz4
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook pytest-dotenv ]
|
||||
++ passthru.optional-dependencies.sqlalchemy
|
||||
++ passthru.optional-dependencies.numpy;
|
||||
|
||||
# these tests require a running clickhouse instance
|
||||
disabledTestPaths = [
|
||||
"tests/integration_tests"
|
||||
"tests/tls"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"clickhouse_connect"
|
||||
"clickhouse_connect.driverc.buffer"
|
||||
"clickhouse_connect.driverc.dataconv"
|
||||
"clickhouse_connect.driverc.npconv"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
optional-dependencies = {
|
||||
sqlalchemy = [ sqlalchemy ];
|
||||
numpy = [ numpy ];
|
||||
pandas = [ pandas ];
|
||||
arrow = [ pyarrow ];
|
||||
orjson = [ orjson ];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "ClickHouse Database Core Driver for Python, Pandas, and Superset";
|
||||
homepage = "https://github.com/ClickHouse/clickhouse-connect";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datashader";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vkgfO9WGKMuaL5SxcwMQWKG6FEYxLgRbkvftUkMwg4s=";
|
||||
hash = "sha256-lTlSk3kofWnBDpq04LKQDhoWAE1v8G3g2EqmLEgzsbs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,14 +1,12 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, atpublic
|
||||
, bidict
|
||||
, black
|
||||
, clickhouse-cityhash
|
||||
, clickhouse-driver
|
||||
, clickhouse-connect
|
||||
, dask
|
||||
, datafusion
|
||||
, db-dtypes
|
||||
@ -21,14 +19,14 @@
|
||||
, google-cloud-bigquery-storage
|
||||
, graphviz-nox
|
||||
, hypothesis
|
||||
, importlib-resources
|
||||
, lz4
|
||||
, multipledispatch
|
||||
, numpy
|
||||
, oracledb
|
||||
, packaging
|
||||
, pandas
|
||||
, parsy
|
||||
, poetry-core
|
||||
, poetry-dynamic-versioning
|
||||
, polars
|
||||
, pooch
|
||||
, psycopg2
|
||||
@ -47,7 +45,6 @@
|
||||
, pytz
|
||||
, regex
|
||||
, rich
|
||||
, rsync
|
||||
, shapely
|
||||
, snowflake-connector-python
|
||||
, snowflake-sqlalchemy
|
||||
@ -66,60 +63,55 @@ let
|
||||
name = "ibis-testing-data";
|
||||
owner = "ibis-project";
|
||||
repo = "testing-data";
|
||||
rev = "8a59df99c01fa217259554929543e71c3bbb1761";
|
||||
hash = "sha256-NbgEe0w/qf9hCr9rRfIpyaH9pv25I8x0ykY7EJxDOuk=";
|
||||
rev = "2b3968deaa1a28791b2901dbbcc9bfd3d2f23e9b";
|
||||
hash = "sha256-q1b5IcOl5oIFXP7/P5RufncjHEVrWp4NjoU2uo/BE9U=";
|
||||
};
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibis-framework";
|
||||
version = "5.1.0";
|
||||
version = "6.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "ibis-source";
|
||||
repo = "ibis";
|
||||
owner = "ibis-project";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-u3BBGdhWajZ5WtoBvNxmx76+orfHY6LX3IWAq/x2/9A=";
|
||||
hash = "sha256-qIxacrRSN/Il9cY6ZsOiYLPyxI20aI+DyDM0/9jr654=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes a small bug in the datafusion backend to reorder predicates
|
||||
(fetchpatch {
|
||||
name = "fix-datafusion-compilation.patch";
|
||||
url = "https://github.com/ibis-project/ibis/commit/009230421b2bc1f86591e8b850d37a489e8e4f06.patch";
|
||||
hash = "sha256-5NHkgc8d2bkOMpbY1vme1XgNfyHSr0f7BrR3JTTjjPI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
poetry-dynamic-versioning
|
||||
];
|
||||
|
||||
POETRY_DYNAMIC_VERSIONING_BYPASS = version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
atpublic
|
||||
bidict
|
||||
filelock
|
||||
multipledispatch
|
||||
numpy
|
||||
pandas
|
||||
parsy
|
||||
pooch
|
||||
pyarrow
|
||||
python-dateutil
|
||||
pytz
|
||||
rich
|
||||
sqlglot
|
||||
toolz
|
||||
typing-extensions
|
||||
] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]
|
||||
]
|
||||
++ pooch.optional-dependencies.progress
|
||||
++ pooch.optional-dependencies.xxhash;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
filelock
|
||||
hypothesis
|
||||
pytest-benchmark
|
||||
pytest-httpserver
|
||||
@ -127,32 +119,17 @@ buildPythonPackage rec {
|
||||
pytest-randomly
|
||||
pytest-snapshot
|
||||
pytest-xdist
|
||||
rsync
|
||||
] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends;
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--dist=loadgroup"
|
||||
"-m"
|
||||
"'${lib.concatStringsSep " or " testBackends} or core'"
|
||||
# sqlalchemy2 breakage
|
||||
# breakage from sqlalchemy2 truediv changes
|
||||
"--deselect=ibis/tests/sql/test_sqlalchemy.py::test_tpc_h17"
|
||||
# tries to download duckdb extensions
|
||||
"--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite"
|
||||
"--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite"
|
||||
# all the following tests are fixed in the next release (6.0.0)
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_column_to_pyarrow_table_schema"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_table_to_pyarrow_batches"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_column_to_pyarrow_batches"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_to_pyarrow_batches_memtable"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_table_to_pyarrow_table_schema"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_to_pyarrow_batches_borked_types"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_table_pyarrow_batch_chunk_size"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_column_pyarrow_batch_chunk_size"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_roundtrip_partitioned_parquet"
|
||||
"--deselect=ibis/tests/sql/test_sqlalchemy.py::test_order_by"
|
||||
"--deselect=ibis/tests/sql/test_sqlalchemy.py::test_no_cart_join"
|
||||
"--deselect=ibis/backends/tests/test_temporal.py::test_temporal_binop"
|
||||
"--deselect=ibis/backends/tests/test_temporal.py::test_interval_literal"
|
||||
];
|
||||
|
||||
# patch out tests that check formatting with black
|
||||
@ -164,15 +141,11 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
set -eo pipefail
|
||||
|
||||
HOME="$TMPDIR"
|
||||
export IBIS_TEST_DATA_DIRECTORY="ci/ibis-testing-data"
|
||||
|
||||
mkdir -p "$IBIS_TEST_DATA_DIRECTORY"
|
||||
|
||||
# copy the test data to a directory
|
||||
rsync --chmod=Du+rwx,Fu+rw --archive "${ibisTestingData}/" "$IBIS_TEST_DATA_DIRECTORY"
|
||||
ln -s "${ibisTestingData}" "$IBIS_TEST_DATA_DIRECTORY"
|
||||
'';
|
||||
|
||||
postCheck = ''
|
||||
@ -186,17 +159,19 @@ buildPythonPackage rec {
|
||||
passthru = {
|
||||
optional-dependencies = {
|
||||
bigquery = [ db-dtypes google-cloud-bigquery google-cloud-bigquery-storage pydata-google-auth ];
|
||||
clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 sqlalchemy ];
|
||||
dask = [ dask pyarrow regex ];
|
||||
clickhouse = [ clickhouse-connect sqlalchemy ];
|
||||
dask = [ dask regex ];
|
||||
datafusion = [ datafusion ];
|
||||
druid = [ pydruid sqlalchemy ];
|
||||
duckdb = [ duckdb duckdb-engine packaging pyarrow sqlalchemy sqlalchemy-views ];
|
||||
duckdb = [ duckdb duckdb-engine packaging sqlalchemy sqlalchemy-views ];
|
||||
flink = [ ];
|
||||
geospatial = [ geoalchemy2 geopandas shapely ];
|
||||
mysql = [ sqlalchemy pymysql sqlalchemy-views ];
|
||||
oracle = [ sqlalchemy oracledb packaging sqlalchemy-views ];
|
||||
pandas = [ regex ];
|
||||
polars = [ polars pyarrow ];
|
||||
polars = [ polars ];
|
||||
postgres = [ psycopg2 sqlalchemy sqlalchemy-views ];
|
||||
pyspark = [ pyarrow pyspark sqlalchemy ];
|
||||
pyspark = [ pyspark sqlalchemy ];
|
||||
snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views ];
|
||||
sqlite = [ regex sqlalchemy sqlite sqlalchemy-views ];
|
||||
trino = [ trino-python-client sqlalchemy sqlalchemy-views ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyprecice";
|
||||
version = "2.5.0.3";
|
||||
version = "2.5.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "precice";
|
||||
repo = "python-bindings";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SIuv3VUpEit1ed+4AEPx59bGTDfoQYcAgO1PnVb+9VM=";
|
||||
hash = "sha256-Nau4ytOSv5WOly/hbHO2M6Rgx1ileJrzfCfNJFnwVaw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, aiohttp
|
||||
, pytest
|
||||
@ -19,13 +20,17 @@ buildPythonPackage rec {
|
||||
owner = "Gr1N";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xql0fnw7m2zn103601gqbpyd761kzvgjj2iz9hjsv56nr4z1g9i";
|
||||
hash = "sha256-Mb3wSbambC1h+lFI+fafwZzm78IvADNAsF/Uw60DFHc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "poetry.masonry.api" "poetry.core.masonry.api"
|
||||
'';
|
||||
patches = [
|
||||
# https://github.com/Gr1N/pytest-mockservers/pull/75
|
||||
(fetchpatch {
|
||||
name = "use-poetry-core.patch";
|
||||
url = "https://github.com/Gr1N/pytest-mockservers/commit/c7731186a4e12851ab1c15ab56e652bb48ed59c4.patch";
|
||||
hash = "sha256-/5X3xjJwt2gs3t6f/6n1QZ+CTBq/5+cQE+MgNWyz+Hs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
@ -40,6 +45,8 @@ buildPythonPackage rec {
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -6,33 +6,37 @@
|
||||
, CoreAudio
|
||||
, CoreMIDI
|
||||
, CoreServices
|
||||
, cython_3
|
||||
, fetchPypi
|
||||
, flake8
|
||||
, libjack2
|
||||
, meson-python
|
||||
, ninja
|
||||
, pkg-config
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, tox
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-rtmidi";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "python_rtmidi";
|
||||
inherit version;
|
||||
hash = "sha256-sLUGQoDba3iiYvqUFwMbIktSdZBb0OLhccfQ++FFRP0=";
|
||||
hash = "sha256-Pz6bD6SX6BPMC91zsorgeXfJGAPk1VULx8ejShUBy94=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython_3
|
||||
meson-python
|
||||
ninja
|
||||
pkg-config
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, dask
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, numba
|
||||
, numpy
|
||||
@ -21,6 +22,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-X1gno39s1vZzClQfmUyVxgo64jKeAfS6Ic7VM5rqAJg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/pydata/sparse/issues/594
|
||||
(fetchpatch {
|
||||
name = "fix-test.patch";
|
||||
url = "https://github.com/pydata/sparse/commit/a55651d630efaea6fd2758d083c6d02333b0eebe.patch";
|
||||
hash = "sha256-Vrx7MDlKtA8fOuFZenEkvgA70Hzm+p/4SPZuCvwtLuo=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numba
|
||||
numpy
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlglot";
|
||||
version = "16.3.1";
|
||||
version = "17.14.2";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
repo = "sqlglot";
|
||||
owner = "tobymao";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EN5ocyXCZaWE1BaC2eDg41+o5BoHAog1372b9rc2IDM=";
|
||||
hash = "sha256-aImshQ5jf0k62ucpK4X8G7uHGAFQkhGgjMYo4mvSvew=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "textual";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "Textualize";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hsqVZoQ3PJm0GD5EVfmtwD/7ZcN+xu3kCBbS1q+atf8=";
|
||||
hash = "sha256-IhqUUsS1kCG/AwnbcLAhmQYLBSqf1ff0pD2xH4Tgdho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bearer";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bearer";
|
||||
repo = "bearer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4Gth76mQca+FHtGIUgZZ6aWzjcoQghTikbEYlJszeyc=";
|
||||
hash = "sha256-f0vH+GIWTlE23xWMiqbdOJFGWsrEGgz4YJt+4WEdruw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gqks+q8HxQ54UjRANXBvnfTzE14M8FxbnTMG/JN4ntk=";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "flyway";
|
||||
version = "9.21.0";
|
||||
version = "9.21.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
|
||||
sha256 = "sha256-jy+hgEmLs2jfW5zD9gIKUltcb4zD8hxLiP7ZyKLMpoU=";
|
||||
sha256 = "sha256-pbZNqle4ExLGoICJumJ94PYnL22bxZfHdMzWbo3P4NU=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
|
||||
@ -29,11 +29,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtcreator";
|
||||
version = "11.0.1";
|
||||
version = "11.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
|
||||
hash = "sha256-T55ZOFPPO/gGxlc6u2/EF2dhQWAj2X3e0H4ZxFbW23M=";
|
||||
hash = "sha256-nemSXfzgrR5vzDevdEHhBS3d0V+XIGSTdY2DA0eaLQM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -34,19 +34,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddnet";
|
||||
version = "17.1.1";
|
||||
version = "17.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddnet";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-igvEo80wFYso7I4aaCWgOebsKbGLgBaY4PQy142+Yiw=";
|
||||
hash = "sha256-FJnwabNEEGZDM9wNWMGclFv2IMlXg4Ob3PEbGiGQKKc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
hash = "sha256-ykTeVggLUTY1PPFrGMQDJh8FNQwBlBU7LxbHbMdjD4I=";
|
||||
hash = "sha256-hUrsumBiKovSD7xT1PgH2Q+7HYgyxnFnz33YJPdd5+c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,138 +1,142 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
makeWrapper,
|
||||
writeScriptBin,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
runCommand,
|
||||
cmake,
|
||||
git,
|
||||
glew,
|
||||
SDL2,
|
||||
zlib,
|
||||
minizip,
|
||||
libjpeg,
|
||||
curl,
|
||||
lua,
|
||||
libogg,
|
||||
libtheora,
|
||||
freetype,
|
||||
libpng,
|
||||
sqlite,
|
||||
openal,
|
||||
unzip,
|
||||
cjson,
|
||||
}: let
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, writeShellApplication
|
||||
, fetchFromGitHub
|
||||
, cjson
|
||||
, cmake
|
||||
, git
|
||||
, makeWrapper
|
||||
, unzip
|
||||
, curl
|
||||
, freetype
|
||||
, glew
|
||||
, libjpeg
|
||||
, libogg
|
||||
, libpng
|
||||
, libtheora
|
||||
, lua
|
||||
, minizip
|
||||
, openal
|
||||
, SDL2
|
||||
, sqlite
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
version = "2.81.1";
|
||||
pkgname = "etlegacy";
|
||||
mirror = "https://mirror.etlegacy.com";
|
||||
fetchAsset = {
|
||||
asset,
|
||||
sha256,
|
||||
}:
|
||||
fetchurl
|
||||
{
|
||||
url = mirror + "/etmain/" + asset;
|
||||
inherit sha256;
|
||||
};
|
||||
pak0 =
|
||||
fetchAsset
|
||||
{
|
||||
asset = "pak0.pk3";
|
||||
sha256 = "712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5";
|
||||
};
|
||||
pak1 =
|
||||
fetchAsset
|
||||
{
|
||||
asset = "pak1.pk3";
|
||||
sha256 = "5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d";
|
||||
};
|
||||
pak2 =
|
||||
fetchAsset
|
||||
{
|
||||
asset = "pak2.pk3";
|
||||
sha256 = "a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e";
|
||||
};
|
||||
fakeGit = writeScriptBin "git" ''
|
||||
#! ${stdenv.shell} -e
|
||||
if [ "$1" = "describe" ]; then
|
||||
echo "${version}"
|
||||
fi
|
||||
'';
|
||||
mainProgram =
|
||||
if stdenv.hostPlatform.system == "i686-linux"
|
||||
then "etl.i386"
|
||||
else "etl.x86_64";
|
||||
|
||||
fetchAsset = { asset, hash }: fetchurl {
|
||||
url = "https://mirror.etlegacy.com/etmain/${asset}";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
pak0 = fetchAsset {
|
||||
asset = "pak0.pk3";
|
||||
hash = "sha256-cSlmsg4GUj/oFBlRZQDkmchrK0/sgjhW3b0zP8s9JuU=";
|
||||
};
|
||||
|
||||
pak1 = fetchAsset {
|
||||
asset = "pak1.pk3";
|
||||
hash = "sha256-VhD9dJAkQFtEJafOY5flgYe5QdIgku8R1IRLQn31Pl0=";
|
||||
};
|
||||
|
||||
pak2 = fetchAsset {
|
||||
asset = "pak2.pk3";
|
||||
hash = "sha256-pIq3SaGhKrTZE3KGsfI9ZCwp2lmEWyuvyPZOBSzwbz4=";
|
||||
};
|
||||
|
||||
fakeGit = writeShellApplication {
|
||||
name = "git";
|
||||
|
||||
text = ''
|
||||
if [ "$1" = "describe" ]; then
|
||||
echo "${version}"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = pkgname;
|
||||
inherit version;
|
||||
stdenv.mkDerivation {
|
||||
pname = "etlegacy";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etlegacy";
|
||||
repo = "etlegacy";
|
||||
rev = "refs/tags/v" + version;
|
||||
sha256 = "sha256-CGXtc51vaId/SHbD34ZeT0gPsrl7p2DEw/Kp+GBZIaA="; # 2.81.1
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "etlegacy";
|
||||
repo = "etlegacy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CGXtc51vaId/SHbD34ZeT0gPsrl7p2DEw/Kp+GBZIaA="; # 2.81.1
|
||||
};
|
||||
|
||||
nativeBuildInputs = [cmake fakeGit git makeWrapper unzip cjson];
|
||||
buildInputs = [
|
||||
glew
|
||||
SDL2
|
||||
zlib
|
||||
minizip
|
||||
libjpeg
|
||||
curl
|
||||
lua
|
||||
libogg
|
||||
libtheora
|
||||
freetype
|
||||
libpng
|
||||
sqlite
|
||||
openal
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cjson
|
||||
cmake
|
||||
fakeGit
|
||||
git
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# Required for build time to not be in 1980
|
||||
export SOURCE_DATE_EPOCH=$(date +%s)
|
||||
# This indicates the build was by a CI pipeline and prevents the resource
|
||||
# files from being flagged as 'dirty' due to potentially being custom built.
|
||||
export CI="true"
|
||||
buildInputs = [
|
||||
curl
|
||||
freetype
|
||||
glew
|
||||
libjpeg
|
||||
libogg
|
||||
libpng
|
||||
libtheora
|
||||
lua
|
||||
minizip
|
||||
openal
|
||||
SDL2
|
||||
sqlite
|
||||
zlib
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# Required for build time to not be in 1980
|
||||
export SOURCE_DATE_EPOCH=$(date +%s)
|
||||
# This indicates the build was by a CI pipeline and prevents the resource
|
||||
# files from being flagged as 'dirty' due to potentially being custom built.
|
||||
export CI="true"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DCROSS_COMPILE32=0"
|
||||
"-DBUILD_SERVER=1"
|
||||
"-DBUILD_CLIENT=1"
|
||||
"-DBUNDLED_JPEG=0"
|
||||
"-DBUNDLED_LIBS=0"
|
||||
"-DINSTALL_EXTRA=0"
|
||||
"-DINSTALL_OMNIBOT=0"
|
||||
"-DINSTALL_GEOIP=0"
|
||||
"-DINSTALL_WOLFADMIN=0"
|
||||
"-DFEATURE_AUTOUPDATE=0"
|
||||
"-DINSTALL_DEFAULT_BASEDIR=${placeholder "out"}/lib/etlegacy"
|
||||
"-DINSTALL_DEFAULT_BINDIR=${placeholder "out"}/bin"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${pak0} $out/lib/etlegacy/etmain/pak0.pk3
|
||||
ln -s ${pak1} $out/lib/etlegacy/etmain/pak1.pk3
|
||||
ln -s ${pak2} $out/lib/etlegacy/etmain/pak2.pk3
|
||||
|
||||
makeWrapper $out/bin/etl.* $out/bin/etl
|
||||
makeWrapper $out/bin/etlded.* $out/bin/etlded
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
meta = {
|
||||
description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license";
|
||||
homepage = "https://etlegacy.com";
|
||||
license = with lib.licenses; [ gpl3 cc-by-nc-sa-30 ];
|
||||
longDescription = ''
|
||||
ET: Legacy, an open source project fully compatible client and server
|
||||
for the popular online FPS game Wolfenstein: Enemy Territory - whose
|
||||
gameplay is still considered unmatched by many, despite its great age.
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DCROSS_COMPILE32=0"
|
||||
"-DBUILD_SERVER=0"
|
||||
"-DBUILD_CLIENT=1"
|
||||
"-DBUNDLED_JPEG=0"
|
||||
"-DBUNDLED_LIBS=0"
|
||||
"-DINSTALL_EXTRA=0"
|
||||
"-DINSTALL_OMNIBOT=0"
|
||||
"-DINSTALL_GEOIP=0"
|
||||
"-DINSTALL_WOLFADMIN=0"
|
||||
"-DFEATURE_AUTOUPDATE=0"
|
||||
"-DINSTALL_DEFAULT_BASEDIR=."
|
||||
"-DINSTALL_DEFAULT_BINDIR=."
|
||||
"-DINSTALL_DEFAULT_MODDIR=."
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
ETMAIN=$out/etmain
|
||||
mkdir -p $ETMAIN
|
||||
ln -s ${pak0} $ETMAIN/pak0.pk3
|
||||
ln -s ${pak1} $ETMAIN/pak1.pk3
|
||||
ln -s ${pak2} $ETMAIN/pak2.pk3
|
||||
makeWrapper $out/${mainProgram} $out/bin/${mainProgram} --chdir $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license";
|
||||
homepage = "https://etlegacy.com";
|
||||
platforms = ["i686-linux" "x86_64-linux"];
|
||||
license = [licenses.gpl3 licenses.cc-by-nc-sa-30];
|
||||
inherit mainProgram;
|
||||
maintainers = with maintainers; [ashleyghooper];
|
||||
};
|
||||
}
|
||||
mainProgram = "etl";
|
||||
maintainers = with lib.maintainers; [ ashleyghooper drupol ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gobgpd";
|
||||
version = "3.16.0";
|
||||
version = "3.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osrg";
|
||||
repo = "gobgp";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RdZk2I7QvIWEeiL81N5PLJYE0KHYbkvjJeDXTg3F9c4=";
|
||||
hash = "sha256-LpQMRn0mINhixbS8GpYAqr0pjwbnQdUOs2BH3rkQ3hU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Z7vYpDQIKc4elVBLiGtxF3D9pec4QNvWFLpux/29t1Y=";
|
||||
|
||||
@ -1,12 +1,25 @@
|
||||
{ lib
|
||||
, buildNimPackage
|
||||
, fetchFromGitHub
|
||||
, nimPackages
|
||||
, nixosTests
|
||||
, substituteAll
|
||||
, unstableGitUpdater
|
||||
, flatty
|
||||
, jester
|
||||
, jsony
|
||||
, karax
|
||||
, markdown
|
||||
, nimcrypto
|
||||
, packedjson
|
||||
, redis
|
||||
, redpool
|
||||
, sass
|
||||
, supersnappy
|
||||
, zippy
|
||||
}:
|
||||
|
||||
nimPackages.buildNimPackage rec {
|
||||
buildNimPackage rec {
|
||||
pname = "nitter";
|
||||
version = "unstable-2023-07-21";
|
||||
|
||||
@ -26,7 +39,7 @@ nimPackages.buildNimPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = with nimPackages; [
|
||||
buildInputs = [
|
||||
flatty
|
||||
jester
|
||||
jsony
|
||||
@ -43,6 +56,8 @@ nimPackages.buildNimPackage rec {
|
||||
|
||||
nimBinOnly = true;
|
||||
|
||||
nimFlags = [ "--mm:refc" ];
|
||||
|
||||
postBuild = ''
|
||||
nim c --hint[Processing]:off -r tools/gencss
|
||||
nim c --hint[Processing]:off -r tools/rendermd
|
||||
|
||||
@ -7,11 +7,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oil";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||
hash = "sha256-cRHIqFcdGm0dYgExvGfzd92P5iJO2+/ySeHV1o8d1WY=";
|
||||
hash = "sha256-H7oWI3+660MhMdDTTPX11/YalnItzhxfdBrtwKR8xrM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgsStatic
|
||||
, byacc
|
||||
, ed
|
||||
, ncurses
|
||||
, readline
|
||||
, installShellFiles
|
||||
, pkgsStatic
|
||||
, historySupport ? true
|
||||
, readlineSupport ? true
|
||||
, lineEditingLibrary ? if (stdenv.hostPlatform.isDarwin
|
||||
|| stdenv.hostPlatform.isStatic)
|
||||
then "null"
|
||||
else "readline"
|
||||
}:
|
||||
|
||||
assert lib.elem lineEditingLibrary [ "null" "edit" "editline" "readline" "vrl" ];
|
||||
assert !(lib.elem lineEditingLibrary [ "edit" "editline" "vrl" ]); # broken
|
||||
assert (lineEditingLibrary == "readline") -> readlineSupport;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rc";
|
||||
version = "unstable-2023-06-14";
|
||||
@ -59,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"MANPREFIX=${placeholder "man"}/share/man"
|
||||
"CPPFLAGS=\"-DSIGCLD=SIGCHLD\""
|
||||
"EDIT=${lineEditingLibrary}"
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
@ -79,9 +87,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://github.com/rakitzis/rc";
|
||||
description = "The Plan 9 shell";
|
||||
license = lib.licenses.zlib;
|
||||
license = [ lib.licenses.zlib ];
|
||||
mainProgram = "rc";
|
||||
maintainers = with lib.maintainers; [ ramkromberg AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "rc";
|
||||
};
|
||||
})
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "steampipe";
|
||||
version = "0.20.9";
|
||||
version = "0.20.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbot";
|
||||
repo = "steampipe";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kPgyWXPHGfvZ+ne6tumy6NGn1Tl4J+toZ983YaMFi6k=";
|
||||
sha256 = "sha256-v0ZVyiFHiRsn6ARA7sLCfNfoljTFegCXb1/C4sY0vfg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA=";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }:
|
||||
let
|
||||
version = "2023.5.3";
|
||||
version = "2023.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
@ -8,7 +8,7 @@ let
|
||||
"https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
];
|
||||
sha256 = "e2e9a9b307b5b54daf724ae7f5fda22b9cbd8382a4c72e18b85ac39b3e8a16ab";
|
||||
hash = "sha256-mpOG8sx+L+/kwgB3X9ALOvq+Rx1GC3JE2G7yVt1iQYg=";
|
||||
};
|
||||
|
||||
name = "burpsuite-${version}";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flannel";
|
||||
version = "0.22.0";
|
||||
version = "0.22.2";
|
||||
rev = "v${version}";
|
||||
|
||||
vendorHash = "sha256-JtDFwkYRAxpa4OBV5Tzr70DcOsp2oA3XB0PM5kGaY6Q=";
|
||||
vendorHash = "sha256-sObAXI9U5U1JXWNzaBNNGfklnfh/G3aUye/MINWwU4s=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "flannel-io";
|
||||
repo = "flannel";
|
||||
sha256 = "sha256-LwIGY74iH/qD8XpTw3wRJC0DVsFj1qLInX0i5Zorvew=";
|
||||
sha256 = "sha256-ZQyBPsYIOQq6oonn661sIBpccV9uxoXlieOhbIIv5AE=";
|
||||
};
|
||||
|
||||
ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfox";
|
||||
version = "1.11.3";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BishopFox";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zkZ8Glny9eERfU4DGtTOc66O7LOk5NISqUR5muxb2m0=";
|
||||
hash = "sha256-pUOraiYJsbQqOSYRMRzxcAcsBIz/2VBRnsKo1eHVSkQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lgccNq1cSg8rrHW0aMLcC5HrZXf8TvdFSmk6pbGXNqQ=";
|
||||
vendorHash = "sha256-nSisRurpareGI4EHENayMhsYOKL1hE1wVw2Ueiqii4U=";
|
||||
|
||||
# Some tests are failing because of wrong filename/path
|
||||
doCheck = false;
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook-i18n-helpers";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "mdbook-i18n-helpers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3J7uHjHOpK2ympCZxtKieJamYepRQiBGIFo6HAQMGJ0=";
|
||||
hash = "sha256-j5nbAgbCuz8urvdYPTTtGDnWwY/FxKNnwbeSTcuyIKw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cAuKQm0RZx3VRmLIL3WShsOlZMd6szI7cd9A0A4o8x8=";
|
||||
cargoHash = "sha256-lDHq4KRYIeCddhFGQDWOx9olcOASjOke/h22Qm4wv6Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Helpers for a mdbook i18n workflow based on Gettext";
|
||||
|
||||
@ -2182,6 +2182,8 @@ with pkgs;
|
||||
|
||||
git-big-picture = callPackage ../applications/version-management/git-big-picture { };
|
||||
|
||||
git-bars = callPackage ../applications/version-management/git-bars { };
|
||||
|
||||
git-branchless = callPackage ../applications/version-management/git-branchless {
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
@ -5768,6 +5770,8 @@ with pkgs;
|
||||
|
||||
libxnd = callPackage ../development/libraries/libxnd { };
|
||||
|
||||
libz = callPackage ../development/libraries/libz { };
|
||||
|
||||
libzbc = callPackage ../os-specific/linux/libzbc { };
|
||||
|
||||
libzbd = callPackage ../os-specific/linux/libzbd { };
|
||||
@ -11042,7 +11046,7 @@ with pkgs;
|
||||
|
||||
nifi = callPackage ../servers/web-apps/nifi { };
|
||||
|
||||
nitter = callPackage ../servers/nitter { };
|
||||
nitter = nim2Packages.callPackage ../servers/nitter { };
|
||||
|
||||
noip = callPackage ../tools/networking/noip { };
|
||||
|
||||
@ -16671,8 +16675,9 @@ with pkgs;
|
||||
|
||||
inherit (callPackages ../development/compilers/nim
|
||||
{ inherit (darwin) Security; }
|
||||
) nim-unwrapped nimble-unwrapped nim;
|
||||
) nim-unwrapped nim-unwrapped-2 nimble-unwrapped nim nim2;
|
||||
nimPackages = recurseIntoAttrs nim.pkgs;
|
||||
nim2Packages = recurseIntoAttrs nim2.pkgs;
|
||||
|
||||
nrpl = callPackage ../development/tools/nrpl { };
|
||||
|
||||
@ -25731,6 +25736,8 @@ with pkgs;
|
||||
};
|
||||
zig = zig_0_11;
|
||||
|
||||
zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { };
|
||||
|
||||
zimlib = callPackage ../development/libraries/zimlib { };
|
||||
|
||||
zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };
|
||||
@ -38997,7 +39004,7 @@ with pkgs;
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
|
||||
mosdepth = callPackage ../applications/science/biology/mosdepth { };
|
||||
mosdepth = nim2Packages.callPackage ../applications/science/biology/mosdepth { };
|
||||
|
||||
niftyreg = callPackage ../applications/science/biology/niftyreg { };
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
inherit (libretro) fuse genesis-plus-gx mgba snes9x twenty-fortyeight;
|
||||
inherit (libretro) fuse genesis-plus-gx mgba nestopia snes9x twenty-fortyeight;
|
||||
in
|
||||
|
||||
let self = rec {
|
||||
@ -70,6 +70,8 @@ let self = rec {
|
||||
|
||||
libretro-mgba = callPackage ../applications/video/kodi/addons/libretro-mgba { inherit mgba; };
|
||||
|
||||
libretro-nestopia = callPackage ../applications/video/kodi/addons/libretro-nestopia { inherit nestopia; };
|
||||
|
||||
libretro-snes9x = callPackage ../applications/video/kodi/addons/libretro-snes9x { inherit snes9x; };
|
||||
|
||||
jellyfin = callPackage ../applications/video/kodi/addons/jellyfin { };
|
||||
|
||||
@ -9,7 +9,6 @@ lib.makeScope newScope (self:
|
||||
callPackage ../development/nim-packages/build-nim-package {
|
||||
inherit (buildPackages.buildPackages.nimPackages) nim_builder;
|
||||
};
|
||||
fetchNimble = callPackage ../development/nim-packages/fetch-nimble { };
|
||||
|
||||
asciigraph = callPackage ../development/nim-packages/asciigraph { };
|
||||
|
||||
@ -32,6 +31,8 @@ lib.makeScope newScope (self:
|
||||
|
||||
coap = callPackage ../development/nim-packages/coap { };
|
||||
|
||||
db_connector = callPackage ../development/nim-packages/db_connector { };
|
||||
|
||||
docopt = callPackage ../development/nim-packages/docopt { };
|
||||
|
||||
eris = callPackage ../development/nim-packages/eris { };
|
||||
@ -47,7 +48,7 @@ lib.makeScope newScope (self:
|
||||
|
||||
hashlib = callPackage ../development/nim-packages/hashlib { };
|
||||
|
||||
hts-nim = callPackage ../development/nim-packages/hts-nim { };
|
||||
hts = callPackage ../development/nim-packages/hts { };
|
||||
|
||||
illwill = callPackage ../development/nim-packages/illwill { };
|
||||
|
||||
@ -108,6 +109,8 @@ lib.makeScope newScope (self:
|
||||
|
||||
nimraylib-now = callPackage ../development/nim-packages/nimraylib-now { };
|
||||
|
||||
smtp = callPackage ../development/nim-packages/smtp { };
|
||||
|
||||
spry = callPackage ../development/nim-packages/spry { };
|
||||
|
||||
spryvm = callPackage ../development/nim-packages/spryvm { };
|
||||
|
||||
@ -1464,8 +1464,14 @@ let
|
||||
|
||||
qcheck-core = callPackage ../development/ocaml-modules/qcheck/core.nix { };
|
||||
|
||||
qcheck-lin = callPackage ../development/ocaml-modules/qcheck/lin.nix { };
|
||||
|
||||
qcheck-multicoretests-util = callPackage ../development/ocaml-modules/qcheck/multicoretests-util.nix { };
|
||||
|
||||
qcheck-ounit = callPackage ../development/ocaml-modules/qcheck/ounit.nix { };
|
||||
|
||||
qcheck-stm = callPackage ../development/ocaml-modules/qcheck/stm.nix { };
|
||||
|
||||
qtest = callPackage ../development/ocaml-modules/qtest { };
|
||||
|
||||
### R ###
|
||||
|
||||
@ -2005,6 +2005,8 @@ self: super: with self; {
|
||||
|
||||
clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { };
|
||||
|
||||
clickhouse-connect = callPackage ../development/python-modules/clickhouse-connect { };
|
||||
|
||||
clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver { };
|
||||
|
||||
cliff = callPackage ../development/python-modules/cliff { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user