mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
991a07725b
109 changed files with 540 additions and 198 deletions
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";
|
||||
|
|
|
|||
|
|
@ -398,6 +398,7 @@ with lib.maintainers; {
|
|||
cdepillabout
|
||||
expipiplus1
|
||||
maralorn
|
||||
ncfavier
|
||||
sternenseemann
|
||||
];
|
||||
githubTeams = [
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
#
|
||||
# nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true
|
||||
#
|
||||
version = "4.5.0.0";
|
||||
version = "4.6.0.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -63,14 +63,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
rev = "v${finalAttrs.version}";
|
||||
# The updateScript relies on the `src` using `hash`, and not `sha256. To
|
||||
# update the correct hash for the `src` vs the `uhdImagesSrc`
|
||||
hash = "sha256-0EqMBaQiNr8PE542YNkPvX3o1HhnhrO0Kz1euphY6Ps=";
|
||||
hash = "sha256-9ZGt0ZrGbprCmpAuOue6pg2gliu4MvlRFHGxyMJeKAc=";
|
||||
};
|
||||
# Firmware images are downloaded (pre-built) from the respective release on Github
|
||||
uhdImagesSrc = fetchurl {
|
||||
url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz";
|
||||
# Please don't convert this to a hash, in base64, see comment near src's
|
||||
# hash.
|
||||
sha256 = "13cn41wv7vldk4vx7vy3jbb3wb3a5vpfg3ay893klpi6vzxc1dly";
|
||||
sha256 = "17g503mhndaabrdl7qai3rdbafr8xx8awsyr7h2bdzwzprzmh4m3";
|
||||
};
|
||||
passthru = {
|
||||
updateScript = [
|
||||
|
|
@ -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,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)
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -2,20 +2,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "onestepback";
|
||||
version = "0.991";
|
||||
version = "0.994";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip";
|
||||
sha256 = "1jfgcgzbb6ra9qs3zcp6ij0hfldzg3m0yjw6l6vf4kq1mdby1ghm";
|
||||
hash = "sha256-kjGiGo4bF1mWJPnaPv2lf7rGG/uAntHK61mH6lcJ6e4=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-grey-brown-green-blue-v${version}.zip";
|
||||
sha256 = "0i006h1asbpfdzajws0dvk9acplvcympzgxq5v3n8hmizd6yyh77";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-green-brown-v${version}.zip";
|
||||
sha256 = "16p002lak6425gcskny4hzws8x9dgsm6j3a1r08y11rsz7d2hnmy";
|
||||
url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-darker-v${version}.zip";
|
||||
hash = "sha256-AuurSa45uF5GbPqaMXKblWkv3YGkYL1z0VjWrbnsB/I=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -24,15 +20,17 @@ stdenv.mkDerivation rec {
|
|||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/themes
|
||||
cp -a OneStepBack* $out/share/themes/
|
||||
rm $out/share/themes/*/{LICENSE,README*}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gtk theme inspired by the NextStep look";
|
||||
homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -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}";
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -78834,6 +78834,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
|
||||
|
|
@ -78860,7 +78888,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"
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
setuptools
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString (!stdenv.targetPlatform.isWindows) ''
|
||||
postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
find $out -name '*.exe' -delete
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -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,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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "changie";
|
||||
version = "1.15.1";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miniscruff";
|
||||
repo = "changie";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pjeqaLCxWq2maz+C4jCNNRhYhclvcABi6zC+Qxy2GPw=";
|
||||
hash = "sha256-lFe59ITcPJ69x0COV+WlX500Hl96XqWLCz5gJMqX6qQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pBRU/eWuI14uDmTPo593hW0YAye5Y1Fm1axd/+X7nS8=";
|
||||
vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ buildGoModule rec {
|
|||
"-s" "-w"
|
||||
"-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}"
|
||||
"-X github.com/openfaas/faas-cli/version.Version=${version}"
|
||||
"-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}"
|
||||
"-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.hostPlatform}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -6,6 +6,10 @@
|
|||
, makeWrapper
|
||||
} :
|
||||
|
||||
let
|
||||
arm-embedded-cc = pkgsCross.arm-embedded.buildPackages.gcc;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "fusee-launcher";
|
||||
version = "unstable-2018-07-14";
|
||||
|
|
@ -17,6 +21,10 @@ stdenv.mkDerivation {
|
|||
sha256 = "1pqkgw5bk0xcz9x7pc1f0r0b9nsc8jnnvcs1315d8ml8mx23fshm";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"CROSS_COMPILE=${arm-embedded-cc.targetPrefix}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share
|
||||
cp fusee-launcher.py $out/bin/fusee-launcher
|
||||
|
|
@ -28,7 +36,7 @@ stdenv.mkDerivation {
|
|||
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgsCross.arm-embedded.buildPackages.gcc makeWrapper python3Packages.wrapPython ];
|
||||
nativeBuildInputs = [ arm-embedded-cc makeWrapper python3Packages.wrapPython ];
|
||||
buildInputs = [ python3 python3Packages.pyusb ];
|
||||
pythonPath = with python3Packages; [ pyusb ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bump";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mroth";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8=";
|
||||
sha256 = "sha256-DFgNx0H9/hZ+wUdPkEybRCIjnLsmuoYWruYgbDuFRhU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZeKokW6jMiKrXLfnxwEBF+wLuFQufnPUnA/EnuhvrwI=";
|
||||
vendorHash = "sha256-AiXbCS3RXd6KZwIo7qzz3yM28cJloLRR+gdWqEpyims=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, bash
|
||||
, cmake
|
||||
, colordiff
|
||||
|
|
@ -29,6 +30,14 @@ buildPythonApplication rec {
|
|||
patches = [
|
||||
# Refer to unifdef by absolute path.
|
||||
./unifdef.patch
|
||||
|
||||
# Refer to shell via /usr/bin/env:
|
||||
# https://github.com/marxin/cvise/pull/121
|
||||
(fetchpatch {
|
||||
name = "env-shell.patch";
|
||||
url = "https://github.com/marxin/cvise/commit/6a416eb590be978a2ad25c610974fdde84e88651.patch";
|
||||
hash = "sha256-Kn6+TXP+wJpMs6jrgsa9OwjXf6vmIgGzny8jg3dfKWA=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -37,10 +46,6 @@ buildPythonApplication rec {
|
|||
substituteInPlace CMakeLists.txt \
|
||||
--replace " -Werror " " "
|
||||
|
||||
# 'cvise --command=...' generates a script with hardcoded shebang.
|
||||
substituteInPlace cvise.py \
|
||||
--replace "#!/bin/bash" "#!${bash}/bin/bash"
|
||||
|
||||
substituteInPlace cvise/utils/testing.py \
|
||||
--replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \
|
||||
--replace "'colordiff'" "'${colordiff}/bin/colordiff'"
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.6.0";
|
||||
version = "0.7.2";
|
||||
pname = "sccache";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "sccache";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/H4QhkWsvq6UvrxuNhRPwlUi/spSYB78h8yUvdCJ2Ws=";
|
||||
sha256 = "sha256-hup9FM2KEBXRx6NleDGR01C0whJgR1KYyIrcIv2UE80=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-wFkVGKa00WQjk59KSBdOJ9Zfj8MwzC4XOhT9p4yvJM0=";
|
||||
cargoSha256 = "sha256-Od1uaKZVAZaIDrsNheR1kYIjnmpnThlU7k3EIKdOjzM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-mutants";
|
||||
version = "23.11.0";
|
||||
version = "23.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcefrog";
|
||||
repo = "cargo-mutants";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DYHEisVf+Qxiac/ZbPXrGRsFM6UUi584mY5mgzN7ZJE=";
|
||||
hash = "sha256-UZ4agGxJfkqERrl354RjQb6x+FDMbrrXCjZBp6Gzu/c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bJc33o+vm8oMrTkD/mg/xe7b9xQX/6JSDZlYgWeSa68=";
|
||||
cargoHash = "sha256-0zezsxZPCt0jtV/4RrSQ6rriWvuwzztHFEUONvW1ZOs=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
|
|
|||
41
pkgs/games/animatch/default.nix
Normal file
41
pkgs/games/animatch/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, allegro5
|
||||
, cmake
|
||||
, fetchFromGitLab
|
||||
, libGL
|
||||
, stdenv
|
||||
, xorg
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "animatch";
|
||||
version = "1.0.3";
|
||||
src = fetchFromGitLab {
|
||||
owner = "HolyPangolin";
|
||||
repo = "animatch";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zBV45WMAXtCpPPbDpr04K/a9UtZ4KLP9nUauBlbhrFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
allegro5
|
||||
libGL
|
||||
xorg.libX11
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLIBSUPERDERPY_STATIC=ON" # recommended by upstream for coexistence with other superderpy games
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/HolyPangolin/animatch/";
|
||||
description = "A cute match three game for the Librem 5 smartphone";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ colinsane ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation {
|
|||
] ++ optionals stdenv.isDarwin [
|
||||
"NATIVE=osx"
|
||||
"CLANG=1"
|
||||
"OSX_MIN=${stdenv.targetPlatform.darwinMinVersion}"
|
||||
"OSX_MIN=${stdenv.hostPlatform.darwinMinVersion}"
|
||||
];
|
||||
|
||||
postInstall = optionalString tiles
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
platformSlug =
|
||||
if stdenv.targetPlatform.is32bit then
|
||||
if stdenv.hostPlatform.is32bit then
|
||||
"linux32" else "linux64";
|
||||
inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini";
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga";
|
||||
license = with licenses; [ gpl2 free ]; # source + bundles libs + art
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.targetPlatform.isDarwin;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
maintainers = with maintainers; [ iblech ];
|
||||
homepage = "https://www.nongnu.org/enigma/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ nasm ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
alsa-lib libGLU libGL
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa AudioToolbox Carbon CoreMIDI AudioUnit
|
||||
] ++ [
|
||||
curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis libGLU libGL SDL2 zlib
|
||||
curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis SDL2 zlib
|
||||
];
|
||||
|
||||
dontDisableStatic = true;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
# service would stop the socket and break subsequent socket activations.
|
||||
# See https://github.com/apple/cups/issues/6005
|
||||
sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in
|
||||
'' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12") ''
|
||||
'' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12") ''
|
||||
substituteInPlace backend/usb-darwin.c \
|
||||
--replace "kIOMainPortDefault" "kIOMasterPortDefault"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@
|
|||
|
||||
let
|
||||
system =
|
||||
if stdenv.targetPlatform.system == "x86_64-linux" then "intel"
|
||||
else if stdenv.targetPlatform.system == "aarch64-linux" then "arm"
|
||||
else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.targetPlatform.system}";
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "intel"
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" then "arm"
|
||||
else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.hostPlatform.system}";
|
||||
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
|
||||
libs = pkgs: lib.makeLibraryPath buildInputs;
|
||||
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
-configuration Release \
|
||||
-project MoltenVKShaderConverter.xcodeproj \
|
||||
-scheme MoltenVKShaderConverter \
|
||||
-arch ${stdenv.targetPlatform.darwinArch}
|
||||
-arch ${stdenv.hostPlatform.darwinArch}
|
||||
declare -A products=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib )
|
||||
for product in "''${!products[@]}"; do
|
||||
cp MoltenVKShaderConverter-*/Build/Products/Release/$product "$build/''${products[$product]}/$product"
|
||||
|
|
@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
-configuration Release \
|
||||
-project MoltenVK.xcodeproj \
|
||||
-scheme MoltenVK-macOS \
|
||||
-arch ${stdenv.targetPlatform.darwinArch}
|
||||
-arch ${stdenv.hostPlatform.darwinArch}
|
||||
cp MoltenVK-*/Build/Products/Release/dynamic/libMoltenVK.dylib "$build/lib/libMoltenVK.dylib"
|
||||
popd
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
let
|
||||
|
||||
choosePlatform =
|
||||
let pname = stdenv.targetPlatform.parsed.cpu.name; in
|
||||
let pname = stdenv.hostPlatform.parsed.cpu.name; in
|
||||
pset: pset.${pname} or (throw "bionic-prebuilt: unsupported platform ${pname}");
|
||||
|
||||
prebuilt_crt = choosePlatform {
|
||||
|
|
@ -66,7 +66,7 @@ in
|
|||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bionic-prebuilt";
|
||||
version = "ndk-release-r23";
|
||||
name = "${stdenv.targetPlatform.parsed.cpu.name}-${pname}-${version}";
|
||||
name = "${stdenv.hostPlatform.parsed.cpu.name}-${pname}-${version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz";
|
||||
|
|
|
|||
|
|
@ -88,9 +88,9 @@ stdenv.mkDerivation rec {
|
|||
"PREFIX=$(out)"
|
||||
"ASCIIDOC=${buildPackages.asciidoc}/bin/asciidoc"
|
||||
"XMLTO=${buildPackages.xmlto}/bin/xmlto"
|
||||
] ++ (lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [
|
||||
"ARCH=${linuxArchMapping."${stdenv.targetPlatform.linuxArch}"}"
|
||||
"CROSS_COMPILE=${stdenv.targetPlatform.config}-"
|
||||
] ++ (lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"ARCH=${linuxArchMapping."${stdenv.hostPlatform.linuxArch}"}"
|
||||
"CROSS_COMPILE=${stdenv.hostPlatform.config}-"
|
||||
]);
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ ncurses ];
|
||||
dontUnpack = true;
|
||||
buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${
|
||||
with stdenv.targetPlatform;
|
||||
with stdenv.hostPlatform;
|
||||
if isx86 then "X86"
|
||||
else if isAarch then "ARM"
|
||||
else if isPower then "POWER"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = if !stdenv.isDarwin
|
||||
then [ "--with-libc=libc.so.6" ]
|
||||
else [ "--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}" ];
|
||||
else [ "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}" ];
|
||||
|
||||
dontAddDisableDepTrack = stdenv.isDarwin;
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ unwrapped = stdenv.mkDerivation rec {
|
|||
postInstall = ''
|
||||
rm "$out"/lib/libkres.a
|
||||
rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS
|
||||
'' + optionalString stdenv.targetPlatform.isLinux ''
|
||||
'' + optionalString stdenv.hostPlatform.isLinux ''
|
||||
rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bftpd";
|
||||
version = "6.1";
|
||||
version = "6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-lyHQYU4aXQ/muAyaigStqO/ULL393SOelagFmuKDqm8=";
|
||||
sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI=";
|
||||
};
|
||||
|
||||
# utmp.h is deprecated on aarch64-darwin
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ mkYarnPackage rec {
|
|||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cd deps/${pname}
|
||||
napi build --target ${stdenv.targetPlatform.rust.rustcTargetSpec} --dts ../src/libRs.d.ts --release ./lib
|
||||
napi build --target ${stdenv.hostPlatform.rust.rustcTargetSpec} --dts ../src/libRs.d.ts --release ./lib
|
||||
yarn run build:app:fix-defs
|
||||
yarn run build:app
|
||||
yarn run build:web
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenvNoCC, fetchurl, unzip, lib }:
|
||||
|
||||
{ pname, version, zipHash, meta ? {}, passthru ? {}, ... }@args:
|
||||
let plat = stdenvNoCC.targetPlatform.system; in stdenvNoCC.mkDerivation ({
|
||||
let plat = stdenvNoCC.hostPlatform.system; in stdenvNoCC.mkDerivation ({
|
||||
inherit pname version;
|
||||
|
||||
src = if lib.isAttrs zipHash then
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ let
|
|||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") ''
|
||||
postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") ''
|
||||
substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
|
||||
--replace kAudioObjectPropertyElement{Main,Master} \
|
||||
--replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, alsa-lib
|
||||
}:
|
||||
let
|
||||
inherit (stdenv.targetPlatform) system;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
, lzo
|
||||
, which
|
||||
, targetArchitecture ? null
|
||||
, asmOptimizations ? gcc10Stdenv.targetPlatform.isx86
|
||||
, asmOptimizations ? gcc10Stdenv.hostPlatform.isx86
|
||||
}:
|
||||
|
||||
let
|
||||
defaultTargetArchitecture =
|
||||
if gcc10Stdenv.targetPlatform.isx86
|
||||
if gcc10Stdenv.hostPlatform.isx86
|
||||
then "haswell"
|
||||
else "core";
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ gcc10Stdenv.mkDerivation rec {
|
|||
"-DTARGET_ARCHITECTURE=${targetArch}"
|
||||
] ++ lib.optionals asmOptimizations [
|
||||
"-DASM_OPTIMIZATIONS=ON"
|
||||
"-DHAVE_SSE42=${if gcc10Stdenv.targetPlatform.sse4_2Support then "ON" else "OFF"}"
|
||||
"-DHAVE_SSE42=${if gcc10Stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,21 @@
|
|||
{ pkgspath ? ../../.., test-pkgspath ? pkgspath
|
||||
, localSystem ? { system = builtins.currentSystem; }
|
||||
# Specify the desired LLVM version in an overlay to avoid the use of
|
||||
# mismatching versions.
|
||||
#
|
||||
# The llvmPackages that we take things (clang, libc++ and such) from
|
||||
# is specified explicitly to be llvmPackages_11 to keep the
|
||||
# bootstrap-tools stable. However, tools like otool,
|
||||
# install_name_tool and strip are taken straight from stdenv.cc,
|
||||
# which, after the bump, is a different LLVM version altogether.
|
||||
#
|
||||
# The original intent was that bootstrap-tools specified LLVM 11
|
||||
# exhaustively but it didn't. That should be rectified with this
|
||||
# PR. As to why stick with 11? That's just to keep the
|
||||
# bootstrap-tools unchanged.
|
||||
#
|
||||
# https://github.com/NixOS/nixpkgs/pull/267058/files#r1390889848
|
||||
, overlays ? [(self: super: { llvmPackages = super.llvmPackages_11; })]
|
||||
, crossSystem ? null
|
||||
, bootstrapFiles ? null
|
||||
}:
|
||||
|
|
@ -13,11 +29,9 @@ let cross = if crossSystem != null
|
|||
in (import "${pkgspath}/pkgs/stdenv/darwin" args');
|
||||
}
|
||||
else {};
|
||||
in with import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap);
|
||||
in with import pkgspath ({ inherit localSystem overlays; } // cross // custom-bootstrap);
|
||||
|
||||
let
|
||||
llvmPackages = llvmPackages_11;
|
||||
in rec {
|
||||
rec {
|
||||
coreutils_ = coreutils.override (args: {
|
||||
# We want coreutils without ACL support.
|
||||
aclSupport = false;
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "awscli";
|
||||
version = "1.29.57"; # N.B: if you change this, change botocore and boto3 to a matching version too
|
||||
version = "1.30.2"; # N.B: if you change this, change botocore and boto3 to a matching version too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+xME5GiDitxn61yrIkiEByx/xeMeXMrVS2rifIX6Ci8=";
|
||||
hash = "sha256-XbYsPbYUIJPCS+nhcE3A5K7yxHcGUkulT5vHPT5T9kM=";
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, config
|
||||
, enableCfp ? true
|
||||
, enableCuda ? config.cudaSupport
|
||||
, enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms
|
||||
, enableFortran ? builtins.elem stdenv.hostPlatform.system gfortran.meta.platforms
|
||||
, enableOpenMP ? true
|
||||
, enablePython ? true
|
||||
, enableUtilities ? true }:
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btrfs-progs";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
|
||||
hash = "sha256-PpLLbYO93mEjGP2ARt1u/0fHhuWdVt1Ozph5RdUTfJ4=";
|
||||
hash = "sha256-tCZzbclOKwS2mD6ZjE3EJ9wWbWbd6iRsiQ7ZwqRQBE8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, dotnetCorePackages ? pkgs.dotnetCorePackages
|
||||
, openssl ? pkgs.openssl
|
||||
, zlib ? pkgs.zlib
|
||||
, targetPlatform ? pkgs.targetPlatform
|
||||
, hostPlatform ? stdenv.hostPlatform
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
|
|
@ -30,7 +30,7 @@ buildDotnetModule rec {
|
|||
patches = [ ./add-runtime-identifier.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace pocket_updater.csproj \
|
||||
--replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid targetPlatform.system}"
|
||||
--replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}"
|
||||
'';
|
||||
|
||||
projectFile = "pocket_updater.csproj";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue