mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-31 17:23:34 +00:00
Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
sternenseemann
commit
a5389324f0
14
.github/CODEOWNERS
vendored
14
.github/CODEOWNERS
vendored
@ -118,13 +118,13 @@
|
||||
/pkgs/development/interpreters/python/hooks @FRidh @jonringer
|
||||
|
||||
# Haskell
|
||||
/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn
|
||||
/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn
|
||||
/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn
|
||||
/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn
|
||||
/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn
|
||||
/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn
|
||||
/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn
|
||||
/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @ncfavier
|
||||
/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn @ncfavier
|
||||
/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn @ncfavier
|
||||
/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn @ncfavier
|
||||
/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn @ncfavier
|
||||
/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn @ncfavier
|
||||
/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @ncfavier
|
||||
|
||||
# Perl
|
||||
/pkgs/development/interpreters/perl @stigtsp @zakame @dasJ
|
||||
|
||||
@ -2545,6 +2545,12 @@
|
||||
githubId = 4621;
|
||||
name = "Brad Ediger";
|
||||
};
|
||||
brahyerr = {
|
||||
name = "Bryant Pham";
|
||||
email = "bp@1829847@gmail.com";
|
||||
github = "brahyerr";
|
||||
githubId = 120991075;
|
||||
};
|
||||
brainrape = {
|
||||
email = "martonboros@gmail.com";
|
||||
github = "brainrake";
|
||||
@ -19585,6 +19591,12 @@
|
||||
github = "yanganto";
|
||||
githubId = 10803111;
|
||||
};
|
||||
yannip = {
|
||||
email = "yPapandreou7@gmail.com";
|
||||
github = "YanniPapandreou";
|
||||
githubId = 15948162;
|
||||
name = "Yanni Papandreou";
|
||||
};
|
||||
yarny = {
|
||||
github = "Yarny0";
|
||||
githubId = 41838844;
|
||||
|
||||
@ -26,7 +26,7 @@ import urllib.parse
|
||||
import urllib.request
|
||||
import xml.etree.ElementTree as ET
|
||||
from dataclasses import asdict, dataclass
|
||||
from datetime import datetime
|
||||
from datetime import UTC, datetime
|
||||
from functools import wraps
|
||||
from multiprocessing.dummy import Pool
|
||||
from pathlib import Path
|
||||
@ -788,14 +788,12 @@ def update_plugins(editor: Editor, args):
|
||||
autocommit = not args.no_commit
|
||||
|
||||
if autocommit:
|
||||
from datetime import date
|
||||
|
||||
try:
|
||||
repo = git.Repo(os.getcwd())
|
||||
updated = date.today().strftime('%m-%d-%Y')
|
||||
updated = datetime.now(tz=UTC).strftime('%Y-%m-%d')
|
||||
print(args.outfile)
|
||||
commit(repo,
|
||||
f"{editor.attr_path}: updated the {updated}", [args.outfile]
|
||||
f"{editor.attr_path}: update on {updated}", [args.outfile]
|
||||
)
|
||||
except git.InvalidGitRepositoryError as e:
|
||||
print(f"Not in a git repository: {e}", file=sys.stderr)
|
||||
|
||||
@ -398,6 +398,7 @@ with lib.maintainers; {
|
||||
cdepillabout
|
||||
expipiplus1
|
||||
maralorn
|
||||
ncfavier
|
||||
sternenseemann
|
||||
];
|
||||
githubTeams = [
|
||||
|
||||
@ -1841,6 +1841,7 @@ in
|
||||
serviceConfig = {
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
User = "grafana";
|
||||
Restart = "on-failure";
|
||||
RuntimeDirectory = "grafana";
|
||||
RuntimeDirectoryMode = "0755";
|
||||
# Hardening
|
||||
|
||||
@ -124,6 +124,7 @@ in {
|
||||
apfs = runTest ./apfs.nix;
|
||||
appliance-repart-image = runTest ./appliance-repart-image.nix;
|
||||
apparmor = handleTest ./apparmor.nix {};
|
||||
archi = handleTest ./archi.nix {};
|
||||
atd = handleTest ./atd.nix {};
|
||||
atop = handleTest ./atop.nix {};
|
||||
atuin = handleTest ./atuin.nix {};
|
||||
|
||||
31
nixos/tests/archi.nix
Normal file
31
nixos/tests/archi.nix
Normal file
@ -0,0 +1,31 @@
|
||||
import ./make-test-python.nix ({ lib, ... }: {
|
||||
name = "archi";
|
||||
meta.maintainers = with lib.maintainers; [ paumr ];
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
imports = [
|
||||
./common/x11.nix
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [ archi ];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_x()
|
||||
|
||||
with subtest("createEmptyModel via CLI"):
|
||||
machine.succeed("Archi -application com.archimatetool.commandline.app -consoleLog -nosplash --createEmptyModel --saveModel smoke.archimate")
|
||||
machine.copy_from_vm("smoke.archimate", "")
|
||||
|
||||
with subtest("UI smoketest"):
|
||||
machine.succeed("DISPLAY=:0 Archi --createEmptyModel >&2 &")
|
||||
machine.wait_for_window("Archi")
|
||||
|
||||
# wait till main UI is open
|
||||
machine.wait_for_text("Welcome to Archi")
|
||||
|
||||
machine.screenshot("welcome-screen")
|
||||
'';
|
||||
})
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
buildInputs = [ sndio ]
|
||||
++ lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD)
|
||||
++ lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD)
|
||||
libbsd;
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
preBuild = ''
|
||||
makeFlagsArray+=("PREFIX=$out")
|
||||
'' + lib.optionalString
|
||||
(!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) ''
|
||||
(!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) ''
|
||||
makeFlagsArray+=(LDADD="-lsndio -lbsd")
|
||||
|
||||
# Fix warning about implicit declaration of function 'strlcpy'
|
||||
|
||||
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace libraries/lib-files/FileNames.cpp \
|
||||
--replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
|
||||
'' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11.0") ''
|
||||
'' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") ''
|
||||
sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm
|
||||
'';
|
||||
|
||||
|
||||
@ -88,7 +88,7 @@ rustPlatform.buildRustPackage {
|
||||
postBuild = ''
|
||||
make -C docs \
|
||||
DEB_VERSION=${version} DEB_VERSION_UPSTREAM=${version} \
|
||||
RUSTC_TARGET=${stdenv.targetPlatform.config} \
|
||||
RUSTC_TARGET=${stdenv.hostPlatform.config} \
|
||||
BUILD_MODE=release \
|
||||
proxmox-backup-client.1 pxar.1
|
||||
'';
|
||||
|
||||
@ -65,7 +65,7 @@ self: let
|
||||
});
|
||||
|
||||
xeft = super.xeft.overrideAttrs (old: let
|
||||
libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in {
|
||||
dontUnpack = false;
|
||||
|
||||
|
||||
@ -118,7 +118,7 @@ self: let
|
||||
});
|
||||
|
||||
jinx = super.jinx.overrideAttrs (old: let
|
||||
libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in {
|
||||
dontUnpack = false;
|
||||
|
||||
@ -159,7 +159,7 @@ self: let
|
||||
);
|
||||
|
||||
xeft = super.xeft.overrideAttrs (old: let
|
||||
libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in {
|
||||
dontUnpack = false;
|
||||
|
||||
|
||||
@ -23,6 +23,8 @@ in
|
||||
|
||||
ebuild-mode = callPackage ./manual-packages/ebuild-mode { };
|
||||
|
||||
el-easydraw = callPackage ./manual-packages/el-easydraw { };
|
||||
|
||||
elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
|
||||
|
||||
emacspeak = callPackage ./manual-packages/emacspeak { };
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, melpaBuild
|
||||
, fetchFromGitHub
|
||||
, writeText
|
||||
, unstableGitUpdater
|
||||
, gzip
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "de68851724072c6695e675f090b33a8abec040c9";
|
||||
in
|
||||
melpaBuild {
|
||||
pname = "edraw";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "misohena";
|
||||
repo = "el-easydraw";
|
||||
inherit rev;
|
||||
hash = "sha256-l9i+HCRKnKiDqID+bfAOPE7LpVBZp1AOPkceX8KbDXM=";
|
||||
};
|
||||
|
||||
commit = rev;
|
||||
|
||||
packageRequires = [ gzip ];
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(edraw
|
||||
:repo "misohena/el-easydraw"
|
||||
:fetcher github
|
||||
:files
|
||||
("*.el"
|
||||
"msg"))
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/misohena/el-easydraw";
|
||||
description = "Embedded drawing tool for Emacs";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ brahyerr ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -315,7 +315,7 @@ let
|
||||
ivy-rtags = fix-rtags super.ivy-rtags;
|
||||
|
||||
jinx = super.jinx.overrideAttrs (old: let
|
||||
libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in {
|
||||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
|
||||
pkgs.pkg-config
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, desktopToDarwinBundle
|
||||
, buildPackages
|
||||
, pkg-config
|
||||
, fixDarwinDylibNames
|
||||
, freetype
|
||||
, harfbuzz
|
||||
, openjpeg
|
||||
@ -99,10 +100,9 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (enableGL || enableX11) copyDesktopItems
|
||||
++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ]
|
||||
++ lib.optionals (enablePython) [ which swig ]
|
||||
++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
|
||||
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle fixDarwinDylibNames xcbuild ];
|
||||
|
||||
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ]
|
||||
++ lib.optional stdenv.isDarwin xcbuild
|
||||
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
|
||||
++ lib.optionals enableCurl [ curl openssl ]
|
||||
++ lib.optionals enableGL (
|
||||
|
||||
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"
|
||||
# NSFilenamesPboardType is deprecated in 10.14+
|
||||
++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.targetPlatform.darwinSdkVersion}";
|
||||
++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
, runtimeShell
|
||||
, systemLocale ? config.i18n.defaultLocale or "en_US"
|
||||
, patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
@ -57,6 +58,20 @@ let
|
||||
source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
|
||||
|
||||
pname = "firefox-${channel}-bin-unwrapped";
|
||||
|
||||
# FIXME: workaround for not being able to pass flags to patchelf
|
||||
# Remove after https://github.com/NixOS/nixpkgs/pull/256525
|
||||
wrappedPatchelf = stdenv.mkDerivation {
|
||||
pname = "patchelf-wrapped";
|
||||
inherit (patchelfUnstable) version;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${patchelfUnstable}/bin/patchelf $out/bin/patchelf --append-flags "--no-clobber-old-sections"
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -64,7 +79,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl { inherit (source) url sha256; };
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook patchelfUnstable ];
|
||||
nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook wrappedPatchelf ];
|
||||
buildInputs = [
|
||||
gtk3
|
||||
adwaita-icon-theme
|
||||
@ -80,8 +95,6 @@ stdenv.mkDerivation {
|
||||
appendRunpaths = [
|
||||
"${pipewire}/lib"
|
||||
];
|
||||
# Firefox uses "relrhack" to manually process relocations from a fixed offset
|
||||
patchelfFlags = [ "--no-clobber-old-sections" ];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
|
||||
@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
# talpid-core wants libwg.a in build/lib/{triple}
|
||||
preBuild = ''
|
||||
dest=build/lib/${stdenv.targetPlatform.config}
|
||||
dest=build/lib/${stdenv.hostPlatform.config}
|
||||
mkdir -p $dest
|
||||
ln -s ${libwg}/lib/libwg.a $dest
|
||||
'';
|
||||
|
||||
@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
postPhases = [ "installFirmware" "removeInstalledTests" ]
|
||||
++ optionals (enableUtils && stdenv.targetPlatform.isLinux) [ "moveUdevRules" ]
|
||||
++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ "moveUdevRules" ]
|
||||
;
|
||||
|
||||
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv.targetPlatform) system;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
os = {
|
||||
|
||||
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz";
|
||||
sha256 = "sha256-RJ2uc/GIWU/fDJijSzYS8GdL7zUkeExOLWXtTbi8ZLk=";
|
||||
hash = "sha256-gBgDC+GH948JMsjzo/SOpWDzJXu0g58YX1VW28PeorI=";
|
||||
};
|
||||
|
||||
buildInputs = [ which ];
|
||||
|
||||
@ -62,7 +62,7 @@ let
|
||||
SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}";
|
||||
|
||||
USERAGENT = builtins.concatStringsSep " " [
|
||||
"User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})"
|
||||
"User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})"
|
||||
"AppleWebKit/537.36 (KHTML, like Gecko)"
|
||||
"Chrome/77.0.3865.75"
|
||||
"Safari/537.36"
|
||||
|
||||
@ -1,14 +1,13 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, hostPlatform
|
||||
, targetPlatform
|
||||
, cargo
|
||||
, rustc
|
||||
, lld
|
||||
}:
|
||||
|
||||
let
|
||||
arch = targetPlatform.qemuArch;
|
||||
arch = hostPlatform.qemuArch;
|
||||
|
||||
target = ./. + "/${arch}-unknown-none.json";
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, callPackage, fetchDartDeps, runCommand, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }:
|
||||
{ lib, stdenv, callPackage, fetchDartDeps, writeText, symlinkJoin, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }:
|
||||
|
||||
{ sdkSetupScript ? ""
|
||||
, pubGetScript ? "dart pub get"
|
||||
@ -36,11 +36,15 @@
|
||||
|
||||
let
|
||||
dartDeps = (fetchDartDeps.override {
|
||||
dart = runCommand "dart-fod" { nativeBuildInputs = [ makeWrapper ]; } ''
|
||||
mkdir -p "$out/bin"
|
||||
makeWrapper "${dart}/bin/dart" "$out/bin/dart" \
|
||||
--add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
'';
|
||||
dart = symlinkJoin {
|
||||
name = "dart-fod";
|
||||
paths = [ dart ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram "$out/bin/dart" \
|
||||
--add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
'';
|
||||
};
|
||||
}) {
|
||||
buildDrvArgs = args;
|
||||
inherit sdkSetupScript pubGetScript vendorHash pubspecLockFile;
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs } @ topLevelArgs:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchNpmDeps
|
||||
, buildPackages
|
||||
, nodejs
|
||||
, darwin
|
||||
} @ topLevelArgs:
|
||||
|
||||
{ name ? "${args.pname}-${args.version}"
|
||||
, src ? null
|
||||
@ -54,7 +60,9 @@ in
|
||||
stdenv.mkDerivation (args // {
|
||||
inherit npmDeps npmBuildScript;
|
||||
|
||||
nativeBuildInputs = nativeBuildInputs ++ [ nodejs npmConfigHook npmBuildHook npmInstallHook ];
|
||||
nativeBuildInputs = nativeBuildInputs
|
||||
++ [ nodejs npmConfigHook npmBuildHook npmInstallHook nodejs.python ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
|
||||
buildInputs = buildInputs ++ [ nodejs ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
24
pkgs/by-name/ap/apache-users/optional-args.patch
Normal file
24
pkgs/by-name/ap/apache-users/optional-args.patch
Normal file
@ -0,0 +1,24 @@
|
||||
--- a/apache2.1.pl
|
||||
+++ b/apache2.1.pl
|
||||
@@ -63,10 +63,10 @@ getopt ("h: l: p: e: s: t:" ,\%opts);
|
||||
use LWP;
|
||||
|
||||
|
||||
-if (!(exists $opts{h})||!(exists $opts{p})||!(exists $opts{l})||!(exists $opts{e})){ &usage;}
|
||||
+if (!(exists $opts{h})){ &usage;}
|
||||
|
||||
sub usage{
|
||||
-print "\nUSAGE: apache.pl [-h 1.2.3.4] [-l names] [-p 80] [-s (SSL Support 1=true 0=false)] [-e 403 (http code)] [-t threads]\n\n ";
|
||||
+print "\nUSAGE: apache-users -h 1.2.3.4 [-l names] [-p 80] [-s (SSL Support 1=true 0=false)] [-e 403 (http code)] [-t threads]\n\n ";
|
||||
exit 1;
|
||||
};
|
||||
|
||||
@@ -75,7 +75,7 @@ if (exists $opts{h}){
|
||||
}
|
||||
if (exists $opts{l}){
|
||||
$list=$opts{l};
|
||||
-}else {$list="names";}
|
||||
+}else {$list="@out@/share/apache-users/names";}
|
||||
if (exists $opts{p}){
|
||||
$port=$opts{p};
|
||||
}else{$port=80;}
|
||||
43
pkgs/by-name/ap/apache-users/package.nix
Normal file
43
pkgs/by-name/ap/apache-users/package.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, perl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apache-users";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://labs.portcullis.co.uk/download/apache_users-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-rylW4F8Si6KKYxaxEJlVFnbLqfqS6ytMPfHpc8MgriA=";
|
||||
};
|
||||
|
||||
# Allow optional arguments where defaults are provided
|
||||
patches = [ ./optional-args.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteAllInPlace apache${finalAttrs.version}.pl
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
(perl.withPackages (p: [ p.ParallelForkManager p.LWP ]))
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D apache${finalAttrs.version}.pl $out/bin/apache-users
|
||||
install -Dm444 names $out/share/apache-users/names
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Username Enumeration through Apache UserDir";
|
||||
homepage = "https://labs.portcullis.co.uk/downloads/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
mainProgram = "apache-users";
|
||||
};
|
||||
})
|
||||
@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
# ofborg: x86_64-linux builds the musl package, aarch64-linux doesn't
|
||||
broken = stdenv.targetPlatform.isMusl && stdenv.buildPlatform.isAarch64;
|
||||
broken = stdenv.hostPlatform.isMusl && stdenv.buildPlatform.isAarch64;
|
||||
};
|
||||
})
|
||||
# TODO: report the quirks and patches to bmake devteam (especially the Musl one)
|
||||
|
||||
1312
pkgs/by-name/fr/framework-tool/Cargo.lock
generated
Normal file
1312
pkgs/by-name/fr/framework-tool/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
37
pkgs/by-name/fr/framework-tool/package.nix
Normal file
37
pkgs/by-name/fr/framework-tool/package.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "framework-tool";
|
||||
|
||||
# Latest stable version 0.1.0 has an ssh:// git URL in Cargo.lock,
|
||||
# so use unstable for now
|
||||
version = "unstable-2023-11-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FrameworkComputer";
|
||||
repo = "framework-system";
|
||||
rev = "491a587342a5d79366a25d803b7065169314279c";
|
||||
hash = "sha256-qDtW4DvY19enCfkOBRaako9ngAkmSreoNWlL4QE2FAk=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"smbios-lib-0.9.1" =
|
||||
"sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo=";
|
||||
"uefi-0.20.0" = "sha256-/3WNHuc27N89M7s+WT64SHyFOp7YRyzz6B+neh1vejY=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Swiss army knife for Framework laptops";
|
||||
homepage = "https://github.com/FrameworkComputer/framework-system";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
mainProgram = "framework_tool";
|
||||
};
|
||||
}
|
||||
30
pkgs/by-name/ha/hachimarupop/package.nix
Normal file
30
pkgs/by-name/ha/hachimarupop/package.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "hachimarupop";
|
||||
version = "unstable-2022-07-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noriokanisawa";
|
||||
repo = "HachiMaruPop";
|
||||
rev = "67d96c274032f5a2e1d33c1ec53498fde9110079";
|
||||
hash = "sha256-b1moyTVy0hHGu9/LrQ9k6Isd/LYTSxiuqz3BzrYVbXY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm444 fonts/ttf/*.ttf -t $out/share/fonts/truetype/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/noriokanisawa/HachiMaruPop";
|
||||
description = "A cute, Japanese font";
|
||||
license = lib.licenses.ofl;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
cp -r . "$out/lib/node_modules/@mermaid-js/mermaid-cli"
|
||||
|
||||
makeWrapper "${nodejs}/bin/node" "$out/bin/mmdc" \
|
||||
'' + lib.optionalString (lib.meta.availableOn stdenv.targetPlatform chromium) ''
|
||||
'' + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform chromium) ''
|
||||
--set PUPPETEER_EXECUTABLE_PATH '${lib.getExe chromium}' \
|
||||
'' + ''
|
||||
--add-flags "$out/lib/node_modules/@mermaid-js/mermaid-cli/src/cli.js"
|
||||
|
||||
27
pkgs/by-name/no/nofi/package.nix
Normal file
27
pkgs/by-name/no/nofi/package.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, dbus, pkg-config}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nofi";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellsclytn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0TYIycuy2LIhixVvH++U8CbmfQugc+0TF8DTiViWSbE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dbus ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An interruption-free notification system for Linux";
|
||||
homepage = "https://github.com/ellsclytn/nofi/";
|
||||
changelog = "https://github.com/ellsclytn/nofi/raw/v${version}/CHANGELOG.md";
|
||||
license = [ licenses.asl20 /* or */ licenses.mit ];
|
||||
mainProgram = pname;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
};
|
||||
}
|
||||
@ -33,7 +33,7 @@ buildGoPackage rec {
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
addToSearchPath GOPATH "${go-lib}/share/gocode"
|
||||
make ARCH=${stdenv.targetPlatform.linuxArch} -C go/src/${goPackagePath}
|
||||
make ARCH=${stdenv.hostPlatform.linuxArch} -C go/src/${goPackagePath}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "erg";
|
||||
version = "0.6.24";
|
||||
version = "0.6.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erg-lang";
|
||||
repo = "erg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-J8Zw79TXYpDfnsx6UgB4sqY1vdwVHildqtCcXlBvUxQ=";
|
||||
hash = "sha256-z3481/vWmR5QlULfJZtLdGhwsJKBbLcvyC87SCngMVg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4FhD9MvAhP88WGqVIUG2JHxd/gbDYf++bdlS6lVW0xs=";
|
||||
cargoHash = "sha256-+jN+6At8tLHA/ilSBxugHIS79Cw8bGhE0RUNU4sSGeM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@ -1029,7 +1029,6 @@ broken-packages:
|
||||
- cut-the-crap # failure in job https://hydra.nixos.org/build/233238478 at 2023-09-02
|
||||
- CV # failure in job https://hydra.nixos.org/build/233223571 at 2023-09-02
|
||||
- d3js # failure in job https://hydra.nixos.org/build/233251474 at 2023-09-02
|
||||
- daemons # failure in job https://hydra.nixos.org/build/237233422 at 2023-10-21
|
||||
- dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02
|
||||
- DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02
|
||||
- dahdit # failure in job https://hydra.nixos.org/build/233245113 at 2023-09-02
|
||||
|
||||
@ -60,6 +60,9 @@ default-package-overrides:
|
||||
# hls-floskell-plugin 2.4 does not yet support floskell 0.11
|
||||
- floskell < 0.11
|
||||
|
||||
# Newer daemons requires GHC 9.6
|
||||
- daemons == 0.3.0
|
||||
|
||||
extra-packages:
|
||||
- Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8
|
||||
- Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8
|
||||
|
||||
@ -814,14 +814,14 @@ stdenv.mkDerivation ({
|
||||
|
||||
# Implicit pointer to integer conversions are errors by default since clang 15.
|
||||
# Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456.
|
||||
// lib.optionalAttrs stdenv.cc.isClang {
|
||||
// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion";
|
||||
}
|
||||
|
||||
# Ensure libc++abi is linked even when clang is invoked as just `clang` or `cc`.
|
||||
# Works around https://github.com/NixOS/nixpkgs/issues/166205.
|
||||
# This can be dropped once a fix has been committed to cc-wrapper.
|
||||
// lib.optionalAttrs (stdenv.cc.isClang && stdenv.cc.libcxx != null) {
|
||||
// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang && stdenv.cc.libcxx != null) {
|
||||
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
|
||||
}
|
||||
)
|
||||
|
||||
@ -78911,6 +78911,34 @@ self: {
|
||||
}) {};
|
||||
|
||||
"daemons" = callPackage
|
||||
({ mkDerivation, base, bytestring, cereal, containers, data-default
|
||||
, directory, filepath, ghc-prim, HUnit, network, pipes
|
||||
, test-framework, test-framework-hunit, transformers, unix
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "daemons";
|
||||
version = "0.3.0";
|
||||
sha256 = "05h03qk31lank60cd0ig9h4rf8zl6p4li5smba919lgpm89lyvy3";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
base bytestring cereal data-default directory filepath ghc-prim
|
||||
network pipes transformers unix
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base bytestring cereal containers data-default ghc-prim network
|
||||
pipes transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base data-default directory ghc-prim HUnit test-framework
|
||||
test-framework-hunit unix
|
||||
];
|
||||
description = "Daemons in Haskell made fun and easy";
|
||||
license = lib.licenses.gpl3Only;
|
||||
}) {};
|
||||
|
||||
"daemons_0_4_0" = callPackage
|
||||
({ mkDerivation, base, bytestring, cereal, containers, data-default
|
||||
, directory, filepath, ghc-prim, HUnit, network, pipes
|
||||
, test-framework, test-framework-hunit, transformers, unix
|
||||
@ -78937,7 +78965,6 @@ self: {
|
||||
description = "Daemons in Haskell made fun and easy";
|
||||
license = lib.licenses.gpl3Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"dag" = callPackage
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
# that as the version number, I guess.
|
||||
version = "2017";
|
||||
|
||||
libname = pname + stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
libname = pname + stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip";
|
||||
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
# We want to have the makefile pick up $CC, etc. so that we don't have
|
||||
# to unnecessarily tie this package to the GCC stdenv.
|
||||
./02-use-toolchain-env-vars.patch
|
||||
] ++ lib.optionals stdenv.targetPlatform.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# On macOS the library suffix is .dylib:
|
||||
./03-macOS-SOsuf.patch
|
||||
];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
, libGL
|
||||
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
|
||||
, alsa-lib
|
||||
, x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid
|
||||
, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid
|
||||
, libX11
|
||||
, xorgproto
|
||||
, libICE
|
||||
@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--disable-oss"
|
||||
] ++ lib.optional (!x11Support) "--without-x"
|
||||
++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
|
||||
++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles"
|
||||
++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles"
|
||||
++ lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
# We remove libtool .la files when static libs are requested,
|
||||
|
||||
@ -1,10 +1,41 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
|
||||
, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis
|
||||
, libXxf86dga, libXxf86misc
|
||||
, libXxf86vm, openal, libGLU, libGL, libjpeg, flac
|
||||
, libXi, libXfixes, freetype, libopus, libtheora
|
||||
, physfs, enet, pkg-config, gtk3, pcre, libpulseaudio, libpthreadstubs
|
||||
{ lib
|
||||
, alsa-lib
|
||||
, cmake
|
||||
, enet
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, flac
|
||||
, freetype
|
||||
, gtk3
|
||||
, libGL
|
||||
, libGLU
|
||||
, libjpeg
|
||||
, libopus
|
||||
, libpng
|
||||
, libpthreadstubs
|
||||
, libpulseaudio
|
||||
, libtheora
|
||||
, libvorbis
|
||||
, libwebp
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXdmcp
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXi
|
||||
, libXpm
|
||||
, libXt
|
||||
, libXxf86dga
|
||||
, libXxf86misc
|
||||
, libXxf86vm
|
||||
, openal
|
||||
, pcre
|
||||
, physfs
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, texinfo
|
||||
, xorgproto
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -18,15 +49,45 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
texinfo zlib libpng libvorbis openal libGLU libGL
|
||||
libjpeg flac enet libtheora freetype physfs libopus
|
||||
gtk3 pcre
|
||||
enet
|
||||
flac
|
||||
freetype
|
||||
gtk3
|
||||
libGL
|
||||
libGLU
|
||||
libjpeg
|
||||
libopus
|
||||
libpng
|
||||
libtheora
|
||||
libvorbis
|
||||
libwebp
|
||||
openal
|
||||
pcre
|
||||
physfs
|
||||
texinfo
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libXext xorgproto libX11 libXpm libXt libXcursor alsa-lib
|
||||
libXxf86dga libXxf86misc libXxf86vm libXi libXfixes
|
||||
libXdmcp libpulseaudio libpthreadstubs
|
||||
alsa-lib
|
||||
libpthreadstubs
|
||||
libpulseaudio
|
||||
libX11
|
||||
libXcursor
|
||||
libXdmcp
|
||||
libXext
|
||||
libXfixes
|
||||
libXi
|
||||
libXpm
|
||||
libXt
|
||||
libXxf86dga
|
||||
libXxf86misc
|
||||
libXxf86vm
|
||||
xorgproto
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
cd source
|
||||
substituteInPlace Makefile \
|
||||
--replace 'ldconfig' ""
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isx86_64) ''
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '-DENABLE_SSE2' ""
|
||||
'';
|
||||
|
||||
@ -14,8 +14,8 @@ stdenv.mkDerivation ( finalAttrs: {
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
./build.sh ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"}
|
||||
./build.sh -shared ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"}
|
||||
./build.sh ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"}
|
||||
./build.sh -shared ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = lib.optional stdenv.isDarwin Foundation;
|
||||
|
||||
installTargets = [ "install_hdrs" ]
|
||||
++ lib.optional (!stdenv.targetPlatform.isStatic) "install_shared_lib"
|
||||
++ lib.optional stdenv.targetPlatform.isStatic "install_lib";
|
||||
++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib"
|
||||
++ lib.optional stdenv.hostPlatform.isStatic "install_lib";
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
, withLadspa ? withFullDeps # LADSPA audio filtering
|
||||
, withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library
|
||||
, withLzma ? withHeadlessDeps # xz-utils
|
||||
, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx
|
||||
, withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx
|
||||
, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support
|
||||
, withMp3lame ? withHeadlessDeps # LAME MP3 encoder
|
||||
, withMysofa ? withFullDeps # HRTF support via SOFAlizer
|
||||
@ -386,8 +386,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(enableFeature withHardcodedTables "hardcoded-tables")
|
||||
(enableFeature withSafeBitstreamReader "safe-bitstream-reader")
|
||||
|
||||
(enableFeature (withMultithread && stdenv.targetPlatform.isUnix) "pthreads")
|
||||
(enableFeature (withMultithread && stdenv.targetPlatform.isWindows) "w32threads")
|
||||
(enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads")
|
||||
(enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads")
|
||||
"--disable-os2threads" # We don't support OS/2
|
||||
|
||||
(enableFeature withNetwork "network")
|
||||
|
||||
@ -69,7 +69,7 @@ let
|
||||
platforms."aarch64-linux".sha256 = "12sp58nxa3nv800badv62vpvc30hyb0ykywdaxgv9y8pswp9lq0z";
|
||||
platforms."x86_64-linux".sha256 = "0vzzwq1k6bv9d209yg3samvfnfwj7s58y9r3p3pd98wxa9iyzf4j";
|
||||
|
||||
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
|
||||
platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cef-binary";
|
||||
|
||||
@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch;
|
||||
patches = lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch;
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook;
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook;
|
||||
|
||||
separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector";
|
||||
hardeningDisable = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "stackprotector";
|
||||
|
||||
# FIXME: the hardeingDisable attr above does not seems effective, so
|
||||
# the need to disable stackprotector via configureFlags
|
||||
configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp";
|
||||
configureFlags = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "--disable-ssp";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, enableUdev ? stdenv.isLinux && !stdenv.targetPlatform.isStatic
|
||||
, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic
|
||||
, udev
|
||||
, libobjc
|
||||
, IOKit
|
||||
|
||||
@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.all;
|
||||
# Should be fixable if a higher clang version is used, see:
|
||||
# https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
|
||||
broken = stdenv.targetPlatform.isDarwin;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
mv lib*${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/
|
||||
mv lib*${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
|
||||
|
||||
mkdir -p $out/include
|
||||
mv *.h $out/include/
|
||||
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
"TUNE=${
|
||||
if tune then
|
||||
"auto"
|
||||
else if stdenv.targetPlatform.isx86 then
|
||||
else if stdenv.hostPlatform.isx86 then
|
||||
"x86" # "chooses options that should be well suited for most x86 platforms"
|
||||
else
|
||||
"generic" # "chooses options that should be OK for most platforms"
|
||||
|
||||
@ -33,13 +33,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "piper-phonemize";
|
||||
version = "2023.11.6-1";
|
||||
version = "2023.11.14-4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = "piper-phonemize";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-IRvuA03Z6r8Re/ocq2G/r28uwI9RU3xmmNI7S2G40rc=";
|
||||
hash = "sha256-pj1DZUhy3XWGn+wNtxKKDWET9gsfofEB0NZ+EEQz9q0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
# Tests fail to build on 32-bit platforms; fixed in 22.x
|
||||
# https://github.com/protocolbuffers/protobuf/issues/10418
|
||||
++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "22") [
|
||||
++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [
|
||||
"-Dprotobuf_BUILD_TESTS=OFF"
|
||||
];
|
||||
|
||||
@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# https://hydra.nixos.org/build/235677717/nixlog/4/tail
|
||||
# Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms
|
||||
# https://github.com/protocolbuffers/protobuf/issues/8460
|
||||
doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.targetPlatform.is32bit;
|
||||
doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@ -63,8 +63,7 @@ redoxRustPlatform.buildRustPackage rec {
|
||||
DESTDIR=$out make install
|
||||
'';
|
||||
|
||||
# TODO: should be hostPlatform
|
||||
TARGET = stdenvNoCC.targetPlatform.rust.rustcTargetSpec;
|
||||
TARGET = stdenvNoCC.hostPlatform.rust.rustcTargetSpec;
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
|
||||
@ -26,7 +26,7 @@ in stdenv.mkDerivation {
|
||||
inherit version;
|
||||
pname = "libtorch";
|
||||
|
||||
src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable;
|
||||
src = fetchzip srcs."${stdenv.hostPlatform.system}-${device}" or unavailable;
|
||||
|
||||
nativeBuildInputs =
|
||||
if stdenv.isDarwin then [ fixDarwinDylibNames ]
|
||||
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# name of library file ("libzn_poly.so")
|
||||
libbasename = "libzn_poly";
|
||||
libext = stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
libext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
|
||||
};
|
||||
|
||||
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [
|
||||
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"lf_cv_sane_realloc=yes"
|
||||
];
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ tcl.mkTclDerivation {
|
||||
substituteInPlace $file --replace "exec wish" "exec $out/bin/wish"
|
||||
done
|
||||
''
|
||||
+ lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11") ''
|
||||
+ lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") ''
|
||||
substituteInPlace unix/configure* \
|
||||
--replace " -framework UniformTypeIdentifiers" ""
|
||||
'';
|
||||
|
||||
@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional stdenv.isDarwin ''use_lld=false'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-O2";
|
||||
FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";
|
||||
FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12";
|
||||
|
||||
nativeBuildInputs = [
|
||||
myGn
|
||||
|
||||
@ -36,7 +36,7 @@ plugins: let
|
||||
$CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}"
|
||||
'';
|
||||
|
||||
ext = stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
ext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
runCommand "${vapoursynth.name}-with-plugins" {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.32";
|
||||
|
||||
# https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48
|
||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.targetPlatform.linker == "bfd" && wayland.withLibraries;
|
||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";
|
||||
|
||||
@ -29,7 +29,7 @@ let
|
||||
in
|
||||
buildDunePackage rec {
|
||||
pname = "mldoc";
|
||||
version = "1.5.6";
|
||||
version = "1.5.8";
|
||||
|
||||
minimalOCamlVersion = "4.10";
|
||||
|
||||
@ -38,8 +38,8 @@ buildDunePackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "logseq";
|
||||
repo = "mldoc";
|
||||
rev = "2a700b2e4797e47505f423fd47dc07372bd7b04e"; # version not tagged
|
||||
hash = "sha256-OS06fb/Nz8grztFEVwWiqsQQt2PQjqcgQFxQuAEYC54=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7uuNUFMSQEgakTKfpYixp43gnfpQSW++snBzgr0Ni0Y=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
37
pkgs/development/ocaml-modules/riot/default.nix
Normal file
37
pkgs/development/ocaml-modules/riot/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, bigstringaf
|
||||
, buildDunePackage
|
||||
, fetchurl
|
||||
, iomux
|
||||
, ptime
|
||||
, uri
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "riot";
|
||||
version = "0.0.2";
|
||||
|
||||
minimalOCamlVersion = "5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz";
|
||||
hash = "sha256-ck/tr5o0nKF4WNgjPODHg1/tlaKv1JtuYgqYfIIZ78Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bigstringaf
|
||||
iomux
|
||||
ptime
|
||||
uri
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "An actor-model multi-core scheduler for OCaml 5";
|
||||
homepage = "https://github.com/leostera/riot";
|
||||
changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ marsam ];
|
||||
};
|
||||
}
|
||||
@ -6,15 +6,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "yaml";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-${version}.tbz";
|
||||
hash = "sha256-0KngriGEpp5tcgK/43B9EEOdMacSQYYCNLGfAgRS7Mc=";
|
||||
hash = "sha256-xQ0qyii5+WZ5K3HhYDNR5dJO2k39PkRT+9UDZqOggic=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.13";
|
||||
duneVersion = "3";
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ bos ctypes ];
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }:
|
||||
{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib
|
||||
, junit_alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "yaml-sexp";
|
||||
|
||||
inherit (yaml) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ junit_alcotest ];
|
||||
|
||||
meta = yaml.meta // {
|
||||
description = "ocaml-yaml with sexp support";
|
||||
};
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, matplotlib
|
||||
, numpy
|
||||
@ -13,15 +13,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "acoustics";
|
||||
version = "0.2.6";
|
||||
version = "0.2.6-unstable-2023-08-20";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-acoustics";
|
||||
repo = "python-acoustics";
|
||||
rev = "99d79206159b822ea2f4e9d27c8b2fbfeb704d38";
|
||||
hash = "sha256-/4bVjlhj8ihpAFHEWPaZ/xBILi3rb8f0NmwAexJCg+o=";
|
||||
};
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
@ -47,11 +49,6 @@ buildPythonPackage rec {
|
||||
"-Wignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# ValueError: Unknown window type: "hanning"
|
||||
"tests/standards/test_iso_1996_2_2007.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "acoustics" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString (!stdenv.targetPlatform.isWindows) ''
|
||||
postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
find $out -name '*.exe' -delete
|
||||
'';
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geopandas";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "geopandas";
|
||||
repo = "geopandas";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lhQXYSY2JrY3+GgMnfTJugnOD/g3VjG0tgw+cEgpIP8=";
|
||||
hash = "sha256-mQ13fjhtFXvUnBok5bDz+zkbgfXEUmwiv77rBpYS5oo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -56,6 +56,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/globus/globus-sdk-python";
|
||||
changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -59,6 +59,5 @@ buildPythonPackage rec {
|
||||
description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API";
|
||||
homepage = "https://github.com/scikit-learn-contrib/hdbscan";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hledger-utils";
|
||||
version = "1.13.2";
|
||||
version = "1.14.0";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "nobodyinperson";
|
||||
repo = "hledger-utils";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-E++gHvXspPodLW2hEESKjg+R5aV39UJpDP8JYQX9iBw=";
|
||||
hash = "sha256-Qu4nUcAGTACmLhwc7fkLxITOyFnUHv85qMhtViFumVs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -136,8 +136,8 @@ let
|
||||
|
||||
arch =
|
||||
# KeyError: ('Linux', 'arm64')
|
||||
if stdenv.targetPlatform.isLinux && stdenv.targetPlatform.linuxArch == "arm64" then "aarch64"
|
||||
else stdenv.targetPlatform.linuxArch;
|
||||
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.linuxArch == "arm64" then "aarch64"
|
||||
else stdenv.hostPlatform.linuxArch;
|
||||
|
||||
bazel-build = buildBazelPackage rec {
|
||||
name = "bazel-build-${pname}-${version}";
|
||||
@ -219,7 +219,7 @@ let
|
||||
build --python_path="${python}/bin/python"
|
||||
build --distinct_host_configuration=false
|
||||
build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include"
|
||||
'' + lib.optionalString (stdenv.targetPlatform.avxSupport && stdenv.targetPlatform.isUnix) ''
|
||||
'' + lib.optionalString (stdenv.hostPlatform.avxSupport && stdenv.hostPlatform.isUnix) ''
|
||||
build --config=avx_posix
|
||||
'' + lib.optionalString mklSupport ''
|
||||
build --config=mkl_open_source_only
|
||||
@ -298,13 +298,13 @@ let
|
||||
inherit meta;
|
||||
};
|
||||
platformTag =
|
||||
if stdenv.targetPlatform.isLinux then
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
"manylinux2014_${arch}"
|
||||
else if stdenv.system == "x86_64-darwin" then
|
||||
"macosx_10_9_${arch}"
|
||||
else if stdenv.system == "aarch64-darwin" then
|
||||
"macosx_11_0_${arch}"
|
||||
else throw "Unsupported target platform: ${stdenv.targetPlatform}";
|
||||
else throw "Unsupported target platform: ${stdenv.hostPlatform}";
|
||||
|
||||
in
|
||||
buildPythonPackage {
|
||||
|
||||
@ -23,6 +23,5 @@ buildPythonPackage rec {
|
||||
description = "Simple LDAP Authenticator Plugin for JupyterHub";
|
||||
homepage = "https://github.com/jupyterhub/ldapauthenticator";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -205,7 +205,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://jupyter.org/";
|
||||
changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
# darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
};
|
||||
|
||||
@ -48,6 +48,5 @@ buildPythonPackage rec {
|
||||
description = "Python toolkit for working with and comparing the standardized codes for languages";
|
||||
homepage = "https://github.com/LuminosoInsight/langcodes";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -66,6 +66,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/kmike/marisa-trie";
|
||||
changelog = "https://github.com/pytries/marisa-trie/blob/${version}/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -40,6 +40,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/SamuraiT/mecab-python3";
|
||||
changelog = "https://github.com/SamuraiT/mecab-python3/releases/tag/v${version}";
|
||||
license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./libportmidi-cdll.patch;
|
||||
libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.targetPlatform.extensions.sharedLibrary}";
|
||||
libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
postPatch = ''
|
||||
substituteInPlace mpv.py \
|
||||
--replace "sofile = ctypes.util.find_library('mpv')" \
|
||||
'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"'
|
||||
'sofile = "${mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"'
|
||||
'';
|
||||
|
||||
# tests impure, will error if it can't load libmpv.so
|
||||
|
||||
@ -41,6 +41,5 @@ buildPythonPackage rec {
|
||||
description = "Python library to perform OAuth handshakes with a MediaWiki installation";
|
||||
homepage = "https://github.com/mediawiki-utilities/python-mwoauth";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
patches = [
|
||||
# mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11.
|
||||
# This makes the installation with nixpkgs fail. I suspect, that's
|
||||
# because stdenv.targetPlatform.darwinSdkVersion is (currently) set to
|
||||
# because stdenv.hostPlatform.darwinSdkVersion is (currently) set to
|
||||
# 10.12. The patch reverts
|
||||
# https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654
|
||||
./0001-Revert-Fix-MacOS-wheels-platform-tag.patch
|
||||
|
||||
@ -67,6 +67,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/jupyterhub/oauthenticator";
|
||||
changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -47,6 +47,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/anhaidgroup/py_stringmatching";
|
||||
changelog = "https://github.com/anhaidgroup/py_stringmatching/blob/v${version}/CHANGES.txt";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyngrok";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YOE9t/W4LsZqBFMbJRbyB6oQqrqW02iecqQYR6yZfV8=";
|
||||
hash = "sha256-wTK0DnsZBbB9nHMe8hUQjMl3sbv0RaFGiU4NSJshPrY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -25,6 +25,5 @@ buildPythonPackage rec {
|
||||
description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications.";
|
||||
homepage = "https://github.com/eugeniy/pytest-tornado";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,6 +18,5 @@ buildPythonPackage rec {
|
||||
description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack";
|
||||
homepage = "https://github.com/wndhydrnt/python-oauth2";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,13 +3,14 @@
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, regex
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "somajo";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -17,9 +18,13 @@ buildPythonPackage rec {
|
||||
owner = "tsproisl";
|
||||
repo = "SoMaJo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CNGSol77Q3uAZPLeV43NhIffO31tnZoMYOsevkZh3pc=";
|
||||
hash = "sha256-3A2et4pl92LsRtEx2Ki8Soz3n1nZEGQGPc3ZIBDojNM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
regex
|
||||
];
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
|
||||
# exe are only required when testpath is used on windows
|
||||
# https://github.com/jupyter/testpath/blob/de8ca59539eb23b9781e55848b7d2646c8c61df9/testpath/commands.py#L128
|
||||
preBuild = lib.optionalString (!stdenv.targetPlatform.isWindows) ''
|
||||
preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
rm testpath/cli-32.exe testpath/cli-64.exe
|
||||
'';
|
||||
|
||||
|
||||
59
pkgs/development/python-modules/textual-dev/default.nix
Normal file
59
pkgs/development/python-modules/textual-dev/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, fetchFromGitHub
|
||||
, msgpack
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, textual
|
||||
, time-machine
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "textual-dev";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Textualize";
|
||||
repo = "textual-dev";
|
||||
# we use rev instead of tag since upstream doesn't use tags
|
||||
rev = "6afa9013a42cb18e9105e49d6a56874097f7c812";
|
||||
hash = "sha256-ef35389ZMU/zih7Se3KkMGECf5o2i5y6up64/1AECas=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
click
|
||||
msgpack
|
||||
textual
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-aiohttp
|
||||
pytestCheckHook
|
||||
time-machine
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"textual_dev"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Development tools for Textual";
|
||||
homepage = "https://github.com/Textualize/textual-dev";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yannip ];
|
||||
};
|
||||
}
|
||||
@ -189,7 +189,7 @@ in buildPythonPackage rec {
|
||||
''
|
||||
# error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc'
|
||||
# This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header.
|
||||
+ lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") ''
|
||||
+ lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ''
|
||||
substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace '#if __cplusplus >= 201703L
|
||||
inline void *aligned_alloc(size_t align, size_t size)' '#if __cplusplus >= 201703L && 0
|
||||
inline void *aligned_alloc(size_t align, size_t size)'
|
||||
|
||||
@ -1,38 +1,48 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, click
|
||||
, click-default-group
|
||||
, fetchPypi
|
||||
, git # shells out to git
|
||||
, hatchling
|
||||
, importlib-resources
|
||||
, incremental
|
||||
, jinja2
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, toml
|
||||
, pythonOlder
|
||||
, tomli
|
||||
, twisted
|
||||
, setuptools
|
||||
, git # shells out to git
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "towncrier";
|
||||
version = "23.6.0";
|
||||
format = "setuptools";
|
||||
version = "23.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/Cm9WrRyfI2s++Y29/tdxTuZgFti2hyWshSDYVn/cME=";
|
||||
hash = "sha256-E5N8JH4/iuIKxE2JXPX5amCtRs/cwWcXWVMNeDfZ7l0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "hatchling ~= 1.17.1" "hatchling"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
click-default-group
|
||||
incremental
|
||||
jinja2
|
||||
toml
|
||||
setuptools
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
importlib-resources
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -51,6 +51,5 @@ buildPythonPackage rec {
|
||||
description = "A library for looking up the frequencies of words in many languages, based on many sources of data";
|
||||
homepage = "https://github.com/rspeer/wordfreq/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "algolia-cli";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algolia";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zwlDn545R7A5l6m7lsFSSf3rW96FND6/HRgeykvVCH0=";
|
||||
hash = "sha256-T7LklR+NUuB5nDwEedG3eD+qSK+mjUiS/EXerqCAroE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk=";
|
||||
|
||||
@ -12,9 +12,6 @@ buildNpmPackage rec {
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-j3lMQh8++pb/00d9H2v7QBkpxIJdsuRQoFkNiQbvnF4=";
|
||||
|
||||
nativeBuildInputs = [ nodePackages.node-gyp python3 ];
|
||||
|
||||
npmBuildScript = "build:prod";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
|
||||
platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "azure-functions-core-tools";
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
||||
pname = "StaticSitesClient-${versionFlavor}";
|
||||
version = flavor.buildId;
|
||||
|
||||
src = sources.${stdenv.targetPlatform.system} or (throw "Unsupported platform");
|
||||
src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform");
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bearer";
|
||||
version = "1.27.1";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bearer";
|
||||
repo = "bearer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3kJPBvw12iyAu9WVIZgyUrsW6XQ0AqpDmDl1E72vyuE=";
|
||||
hash = "sha256-18kXDdkwT0bINpwQ5sG+ic0ZFJS/vBMidzo67/C/fbM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ikrpFnn+CTuhttd3gVyoKU3RIBRR/zL8YjvE0tjIH6I=";
|
||||
vendorHash = "sha256-UbXKMeia6j5xARzO8GjRiDn6GGYz7gjEIdP8ylvJGT4=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/bearer"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user