Conflicts: pkgs/applications/networking/browsers/firefox/common.nix betweenmainf6c5761935
anda373324120
.
commit
d1b77f990f
@ -1,101 +0,0 @@ |
|||||||
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip |
|
||||||
, gnumake, gcc-arm-embedded, binutils-arm-embedded |
|
||||||
, dfu-util-axoloti, jdk, ant, libfaketime }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
version = "1.0.12-2"; |
|
||||||
pname = "axoloti"; |
|
||||||
|
|
||||||
src = fetchFromGitHub { |
|
||||||
owner = "axoloti"; |
|
||||||
repo = "axoloti"; |
|
||||||
rev = version; |
|
||||||
sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9"; |
|
||||||
}; |
|
||||||
|
|
||||||
chibi_version = "2.6.9"; |
|
||||||
chibi_name = "ChibiOS_${chibi_version}"; |
|
||||||
|
|
||||||
chibios = fetchurl { |
|
||||||
url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip"; |
|
||||||
sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj"; |
|
||||||
}; |
|
||||||
|
|
||||||
nativeBuildInputs = [ |
|
||||||
makeWrapper |
|
||||||
unzip |
|
||||||
gcc-arm-embedded |
|
||||||
binutils-arm-embedded |
|
||||||
dfu-util-axoloti |
|
||||||
ant |
|
||||||
]; |
|
||||||
buildInputs = [jdk libfaketime ]; |
|
||||||
|
|
||||||
patchPhase = '' |
|
||||||
unzip ${chibios} |
|
||||||
mv ${chibi_name} chibios |
|
||||||
(cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip) |
|
||||||
|
|
||||||
# Remove source of non-determinism in ChibiOS |
|
||||||
substituteInPlace "chibios/os/various/shell.c" \ |
|
||||||
--replace "#ifdef __DATE__" "#if 0" |
|
||||||
|
|
||||||
# Hardcode path to "make" |
|
||||||
for f in "firmware/compile_firmware_linux.sh" \ |
|
||||||
"firmware/compile_patch_linux.sh"; do |
|
||||||
substituteInPlace "$f" \ |
|
||||||
--replace "make" "${gnumake}/bin/make" |
|
||||||
done |
|
||||||
|
|
||||||
# Hardcode dfu-util path |
|
||||||
substituteInPlace "platform_linux/upload_fw_dfu.sh" \ |
|
||||||
--replace "/bin/dfu-util" "" |
|
||||||
substituteInPlace "platform_linux/upload_fw_dfu.sh" \ |
|
||||||
--replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util" |
|
||||||
|
|
||||||
# Fix build version |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace "(git missing)" "${version}" |
|
||||||
|
|
||||||
# Remove build time |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace "<tstamp>" "" |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace \ |
|
||||||
'<format property="build.time" pattern="dd/MM/yyyy HH:mm:ss z"/>' \ |
|
||||||
'<property name="build.time" value=""/>' |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace "</tstamp>" "" |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace \ |
|
||||||
'{line.separator}</echo>' \ |
|
||||||
'{line.separator}</echo> <touch file="src/main/java/axoloti/Version.java" millis="0" />' |
|
||||||
''; |
|
||||||
|
|
||||||
buildPhase = '' |
|
||||||
find . -exec touch -d '1970-01-01 00:00' {} \; |
|
||||||
(cd platform_linux; sh compile_firmware.sh) |
|
||||||
faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true |
|
||||||
''; |
|
||||||
|
|
||||||
installPhase = '' |
|
||||||
mkdir -p $out/bin $out/share/axoloti |
|
||||||
|
|
||||||
cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/ |
|
||||||
install -vD dist/Axoloti.jar $out/share/axoloti/ |
|
||||||
|
|
||||||
makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar" |
|
||||||
''; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
homepage = "http://www.axoloti.com"; |
|
||||||
description = '' |
|
||||||
Sketching embedded digital audio algorithms. |
|
||||||
|
|
||||||
To fix permissions of the Axoloti USB device node, add a similar udev rule to <literal>services.udev.extraRules</literal>: |
|
||||||
<literal>SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup"</literal> |
|
||||||
''; |
|
||||||
license = licenses.gpl3; |
|
||||||
maintainers = with maintainers; [ ]; |
|
||||||
}; |
|
||||||
} |
|
@ -1,31 +0,0 @@ |
|||||||
{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
pname = "dfu-util"; |
|
||||||
version = "0.8"; |
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ]; |
|
||||||
buildInputs = [ libusb1-axoloti ]; |
|
||||||
|
|
||||||
src = fetchurl { |
|
||||||
url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; |
|
||||||
sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; |
|
||||||
}; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
description = "Device firmware update (DFU) USB programmer"; |
|
||||||
longDescription = '' |
|
||||||
dfu-util is a program that implements the host (PC) side of the USB |
|
||||||
DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol. |
|
||||||
|
|
||||||
DFU is intended to download and upload firmware to devices connected over |
|
||||||
USB. It ranges from small devices like micro-controller boards up to mobile |
|
||||||
phones. With dfu-util you are able to download firmware to your device or |
|
||||||
upload firmware from it. |
|
||||||
''; |
|
||||||
homepage = "http://dfu-util.sourceforge.net"; |
|
||||||
license = licenses.gpl2Plus; |
|
||||||
platforms = platforms.unix; |
|
||||||
maintainers = [ ]; |
|
||||||
}; |
|
||||||
} |
|
@ -1,39 +0,0 @@ |
|||||||
{ stdenv, lib, fetchurl, pkg-config, systemd, libobjc, IOKit, fetchpatch }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
pname = "libusb"; |
|
||||||
version = "1.0.19"; |
|
||||||
|
|
||||||
src = fetchurl { |
|
||||||
url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2"; |
|
||||||
sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; |
|
||||||
}; |
|
||||||
|
|
||||||
outputs = [ "out" "dev" ]; # get rid of propagating systemd closure |
|
||||||
|
|
||||||
buildInputs = [ pkg-config ]; |
|
||||||
propagatedBuildInputs = lib.optional stdenv.isLinux systemd |
|
||||||
++ lib.optionals stdenv.isDarwin [ libobjc IOKit ]; |
|
||||||
|
|
||||||
patches = [ |
|
||||||
(fetchpatch { |
|
||||||
name = "libusb.stdfu.patch"; |
|
||||||
url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch"; |
|
||||||
sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d"; |
|
||||||
}) |
|
||||||
]; |
|
||||||
|
|
||||||
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; |
|
||||||
|
|
||||||
preFixup = lib.optionalString stdenv.isLinux '' |
|
||||||
sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la |
|
||||||
''; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
homepage = "http://www.libusb.info"; |
|
||||||
description = "User-space USB library"; |
|
||||||
maintainers = with maintainers; [ ]; |
|
||||||
platforms = platforms.unix; |
|
||||||
license = licenses.lgpl21; |
|
||||||
}; |
|
||||||
} |
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,21 @@ |
|||||||
|
# Setup hook for checking whether Python imports succeed |
||||||
|
echo "Sourcing neovim-require-check-hook.sh" |
||||||
|
|
||||||
|
neovimRequireCheckHook () { |
||||||
|
echo "Executing neovimRequireCheckHook" |
||||||
|
|
||||||
|
if [ -n "$nvimRequireCheck" ]; then |
||||||
|
echo "Check whether the following module can be imported: $nvimRequireCheck" |
||||||
|
|
||||||
|
# editorconfig-checker-disable |
||||||
|
export HOME="$TMPDIR" |
||||||
|
@nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \ |
||||||
|
--cmd "set rtp+=$out" \ |
||||||
|
--cmd "lua require('$nvimRequireCheck')" |
||||||
|
fi |
||||||
|
} |
||||||
|
|
||||||
|
echo "Using neovimRequireCheckHook" |
||||||
|
preDistPhases+=" neovimRequireCheckHook" |
||||||
|
|
||||||
|
|
@ -0,0 +1,43 @@ |
|||||||
|
From e9ffd084ec1ff9f7bfc86879732953dc58256958 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Loko Kung <lokokung@google.com>
|
||||||
|
Date: Tue, 3 May 2022 00:28:53 +0000
|
||||||
|
Subject: [PATCH] Wrap get_gitHash in try-catch to prevent failures in tarball
|
||||||
|
builds.
|
||||||
|
|
||||||
|
Bug: chromium:1321370
|
||||||
|
Change-Id: If39d2236d1b4d965f7bd189f6bd1cdc70436c41d
|
||||||
|
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88582
|
||||||
|
Commit-Queue: Loko Kung <lokokung@google.com>
|
||||||
|
Reviewed-by: Austin Eng <enga@chromium.org>
|
||||||
|
Kokoro: Kokoro <noreply+kokoro@google.com>
|
||||||
|
(cherry picked from commit 03ddfbb81fb4127ca37ea53e70fcb34fe851e24e)
|
||||||
|
---
|
||||||
|
third_party/dawn/generator/dawn_version_generator.py | 13 ++++++++-----
|
||||||
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py
|
||||||
|
index 1907e88da..3c1927bee 100644
|
||||||
|
--- a/third_party/dawn/generator/dawn_version_generator.py
|
||||||
|
+++ b/third_party/dawn/generator/dawn_version_generator.py
|
||||||
|
@@ -23,11 +23,14 @@ def get_git():
|
||||||
|
|
||||||
|
|
||||||
|
def get_gitHash(dawnDir):
|
||||||
|
- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'],
|
||||||
|
- stdout=subprocess.PIPE,
|
||||||
|
- cwd=dawnDir)
|
||||||
|
- if result.returncode == 0:
|
||||||
|
- return result.stdout.decode('utf-8').strip()
|
||||||
|
+ try:
|
||||||
|
+ result = subprocess.run([get_git(), "rev-parse", "HEAD"],
|
||||||
|
+ stdout=subprocess.PIPE,
|
||||||
|
+ cwd=dawnDir)
|
||||||
|
+ if result.returncode == 0:
|
||||||
|
+ return result.stdout.decode("utf-8").strip()
|
||||||
|
+ except Exception:
|
||||||
|
+ return ""
|
||||||
|
# No hash was available (possibly) because the directory was not a git checkout. Dawn should
|
||||||
|
# explicitly handle its absenece and disable features relying on the hash, i.e. caching.
|
||||||
|
return ''
|
||||||
|
--
|
||||||
|
2.36.0
|
@ -1,9 +1,9 @@ |
|||||||
{ |
{ |
||||||
"version": "1.10.4-sc.1", |
"version": "1.10.12-sc.1", |
||||||
"rev": "v1.10.4-sc.1", |
"rev": "v1.10.12-sc.1", |
||||||
"srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl", |
"srcHash": "1rpfax6xx731w59a2i7v6jr17l3rnrn79d666f0cjchg36nkqqg9", |
||||||
"webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw", |
"webYarnHash": "0m5dnz3m68iz94siwmavzj50wxd6w6wanjsm1zhq76lgymgcbqc2", |
||||||
"jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di", |
"jsSdkYarnHash": "1k1jvavbqr7vcbdaxc6yqiq5254kxhywn1s2zndrfny7ap8z5c1c", |
||||||
"reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f", |
"reactSdkYarnHash": "0cz7pgrbysljmhpf4m0wqwqjqijxahl3wz5qhczlkj46dvq6qyxb", |
||||||
"desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn" |
"desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn" |
||||||
} |
} |
||||||
|
@ -0,0 +1,51 @@ |
|||||||
|
{ lib |
||||||
|
, stdenv |
||||||
|
, fetchFromGitHub |
||||||
|
, cmake |
||||||
|
, primesieve |
||||||
|
}: |
||||||
|
|
||||||
|
stdenv.mkDerivation rec { |
||||||
|
pname = "primecount"; |
||||||
|
version = "7.3"; |
||||||
|
|
||||||
|
src = fetchFromGitHub { |
||||||
|
owner = "kimwalisch"; |
||||||
|
repo = "primecount"; |
||||||
|
rev = "v${version}"; |
||||||
|
hash = "sha256-hxnn1uiGSB6XRC7yK+SXTwTsJfjhemWXsMNhhL7Ghek="; |
||||||
|
}; |
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake ]; |
||||||
|
|
||||||
|
buildInputs = [ primesieve ]; |
||||||
|
|
||||||
|
cmakeFlags = [ |
||||||
|
"-DBUILD_LIBPRIMESIEVE=ON" |
||||||
|
"-DBUILD_PRIMECOUNT=ON" |
||||||
|
"-DBUILD_SHARED_LIBS=ON" |
||||||
|
"-DBUILD_STATIC_LIBS=OFF" |
||||||
|
"-DBUILD_TESTS=ON" |
||||||
|
]; |
||||||
|
|
||||||
|
meta = with lib; { |
||||||
|
homepage = "https://github.com/kimwalisch/primecount"; |
||||||
|
description = "Fast prime counting function implementations"; |
||||||
|
longDescription = '' |
||||||
|
primecount is a command-line program and C/C++ library that counts the |
||||||
|
primes below an integer x ≤ 10^31 using highly optimized implementations |
||||||
|
of the combinatorial prime counting algorithms. |
||||||
|
|
||||||
|
primecount includes implementations of all important combinatorial prime |
||||||
|
counting algorithms known up to this date all of which have been |
||||||
|
parallelized using OpenMP. primecount contains the first ever open source |
||||||
|
implementations of the Deleglise-Rivat algorithm and Xavier Gourdon's |
||||||
|
algorithm (that works). primecount also features a novel load balancer |
||||||
|
that is shared amongst all implementations and that scales up to hundreds |
||||||
|
of CPU cores. primecount has already been used to compute several prime |
||||||
|
counting function world records. |
||||||
|
''; |
||||||
|
license = licenses.bsd2; |
||||||
|
inherit (primesieve.meta) maintainers platforms; |
||||||
|
}; |
||||||
|
} |
@ -0,0 +1,36 @@ |
|||||||
|
{ lib |
||||||
|
, stdenv |
||||||
|
, fetchFromGitHub |
||||||
|
, cmake |
||||||
|
}: |
||||||
|
|
||||||
|
stdenv.mkDerivation rec { |
||||||
|
pname = "primesieve"; |
||||||
|
version = "7.9"; |
||||||
|
|
||||||
|
src = fetchFromGitHub { |
||||||
|
owner = "kimwalisch"; |
||||||
|
repo = "primesieve"; |
||||||
|
rev = "v${version}"; |
||||||
|
hash = "sha256-lwT+adKFoNI125y5FuJMovtMh8sFi9oqMLYGLabzrCI="; |
||||||
|
}; |
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake ]; |
||||||
|
|
||||||
|
meta = with lib; { |
||||||
|
homepage = "https://primesieve.org/"; |
||||||
|
description = "Fast C/C++ prime number generator"; |
||||||
|
longDescription = '' |
||||||
|
primesieve is a command-line program and C/C++ library for quickly |
||||||
|
generating prime numbers. It is very cache efficient, it detects your |
||||||
|
CPU's L1 & L2 cache sizes and allocates its main data structures |
||||||
|
accordingly. It is also multi-threaded by default, it uses all available |
||||||
|
CPU cores whenever possible i.e. if sequential ordering is not |
||||||
|
required. primesieve can generate primes and prime k-tuplets up to 264. |
||||||
|
''; |
||||||
|
license = licenses.bsd2; |
||||||
|
maintainers = teams.sage.members ++ |
||||||
|
(with maintainers; [ abbradar AndersonTorres ]); |
||||||
|
platforms = platforms.unix; |
||||||
|
}; |
||||||
|
} |
@ -0,0 +1,16 @@ |
|||||||
|
{ runCommand }: |
||||||
|
|
||||||
|
firmware: |
||||||
|
|
||||||
|
runCommand "${firmware.name}-xz" {} '' |
||||||
|
mkdir -p $out/lib |
||||||
|
(cd ${firmware} && find lib/firmware -type d -print0) | |
||||||
|
(cd $out && xargs -0 mkdir -v --) |
||||||
|
(cd ${firmware} && find lib/firmware -type f -print0) | |
||||||
|
(cd $out && xargs -0tP "$NIX_BUILD_CORES" -n1 \ |
||||||
|
sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --) |
||||||
|
(cd ${firmware} && find lib/firmware -type l) | while read link; do |
||||||
|
target="$(readlink "${firmware}/$link")" |
||||||
|
ln -vs -- "''${target/^${firmware}/$out}.xz" "$out/$link.xz" |
||||||
|
done |
||||||
|
'' |
@ -1,6 +1,6 @@ |
|||||||
{ |
{ |
||||||
"commit": "78324aa49909392e169c86bbfd204694523907e8", |
"commit": "38aa99a1623af5371157721c2a4b033b828e9938", |
||||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78324aa49909392e169c86bbfd204694523907e8.tar.gz", |
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/38aa99a1623af5371157721c2a4b033b828e9938.tar.gz", |
||||||
"sha256": "15k5ag36asswwv8yazq53lkj9blnz4hzlq23cznvvk5pkjpdm0ni", |
"sha256": "0phak7cjg3nrj5i3ih2k95hcwx25s6zijbp81ycqd0yb108gvw34", |
||||||
"msg": "Update from Hackage at 2022-05-05T15:07:55Z" |
"msg": "Update from Hackage at 2022-05-10T13:45:20Z" |
||||||
} |
} |
||||||
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,27 @@ |
|||||||
|
# HG changeset patch
|
||||||
|
# User John Donoghue <john.donoghue@ieee.org>
|
||||||
|
# Date 1652358904 14400
|
||||||
|
# Thu May 12 08:35:04 2022 -0400
|
||||||
|
# Branch stable
|
||||||
|
# Node ID 8c940cfcce257369677c09154da2aab2c56eaa79
|
||||||
|
# Parent 63710f3bd9811c2d206ac9e7b4f47cf06c47e153
|
||||||
|
* scripts/pkg/private/build.m: check configure and Makefile exist before trying to unlink them (Bug #62436)
|
||||||
|
|
||||||
|
diff -r 63710f3bd981 -r 8c940cfcce25 scripts/pkg/private/build.m
|
||||||
|
--- a/scripts/pkg/private/build.m Wed May 11 09:44:55 2022 -0700
|
||||||
|
+++ b/scripts/pkg/private/build.m Thu May 12 08:35:04 2022 -0400
|
||||||
|
@@ -77,8 +77,12 @@
|
||||||
|
else
|
||||||
|
arch_abi = getarch ();
|
||||||
|
configure_make (desc, build_root, verbose);
|
||||||
|
- unlink (fullfile (build_root, "src", "configure"));
|
||||||
|
- unlink (fullfile (build_root, "src", "Makefile"));
|
||||||
|
+ if exist (fullfile (build_root, "src", "configure"), "file")
|
||||||
|
+ unlink (fullfile (build_root, "src", "configure"));
|
||||||
|
+ endif
|
||||||
|
+ if exist (fullfile (build_root, "src", "Makefile"), "file")
|
||||||
|
+ unlink (fullfile (build_root, "src", "Makefile"));
|
||||||
|
+ endif
|
||||||
|
endif
|
||||||
|
tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"];
|
||||||
|
tar_path = fullfile (builddir, tar_name);
|
@ -1,41 +0,0 @@ |
|||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
pname = "ctl"; |
|
||||||
version = "1.5.2"; |
|
||||||
|
|
||||||
src = fetchFromGitHub { |
|
||||||
owner = "ampas"; |
|
||||||
repo = pname; |
|
||||||
rev = "${pname}-${version}"; |
|
||||||
sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx"; |
|
||||||
}; |
|
||||||
|
|
||||||
patches = [ |
|
||||||
(fetchpatch { |
|
||||||
name = "ctl-1.5.2-ilm_230.patch"; |
|
||||||
url = "https://src.fedoraproject.org/rpms/CTL/raw/9d7c15a91bccdc0a9485d463bf2789be72e6b17d/f/ctl-1.5.2-ilm_230.patch"; |
|
||||||
sha256 = "0mdx7llwrm0q8ai53zhyxi40i9h5s339dbkqpqv30yzi2xpnfj3d"; |
|
||||||
}) |
|
||||||
]; |
|
||||||
|
|
||||||
postPatch = '' |
|
||||||
# Fix include guard name |
|
||||||
substituteInPlace lib/dpx/dpx_raw.hh \ |
|
||||||
--replace CRL_DPX_RAW_INTERNAL_INCLUDE CTL_DPX_RAW_INTERNAL_INCLUDE |
|
||||||
|
|
||||||
# Fix undefined symbols (link with Imath) |
|
||||||
substituteInPlace lib/IlmCtlMath/CMakeLists.txt \ |
|
||||||
--replace "( IlmCtlMath IlmCtl )" "( IlmCtlMath IlmCtl Imath)" |
|
||||||
''; |
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ]; |
|
||||||
buildInputs = [ libtiff ilmbase openexr ]; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
description = "Color Transformation Language"; |
|
||||||
homepage = "https://github.com/ampas/CTL"; |
|
||||||
license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible |
|
||||||
platforms = platforms.all; |
|
||||||
}; |
|
||||||
} |
|
@ -1,33 +0,0 @@ |
|||||||
{ lib, stdenv, fetchFromGitHub, cmake, primesieve }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
pname = "primecount"; |
|
||||||
version = "7.2"; |
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ]; |
|
||||||
|
|
||||||
buildInputs = [ primesieve ]; |
|
||||||
|
|
||||||
src = fetchFromGitHub { |
|
||||||
owner = "kimwalisch"; |
|
||||||
repo = "primecount"; |
|
||||||
rev = "v${version}"; |
|
||||||
sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo="; |
|
||||||
}; |
|
||||||
|
|
||||||
cmakeFlags = [ |
|
||||||
"-DBUILD_STATIC_LIBS=OFF" |
|
||||||
"-DBUILD_SHARED_LIBS=ON" |
|
||||||
"-DBUILD_TESTS=ON" |
|
||||||
"-DBUILD_PRIMECOUNT=ON" |
|
||||||
"-DBUILD_LIBPRIMESIEVE=ON" |
|
||||||
]; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
description = "Fast prime counting function implementations"; |
|
||||||
homepage = "https://github.com/kimwalisch/primecount"; |
|
||||||
license = licenses.bsd2; |
|
||||||
platforms = platforms.unix; |
|
||||||
maintainers = teams.sage.members; |
|
||||||
}; |
|
||||||
} |
|
@ -1,23 +0,0 @@ |
|||||||
{ lib, stdenv, fetchFromGitHub, cmake }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
pname = "primesieve"; |
|
||||||
version = "7.8"; |
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ]; |
|
||||||
|
|
||||||
src = fetchFromGitHub { |
|
||||||
owner = "kimwalisch"; |
|
||||||
repo = "primesieve"; |
|
||||||
rev = "v${version}"; |
|
||||||
sha256 = "sha256-M35CP/xEyC7mEh84kaGsgfsDI9fnanHraNPgTvpqimI="; |
|
||||||
}; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
description = "Fast C/C++ prime number generator"; |
|
||||||
homepage = "https://primesieve.org/"; |
|
||||||
license = licenses.bsd2; |
|
||||||
platforms = platforms.unix; |
|
||||||
maintainers = with maintainers; [ abbradar ]; |
|
||||||
}; |
|
||||||
} |
|
@ -0,0 +1,56 @@ |
|||||||
|
{ lib, pkgs, runCommand, prisma }: |
||||||
|
|
||||||
|
let |
||||||
|
inherit (prisma) packageName; |
||||||
|
prismaMajorVersion = lib.versions.majorMinor prisma.version; |
||||||
|
enginesMajorVersion = lib.versions.majorMinor pkgs.prisma-engines.version; |
||||||
|
in |
||||||
|
|
||||||
|
runCommand "${packageName}-tests" { |
||||||
|
nativeBuildInputs = with pkgs; [ prisma sqlite-interactive ]; |
||||||
|
meta.timeout = 60; |
||||||
|
} |
||||||
|
'' |
||||||
|
mkdir $out |
||||||
|
cd $out |
||||||
|
|
||||||
|
if [ "${prismaMajorVersion}" != "${enginesMajorVersion}" ]; then |
||||||
|
echo "nodePackages.prisma in version ${prismaMajorVersion} and prisma-engines in ${enginesMajorVersion}. Major versions must match." |
||||||
|
exit 1 |
||||||
|
fi |
||||||
|
|
||||||
|
# Ensure CLI runs |
||||||
|
prisma --help > /dev/null |
||||||
|
|
||||||
|
# Init a new project |
||||||
|
prisma init > /dev/null |
||||||
|
|
||||||
|
# Create a simple data model |
||||||
|
cat << EOF > prisma/schema.prisma |
||||||
|
datasource db { |
||||||
|
provider = "sqlite" |
||||||
|
url = "file:test.db" |
||||||
|
} |
||||||
|
|
||||||
|
generator js { |
||||||
|
provider = "prisma-client-js" |
||||||
|
} |
||||||
|
|
||||||
|
model A { |
||||||
|
id Int @id @default(autoincrement()) |
||||||
|
b String @default("foo") |
||||||
|
} |
||||||
|
EOF |
||||||
|
|
||||||
|
# Format |
||||||
|
prisma format > /dev/null |
||||||
|
|
||||||
|
# Create the database |
||||||
|
prisma db push --skip-generate > /dev/null |
||||||
|
|
||||||
|
# The database file should exist and be a SQLite database |
||||||
|
sqlite3 prisma/test.db "SELECT id, b FROM A" > /dev/null |
||||||
|
|
||||||
|
# Introspect the database |
||||||
|
prisma db pull > /dev/null |
||||||
|
'' |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue