Merge staging-next into staging
This commit is contained in:
commit
346423fdcd
|
@ -28,13 +28,13 @@
|
|||
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
|
||||
},
|
||||
"aiven": {
|
||||
"hash": "sha256-unOLrWai4oMd+1Jc+s6OHLEZLew7HM+zVyZkIprBN7k=",
|
||||
"hash": "sha256-MKxLfR2yV4/LYqQ/yZt44JAHIEinO8078ikWPBD/HXo=",
|
||||
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
|
||||
"owner": "aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v4.1.1",
|
||||
"rev": "v4.1.2",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-VAYCx0DHG+J8zzYFP2UyZ+W6cOgi8G+PQktEBOWbjSk="
|
||||
"vendorHash": "sha256-wz1Wy/4GI8/Wlu828RX7OE+XJHzCS/X45tW3Jb7Tx3E="
|
||||
},
|
||||
"akamai": {
|
||||
"hash": "sha256-j9KQWgcBjZiQrWjRdhQp82GawF/U6Y469MKN5V2R6xU=",
|
||||
|
@ -173,13 +173,13 @@
|
|||
"vendorHash": "sha256-rtPbHItqsgHoHs85QO6Uix2yvJkHE6B2XYMOdcJvoGc="
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-YmgzzDLNJg7zm8smboI0gE2kOgjb2RwPf5v1CbzgvGA=",
|
||||
"hash": "sha256-e4WvQKtf6zVEZ74c+lE3ZkbX24rPazp8MrJCNQDTz2c=",
|
||||
"homepage": "https://registry.terraform.io/providers/brightbox/brightbox",
|
||||
"owner": "brightbox",
|
||||
"repo": "terraform-provider-brightbox",
|
||||
"rev": "v3.2.1",
|
||||
"rev": "v3.3.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU="
|
||||
"vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI="
|
||||
},
|
||||
"buildkite": {
|
||||
"hash": "sha256-H9kVHGnIzOHViTAuJnLJqcxDjSRXVqyKBAFfOd8fkHo=",
|
||||
|
@ -219,13 +219,13 @@
|
|||
"vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M="
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-LBMFszTXxiK1ZvqP6VjSCWk06/IVbJV9yEGkn6olM6k=",
|
||||
"hash": "sha256-jf2NAhiavSWsKTRIJF8Ypm7tobzvTlESKEkDRre4ZVo=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
|
||||
"owner": "cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v4.1.0",
|
||||
"rev": "v4.2.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ofuLOrJSztgwtohDoZdgd9DMJSK77z93L2NlqO5bmCM="
|
||||
"vendorHash": "sha256-9YmvaKPZVu+Fi0zlmJbKcU2iw2WUdzZJzgWPfkI1C24="
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=",
|
||||
|
@ -283,13 +283,13 @@
|
|||
"vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM="
|
||||
},
|
||||
"datadog": {
|
||||
"hash": "sha256-7z7NjQ6JBZOCEn8ZiyrgiAlzbzWpzNEhveydBmh841E=",
|
||||
"hash": "sha256-rbBLyCxGB1W7VCPs1f/7PQnyvdWo+uhze6p4cucdEG0=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.22.0",
|
||||
"rev": "v3.23.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-2cv7ffNuis91C2iUaYqq5uKx7wwpi2ohwU1q7wjurbA="
|
||||
"vendorHash": "sha256-hy4GQKhY+6bYdVAZensLU0EswZXfxZWY2YNyiTA2UaE="
|
||||
},
|
||||
"dhall": {
|
||||
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
|
||||
|
@ -438,22 +438,22 @@
|
|||
"vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-tdsMjgGR9Tmk5wonihYlFqy8wzx60jEfnIh4dujvabY=",
|
||||
"hash": "sha256-RLWfaJX7ytU8xKcXUp+ON2//rO6R0cw0beXdiH9E3SU=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.57.0",
|
||||
"rev": "v4.58.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-e0Qnlu1O6h9s9+vo9yELifl5AmNNqhQc3Y6XorNCRQ8=",
|
||||
"hash": "sha256-O0BQSeS+XDCq82q0aGwM0GlSfByMugoOQLWXenlO8fk=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.57.0",
|
||||
"rev": "v4.58.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk="
|
||||
},
|
||||
|
@ -847,11 +847,11 @@
|
|||
"vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk="
|
||||
},
|
||||
"openstack": {
|
||||
"hash": "sha256-XjOij2mgBoQIgIMkk6U54O+0+ye80qUNJCuwjZx6Nu8=",
|
||||
"hash": "sha256-UGs2Os7cWSd69ekzyoDLwzJxhGgUJbDJyrCIc6ipcwY=",
|
||||
"homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack",
|
||||
"owner": "terraform-provider-openstack",
|
||||
"repo": "terraform-provider-openstack",
|
||||
"rev": "v1.51.0",
|
||||
"rev": "v1.51.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI="
|
||||
},
|
||||
|
@ -964,13 +964,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"scaleway": {
|
||||
"hash": "sha256-aWn/w7k+gxCodN7W9GBM9Ontkg6Ir2LNLYkY34ORxzI=",
|
||||
"hash": "sha256-Ru3jcpnZR3guA3kGxO3iS/ZADtekTOy48kPFpv84wp8=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.13.1",
|
||||
"rev": "v2.14.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-kh1wv7cuWCC1rP0WBQW95pFg53gZTakqGoMIDMDSmt0="
|
||||
"vendorHash": "sha256-7uatC3EI9IEgGEAaYWUNzPStGqtf+0vp8Liuru9NMZI="
|
||||
},
|
||||
"secret": {
|
||||
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
|
||||
|
@ -1027,11 +1027,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"snowflake": {
|
||||
"hash": "sha256-kkkpXIpioLHBbJCv7t6b17e3Coj4GoYORZaVp14K4nw=",
|
||||
"hash": "sha256-cgh93oDVlV+Om17UdJyxzHqhKwy4d41TBcPV5Z3FJig=",
|
||||
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
|
||||
"owner": "Snowflake-Labs",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.58.2",
|
||||
"rev": "v0.59.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-vxJGQkrbGITool/45JpBqdqrlSeP3xeWMkSLmFh4K+s="
|
||||
},
|
||||
|
@ -1045,11 +1045,11 @@
|
|||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-mbqnFKxHSh4IF+zPpT2wIz1/dJKpuM7TUHS0Cvt/srg=",
|
||||
"hash": "sha256-fa6mEFNNAAp3E8W9U3VpICgKX3SGcQGQtce8DO+cUbY=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.106.0",
|
||||
"rev": "v1.106.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-TxTw+13HJDHDdLhGjM3SXOL87RJdRFs0Y+t/oK81DfI="
|
||||
},
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
, curl, bzip2, zip, unzip, glxinfo
|
||||
, libcec, libcec_platform, dcadec, libuuid
|
||||
, libcrossguid, libmicrohttpd
|
||||
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1
|
||||
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1
|
||||
, libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson
|
||||
, lirc
|
||||
, x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp
|
||||
|
@ -38,19 +38,21 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is
|
|||
assert gbmSupport || waylandSupport || x11Support;
|
||||
|
||||
let
|
||||
kodiReleaseDate = "20230115";
|
||||
kodiVersion = "20.0";
|
||||
kodiReleaseDate = "20230312";
|
||||
kodiVersion = "20.1";
|
||||
rel = "Nexus";
|
||||
|
||||
kodi_src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "xbmc";
|
||||
rev = "${kodiVersion}-${rel}";
|
||||
sha256 = "sha256-0BkbA1iovouwjQVtiKFw3+64i7sMWZNiCUfOQ0EsslY=";
|
||||
owner = "xbmc";
|
||||
repo = "xbmc";
|
||||
rev = "${kodiVersion}-${rel}";
|
||||
hash = "sha256-2nwjW0MYrMVk+dllrAv9yn+YNA6/loZzoK8mbFIZ8Xs=";
|
||||
};
|
||||
|
||||
# see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies
|
||||
|
||||
# kodi 20.0 moved to ffmpeg 5, *but* there is a bug making the compilation fail which will
|
||||
# only been fixed in kodi 21, so stick to ffmpeg 4 for now
|
||||
ffmpeg = stdenv.mkDerivation rec {
|
||||
pname = "kodi-ffmpeg";
|
||||
version = "4.4.1";
|
||||
|
@ -71,7 +73,7 @@ let
|
|||
"-DOS=${stdenv.hostPlatform.parsed.kernel.name}"
|
||||
"-DPKG_CONFIG_EXECUTABLE=pkg-config"
|
||||
];
|
||||
buildInputs = [ libidn libtasn1 p11-kit zlib libva ]
|
||||
buildInputs = [ libidn2 libtasn1 p11-kit zlib libva ]
|
||||
++ lib.optional vdpauSupport libvdpau;
|
||||
nativeBuildInputs = [ cmake nasm pkg-config gnutls ];
|
||||
};
|
||||
|
@ -110,7 +112,7 @@ in stdenv.mkDerivation {
|
|||
src = kodi_src;
|
||||
|
||||
buildInputs = [
|
||||
gnutls libidn libtasn1 nasm p11-kit
|
||||
gnutls libidn2 libtasn1 nasm p11-kit
|
||||
libxml2 python3Packages.python
|
||||
boost libmicrohttpd
|
||||
gettext pcre-cpp yajl fribidi libva libdrm
|
||||
|
|
|
@ -41,13 +41,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "icewm";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ice-wm";
|
||||
repo = "icewm";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-2gEZRkym21X4rvj6kzZh9WChZUkfqgS1wiWh7LBioZM=";
|
||||
hash = "sha256-9fw3vqcorWZZROYm1vbDOrlkzEbuk7X2dOO/Edo3AOg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, python3
|
||||
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, python3
|
||||
, libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM
|
||||
, imlib2, pango, libstartup_notification, makeWrapper }:
|
||||
|
||||
|
@ -45,6 +45,13 @@ stdenv.mkDerivation rec {
|
|||
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/90cb57ef53d952bb6ab4c33a184f815bbe1791c0/openbox/trunk/py3.patch";
|
||||
sha256 = "1ks99awlkhd5ph9kz94s1r6m1bfvh42g4rmxd14dyg5b421p1ljc";
|
||||
})
|
||||
|
||||
# Fix crash with GLib 2.76. This is proposed on https://bugzilla.icculus.org/show_bug.cgi?id=6669
|
||||
# and commited to a work branch in the upstream repo. See https://bugs.archlinux.org/task/77853.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Mikachu/openbox/commit/d41128e5a1002af41c976c8860f8299cfcd3cd72.patch";
|
||||
sha256 = "sha256-4/aoI4y98JPybZ1MNI7egOhkroQgh/oeGnYrhNGX4t4=";
|
||||
})
|
||||
];
|
||||
|
||||
postBuild = "gcc -O2 -o setlayout $(pkg-config --cflags --libs x11) $setlayoutSrc";
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ fetchFromGitHub
|
||||
, fetchpatch
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
|
@ -33,6 +34,15 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-etB+q7FIwbApTUk8RohAy3kHX8Vb4cSY/qkvhj94yTM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# xapp-sn-watcher crashes on cinnamon with glib 2.76.0
|
||||
# https://github.com/linuxmint/xapp/issues/165
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linuxmint/xapp/commit/3ef9861d6228c2061fbde2c0554be5ae6f42befa.patch";
|
||||
sha256 = "sha256-7hYXA43UQpBLLjRVPoACc8xdhKyKnt3cDUBL4PhEtJY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
|
@ -1,82 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, which, perl, jdk
|
||||
, ocamlPackages, openssl
|
||||
, coreutils, zlib, ncurses, makeWrapper
|
||||
, gcc, binutils, gnumake, nodejs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opa";
|
||||
version = "4310";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MLstate";
|
||||
repo = "opalang";
|
||||
rev = "a13d45af30bc955c40c4b320353fb21e4ecacbc5";
|
||||
sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./ocaml-4.03.patch
|
||||
./ocaml-4.04.patch
|
||||
./ocaml-4.14.patch
|
||||
./ocaml-4.14-tags.patch
|
||||
];
|
||||
|
||||
# Paths so the opa compiler code generation will use the same programs as were
|
||||
# used to build opa.
|
||||
codeGeneratorPaths = lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
(
|
||||
cat ./compiler/buildinfos/buildInfos.ml.pre
|
||||
./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt
|
||||
echo let opa_git_version = ${version}
|
||||
echo 'let opa_git_sha = "xxxx"'
|
||||
cat ./compiler/buildinfos/buildInfos.ml.post
|
||||
)> ./compiler/buildinfos/buildInfos.ml
|
||||
for p in configure tools/platform_helper.sh
|
||||
do
|
||||
substituteInPlace $p --replace 'IS_MAC=1' 'IS_LINUX=1'
|
||||
done
|
||||
export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o
|
||||
export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf
|
||||
export OCAMLBUILD=${ocamlPackages.ocamlbuild}/bin/ocamlbuild
|
||||
'';
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ];
|
||||
|
||||
nativeBuildInputs = [ gcc binutils nodejs which makeWrapper ];
|
||||
buildInputs = [ perl jdk openssl coreutils zlib ncurses
|
||||
] ++ (with ocamlPackages; [
|
||||
ocaml findlib ssl camlzip ulex ocamlgraph camlp4 num
|
||||
]);
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
|
||||
|
||||
postInstall = ''
|
||||
# Have compiler use same tools for code generation as used to build it.
|
||||
for p in $out/bin/opa ; do
|
||||
wrapProgram $p --prefix PATH ":" "${codeGeneratorPaths}" ;
|
||||
done
|
||||
|
||||
# Install emacs mode.
|
||||
mkdir -p $out/share/emacs/site-lisp/opa
|
||||
install -m 0644 -v ./tools/editors/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A concise and elegant language for writing distributed web applications";
|
||||
longDescription = ''
|
||||
Opa is a new generation of web development platform that lets you write distributed
|
||||
web applications using a single technology. Among the the many features of Opa are these:
|
||||
Opa is concise, simple, concurrent, dynamically distributed, and secure.
|
||||
'';
|
||||
homepage = "http://opalang.org/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
|
@ -1,35 +0,0 @@
|
|||
--- a/compiler/passes/surfaceAstRenaming.ml
|
||||
+++ b/compiler/passes/surfaceAstRenaming.ml
|
||||
@@ -1110,7 +1110,7 @@ let find_opt_local_or_global name all_env =
|
||||
| None -> find_opt_global name all_env
|
||||
| v -> v
|
||||
|
||||
-let path_expr_to_module_aux p = function
|
||||
+let path_expr_to_module_aux p : _ -> _ result = function
|
||||
| Some (OpenedIdent (tree, ident, path)) ->
|
||||
(match Tree.get_path_opt tree p with
|
||||
(* the path is not in the tree, which means a 'dot' access
|
||||
diff --git a/ocamllib/libbase/baseInt64.mli b/ocamllib/libbase/baseInt64.mli
|
||||
index fb544706..734437f9 100644
|
||||
--- a/ocamllib/libbase/baseInt64.mli
|
||||
+++ b/ocamllib/libbase/baseInt64.mli
|
||||
@@ -40,7 +40,9 @@ external shift_right_logical : int64 -> int -> int64 = "%int64_lsr"
|
||||
external of_int : int -> int64 = "%int64_of_int"
|
||||
external to_int : int64 -> int = "%int64_to_int"
|
||||
external of_float : float -> int64 = "caml_int64_of_float"
|
||||
+ "caml_int64_of_float_unboxed" [@@unboxed] [@@noalloc]
|
||||
external to_float : int64 -> float = "caml_int64_to_float"
|
||||
+ "caml_int64_to_float_unboxed" [@@unboxed] [@@noalloc]
|
||||
external of_int32 : int32 -> int64 = "%int64_of_int32"
|
||||
external to_int32 : int64 -> int32 = "%int64_to_int32"
|
||||
external of_nativeint : nativeint -> int64 = "%int64_of_nativeint"
|
||||
@@ -48,7 +50,9 @@ external to_nativeint : int64 -> nativeint = "%int64_to_nativeint"
|
||||
external of_string : string -> int64 = "caml_int64_of_string"
|
||||
val to_string : int64 -> string
|
||||
external bits_of_float : float -> int64 = "caml_int64_bits_of_float"
|
||||
+ "caml_int64_bits_of_float_unboxed" [@@unboxed] [@@noalloc]
|
||||
external float_of_bits : int64 -> float = "caml_int64_float_of_bits"
|
||||
+ "caml_int64_float_of_bits_unboxed" [@@unboxed] [@@noalloc]
|
||||
type t = int64
|
||||
val compare : t -> t -> int
|
||||
external format : string -> int64 -> string = "caml_int64_format"
|
|
@ -1,75 +0,0 @@
|
|||
diff --git a/compiler/libbsl/bslLib.ml b/compiler/libbsl/bslLib.ml
|
||||
index b9f75bd1..171af065 100644
|
||||
--- a/compiler/libbsl/bslLib.ml
|
||||
+++ b/compiler/libbsl/bslLib.ml
|
||||
@@ -726,7 +726,7 @@ struct
|
||||
let root elt = !(elt.root)
|
||||
let elt_name elt = elt.name
|
||||
let elts e = e
|
||||
- let children = List.map (fun e -> e.name, e)
|
||||
+ let children m = List.map (fun e -> e.name, e) m
|
||||
let is_root e = Path.is_root e.pwd
|
||||
|
||||
let parent e =
|
||||
diff --git a/compiler/passes/surfaceAstDependencies.ml b/compiler/passes/surfaceAstDependencies.ml
|
||||
index f4354a3f..81253d32 100644
|
||||
--- a/compiler/passes/surfaceAstDependencies.ml
|
||||
+++ b/compiler/passes/surfaceAstDependencies.ml
|
||||
@@ -66,7 +66,6 @@ open SurfaceAst
|
||||
|
||||
(* shorthands *)
|
||||
module SAH = SurfaceAstHelper
|
||||
-module C = SurfaceAstCons.ExprIdentCons
|
||||
module D = SurfaceAstDecons
|
||||
module S = SurfaceAst
|
||||
|
||||
diff --git a/compiler/passes/surfaceAstPasses.ml b/compiler/passes/surfaceAstPasses.ml
|
||||
index 10edf5cb..00de59fa 100644
|
||||
--- a/compiler/passes/surfaceAstPasses.ml
|
||||
+++ b/compiler/passes/surfaceAstPasses.ml
|
||||
@@ -25,7 +25,6 @@ open SurfaceAstPassesTypes
|
||||
|
||||
(* alias *)
|
||||
module C = SurfaceAstCons.ExprIdentCons
|
||||
-module CS = SurfaceAstCons.StringCons
|
||||
|
||||
|
||||
|
||||
diff --git a/compiler/qmlslicer/qmlSimpleSlicer.ml b/compiler/qmlslicer/qmlSimpleSlicer.ml
|
||||
index 2eebd96b..04ce77c8 100644
|
||||
--- a/compiler/qmlslicer/qmlSimpleSlicer.ml
|
||||
+++ b/compiler/qmlslicer/qmlSimpleSlicer.ml
|
||||
@@ -17,7 +17,6 @@
|
||||
*)
|
||||
module Format = Base.Format
|
||||
module List = Base.List
|
||||
-module String = Base.String
|
||||
module Q = QmlAst
|
||||
module Package = ObjectFiles.Package
|
||||
|
||||
diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli
|
||||
index da2d9736..82d72963 100644
|
||||
--- a/ocamllib/libbase/baseObj.mli
|
||||
+++ b/ocamllib/libbase/baseObj.mli
|
||||
@@ -21,7 +21,7 @@ type t = Obj.t
|
||||
external repr : 'a -> t = "%identity"
|
||||
external obj : t -> 'a = "%identity"
|
||||
external magic : 'a -> 'b = "%identity"
|
||||
-external is_block : t -> bool = "caml_obj_is_block"
|
||||
+val [@inline always] is_block : t -> bool
|
||||
external is_int : t -> bool = "%obj_is_int"
|
||||
external tag : t -> int = "caml_obj_tag"
|
||||
external set_tag : t -> int -> unit = "caml_obj_set_tag"
|
||||
diff --git a/ocamllib/libbase/baseString.ml b/ocamllib/libbase/baseString.ml
|
||||
index 640ce2fa..6931c608 100644
|
||||
--- a/ocamllib/libbase/baseString.ml
|
||||
+++ b/ocamllib/libbase/baseString.ml
|
||||
@@ -20,7 +20,7 @@
|
||||
(* depends *)
|
||||
module Char = BaseChar
|
||||
|
||||
-include Bytes
|
||||
+include String
|
||||
|
||||
let compare_int (a:int) b = Pervasives.compare a b
|
||||
|
|
@ -1,191 +0,0 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 37589e1..10d3418 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -14,6 +14,7 @@ OPALANG_DIR ?= .
|
||||
|
||||
MAKE ?= $_
|
||||
OCAMLBUILD_OPT ?= -j 6
|
||||
+OCAMLBUILD_OPT += -use-ocamlfind -package num
|
||||
|
||||
ifndef NO_REBUILD_OPA_PACKAGES
|
||||
OPAOPT += --rebuild
|
||||
diff --git a/_tags b/_tags
|
||||
index 5d8d922..b6bdd5e 100644
|
||||
--- a/_tags
|
||||
+++ b/_tags
|
||||
@@ -15,4 +15,4 @@
|
||||
<{ocamllib,compiler,lib,tools}>: include
|
||||
|
||||
# Warnings
|
||||
-<**/*.ml>: warn_L, warn_Z, warn_error_A
|
||||
+<**/*.ml>: warn_L, warn_Z
|
||||
diff --git a/compiler/_tags b/compiler/_tags
|
||||
index b33eeeb..7afa493 100644
|
||||
--- a/compiler/_tags
|
||||
+++ b/compiler/_tags
|
||||
@@ -7,6 +7,6 @@
|
||||
|
||||
<main.ml>: use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_passlib, use_libbsl, use_qmloptions, use_qml2js, use_js_passes, use_opa
|
||||
|
||||
-<main.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_js_passes, use_opa
|
||||
+<main.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_js_passes, use_opa
|
||||
|
||||
<main.ml>: with_mlstate_debug
|
||||
diff --git a/compiler/jslang/_tags b/compiler/jslang/_tags
|
||||
index f33b592..8925703 100644
|
||||
--- a/compiler/jslang/_tags
|
||||
+++ b/compiler/jslang/_tags
|
||||
@@ -4,7 +4,7 @@
|
||||
<jsParse.ml>: use_camlp4, camlp4orf_fixed
|
||||
|
||||
# todo: find a way to link fewer libs
|
||||
-<{jspp,jsstat,globalizer}.{byte,native}>: use_passlib, use_opacapi, use_libtrx, use_ulex, use_str, use_unix, use_buildinfos, use_libbase, use_libqmlcompil, use_compilerlib, use_graph, use_nums, use_dynlink, use_jslang, use_ocamllang, use_libbsl, use_opalang, use_pplib, use_qmloptions, use_qml2js, use_qmlcpsrewriter, use_qmlpasses
|
||||
+<{jspp,jsstat,globalizer}.{byte,native}>: use_passlib, use_opacapi, use_libtrx, use_ulex, use_str, use_unix, use_buildinfos, use_libbase, use_libqmlcompil, use_compilerlib, use_graph, use_dynlink, use_jslang, use_ocamllang, use_libbsl, use_opalang, use_pplib, use_qmloptions, use_qml2js, use_qmlcpsrewriter, use_qmlpasses
|
||||
<{jspp,jsstat,globalizer}.{ml,byte,native}>: use_qmljsimp
|
||||
|
||||
<jsstat.{ml,byte,native}>: use_libjsminify
|
||||
diff --git a/compiler/libbsl/_tags b/compiler/libbsl/_tags
|
||||
index cad1fe4..8ef238b 100644
|
||||
--- a/compiler/libbsl/_tags
|
||||
+++ b/compiler/libbsl/_tags
|
||||
@@ -20,7 +20,7 @@
|
||||
<bslRegisterParser.{ml,mli,byte,native}>: use_libtrx
|
||||
<bslTinyShell.{ml,mli,byte,native}>: use_libtrx
|
||||
<bslregister.*>: use_jslang
|
||||
-<bslregister.{byte,native}>: use_ulex, use_libbsl, use_dynlink, use_zip, use_nums
|
||||
+<bslregister.{byte,native}>: use_ulex, use_libbsl, use_dynlink, use_zip
|
||||
<portingBsl.{ml,byte,native}>: use_ulex, use_libbsl, use_dynlink, use_zip, use_nums
|
||||
<bslGeneration.{ml,mli}>: use_ulex, use_dynlink, use_zip, use_nums, use_jslang
|
||||
<bslMarshalPlugin.*>: use_jslang
|
||||
@@ -30,7 +30,7 @@
|
||||
<tests>: ignore
|
||||
|
||||
# applications, linking
|
||||
-<*.{byte,native}>:use_buildinfos, use_ulex, use_libtrx, use_dynlink, use_unix, thread, use_graph, use_libbsl, use_passlib, use_zip, use_nums, use_opalang, use_ocamllang, use_langlang, use_jslang, use_opacapi
|
||||
+<*.{byte,native}>:use_buildinfos, use_ulex, use_libtrx, use_dynlink, thread, use_graph, use_libbsl, use_passlib, use_zip, use_opalang, use_ocamllang, use_langlang, use_jslang, use_opacapi
|
||||
|
||||
# ppdebug (pl. be very specific with the use of ppdebug)
|
||||
<bslLib.ml*> : with_mlstate_debug
|
||||
diff --git a/compiler/opa/_tags b/compiler/opa/_tags
|
||||
index cfe97a1..702af34 100644
|
||||
--- a/compiler/opa/_tags
|
||||
+++ b/compiler/opa/_tags
|
||||
@@ -62,7 +62,7 @@
|
||||
<syntaxHelper.ml>: use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_passlib
|
||||
|
||||
# linking
|
||||
-<{opa_parse,checkopacapi,gen_opa_manpage,syntaxHelper}.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_qmloptions
|
||||
+<{opa_parse,checkopacapi,gen_opa_manpage,syntaxHelper}.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_qmloptions
|
||||
|
||||
<opa_InsertRemote.ml>: with_mlstate_debug
|
||||
<main_utils.ml>: with_mlstate_debug
|
||||
diff --git a/compiler/opalang/_tags b/compiler/opalang/_tags
|
||||
index 6844281..8f0eaec 100644
|
||||
--- a/compiler/opalang/_tags
|
||||
+++ b/compiler/opalang/_tags
|
||||
@@ -14,7 +14,7 @@ true: warn_Z
|
||||
<standaloneparser.ml>: use_buildinfos, use_compilerlib, use_pplib
|
||||
<**/*.{ml,mli}>: use_libbase, use_compilerlib, use_libqmlcompil, use_passlib
|
||||
|
||||
-<{opa2opa,standaloneparser}.{native,byte}>: use_unix, use_libbase, use_mutex, use_graph, use_str, use_zlib, thread, use_nums, use_libtrx, use_passlib, use_libqmlcompil, use_buildinfos, use_ulex, use_compilerlib, use_pplib, use_opacapi
|
||||
+<{opa2opa,standaloneparser}.{native,byte}>: use_libbase, use_mutex, use_graph, use_str, use_zlib, thread, use_libtrx, use_passlib, use_libqmlcompil, use_buildinfos, use_ulex, use_compilerlib, use_pplib, use_opacapi
|
||||
|
||||
<opaMapToIdent.ml>: use_opacapi
|
||||
<surfaceAstCons.ml>: use_opacapi
|
||||
diff --git a/compiler/opx2js/_tags b/compiler/opx2js/_tags
|
||||
index 7e9b9cc..3e257ea 100644
|
||||
--- a/compiler/opx2js/_tags
|
||||
+++ b/compiler/opx2js/_tags
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<**/*.{ml,mli}>: use_buildinfos, use_libbase, use_compilerlib, use_passlib
|
||||
|
||||
-<**/*.native>: thread, use_dynlink, use_graph, use_str, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmlflatcompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_libopa
|
||||
+<**/*.native>: thread, use_dynlink, use_graph, use_str, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmlflatcompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_libopa
|
||||
|
||||
<**/opx2jsPasses.{ml,mli}>: use_jslang, use_opalib, use_opalang, use_opapasses, use_libopa, use_libqmlcompil, use_qmlpasses, use_qmlcpsrewriter, use_qmlslicer
|
||||
|
||||
diff --git a/compiler/passes/_tags b/compiler/passes/_tags
|
||||
index a0daff4..9644d3a 100644
|
||||
--- a/compiler/passes/_tags
|
||||
+++ b/compiler/passes/_tags
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- conf -*- (for emacs)
|
||||
|
||||
# preprocessing
|
||||
-true: with_mlstate_debug, warn_A, warn_e, warn_error_A, warnno_48
|
||||
+true: with_mlstate_debug, warn_A, warn_e, warnno_48
|
||||
|
||||
<**/*.{ml,mli}>: use_libbase, use_libqmlcompil, use_passlib, use_opalang, use_compilerlib, use_opacapi
|
||||
<surfaceAst*.{ml,mli}>: use_opalib, use_libbsl
|
||||
diff --git a/compiler/passlib/_tags b/compiler/passlib/_tags
|
||||
index 2b9cfcf..5cb3145 100644
|
||||
--- a/compiler/passlib/_tags
|
||||
+++ b/compiler/passlib/_tags
|
||||
@@ -1,6 +1,6 @@
|
||||
# -*- conf -*- (for emacs)
|
||||
|
||||
-<*.{ml,mli,byte,native}>: use_libbase, use_compilerlib, thread, use_ulex, use_unix, use_str
|
||||
+<*.{ml,mli,byte,native}>: use_libbase, use_compilerlib, thread, use_ulex, use_str
|
||||
|
||||
<passHandler.ml>: use_buildinfos
|
||||
<passdesign.{byte,native}>: use_buildinfos, use_graph
|
||||
diff --git a/compiler/qmlcompilers/_tags b/compiler/qmlcompilers/_tags
|
||||
index 087165c..87ae918 100644
|
||||
--- a/compiler/qmlcompilers/_tags
|
||||
+++ b/compiler/qmlcompilers/_tags
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
# application, linkink
|
||||
# common
|
||||
-<{qmljs_exe}.{ml,mli,byte,native}>: thread, use_unix, use_dynlink, use_str, use_graph, use_ulex, use_libtrx, use_pplib, use_opabsl_for_compiler, use_passlib, use_nums, use_buildinfos, use_opalang, use_compilerlib, use_opacapi
|
||||
+<{qmljs_exe}.{ml,mli,byte,native}>: thread, use_dynlink, use_str, use_graph, use_ulex, use_libtrx, use_pplib, use_opabsl_for_compiler, use_passlib, use_buildinfos, use_opalang, use_compilerlib, use_opacapi
|
||||
|
||||
# specific
|
||||
<qmljs_exe.{ml,byte,native}>: use_qmljsimp, use_qml2js, use_zip
|
||||
diff --git a/ocamllib/libbase/_tags b/ocamllib/libbase/_tags
|
||||
index 42d067d..6b7e690 100644
|
||||
--- a/ocamllib/libbase/_tags
|
||||
+++ b/ocamllib/libbase/_tags
|
||||
@@ -27,4 +27,4 @@
|
||||
<mongo.ml>: with_mlstate_debug
|
||||
|
||||
|
||||
-<{testconsole,testfilepos}.{ml,mli,byte,native}>: thread, use_str, use_unix, use_libbase, use_ulex
|
||||
+<{testconsole,testfilepos}.{ml,mli,byte,native}>: thread, use_str, use_libbase, use_ulex
|
||||
diff --git a/tools/_tags b/tools/_tags
|
||||
index 549752b..44c97b3 100644
|
||||
--- a/tools/_tags
|
||||
+++ b/tools/_tags
|
||||
@@ -8,7 +8,7 @@
|
||||
<build>: include
|
||||
|
||||
# Odep
|
||||
-<odep*.{ml,byte,native}>: thread, use_str, use_unix, use_graph, use_zip, use_libbase, use_ulex
|
||||
+<odep*.{ml,byte,native}>: thread, use_str, use_graph, use_zip, use_libbase, use_ulex
|
||||
|
||||
###
|
||||
# Ofile
|
||||
@@ -16,7 +16,7 @@
|
||||
<ofile.ml>: use_libbase
|
||||
|
||||
# linking
|
||||
-<ofile.{byte,native}>: use_unix, use_str, thread, use_ulex, use_libbase, use_zip
|
||||
+<ofile.{byte,native}>: use_str, thread, use_ulex, use_libbase, use_zip
|
||||
|
||||
###
|
||||
# jschecker
|
||||
diff --git a/tools/teerex/_tags b/tools/teerex/_tags
|
||||
index d662b49..366ea01 100644
|
||||
--- a/tools/teerex/_tags
|
||||
+++ b/tools/teerex/_tags
|
||||
@@ -6,6 +6,6 @@
|
||||
|
||||
<*.{ml,mli,byte,native}>: use_str, use_libbase, use_compilerlib, use_graph, use_libtrx, use_ocamllang, use_zip, use_buildinfos, use_passlib
|
||||
|
||||
-<trx_ocaml.{byte,native}>: thread, use_unix
|
||||
+<trx_ocaml.{byte,native}>: thread
|
||||
<trx_ocaml_main.{byte,native}>: thread, use_unix
|
||||
-<trx_interpreter.{byte,native}>: thread, use_unix
|
||||
+<trx_interpreter.{byte,native}>: thread
|
|
@ -1,63 +0,0 @@
|
|||
diff --git a/compiler/compilerlib/objectFiles.ml b/compiler/compilerlib/objectFiles.ml
|
||||
index d0e7223..5fee601 100644
|
||||
--- a/compiler/compilerlib/objectFiles.ml
|
||||
+++ b/compiler/compilerlib/objectFiles.ml
|
||||
@@ -339,8 +339,9 @@ let dirname (package:package_name) : filename = Filename.concat !opxdir (unprefi
|
||||
let unprefixed_dirname_plugin (package:package_name) : filename = package ^ "." ^ Name.plugin_ext
|
||||
let dirname_plugin (package:package_name) : filename = Filename.concat !opxdir (unprefixed_dirname_plugin package)
|
||||
let dirname_from_package ((package_name,_):package) = dirname package_name
|
||||
-let undirname filename : package_name = Filename.chop_suffix (Filename.basename filename) ("."^Name.object_ext)
|
||||
-let undirname_plugin filename : package_name = Filename.chop_suffix (Filename.basename filename) ("."^Name.plugin_ext)
|
||||
+let chop_suffix name suff = try Filename.chop_suffix name suff with _ -> name
|
||||
+let undirname filename : package_name = chop_suffix (Filename.basename filename) ("."^Name.object_ext)
|
||||
+let undirname_plugin filename : package_name = chop_suffix (Filename.basename filename) ("."^Name.plugin_ext)
|
||||
let filename_from_dir dir pass = Filename.concat dir pass
|
||||
let filename_from_package package pass = filename_from_dir (dirname_from_package package) pass
|
||||
|
||||
diff --git a/ocamllib/libbase/baseHashtbl.ml b/ocamllib/libbase/baseHashtbl.ml
|
||||
index 439d76c..7be6cf9 100644
|
||||
--- a/ocamllib/libbase/baseHashtbl.ml
|
||||
+++ b/ocamllib/libbase/baseHashtbl.ml
|
||||
@@ -29,7 +29,6 @@ let iter = Hashtbl.iter
|
||||
let fold = Hashtbl.fold
|
||||
let length = Hashtbl.length
|
||||
let hash = Hashtbl.hash
|
||||
-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
|
||||
module type HashedType = Hashtbl.HashedType
|
||||
|
||||
(* could be done (with magic) more efficiently
|
||||
diff --git a/ocamllib/libbase/baseHashtbl.mli b/ocamllib/libbase/baseHashtbl.mli
|
||||
index 1a2b146..10e448b 100644
|
||||
--- a/ocamllib/libbase/baseHashtbl.mli
|
||||
+++ b/ocamllib/libbase/baseHashtbl.mli
|
||||
@@ -41,7 +41,6 @@ end
|
||||
module Make (H : HashedType) : S with type key = H.t
|
||||
|
||||
val hash : 'a -> int
|
||||
-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
|
||||
|
||||
(**
|
||||
additional functions
|
||||
diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli
|
||||
index da2d973..5eb77b5 100644
|
||||
--- a/ocamllib/libbase/baseObj.mli
|
||||
+++ b/ocamllib/libbase/baseObj.mli
|
||||
@@ -23,7 +23,7 @@ external obj : t -> 'a = "%identity"
|
||||
external magic : 'a -> 'b = "%identity"
|
||||
external is_block : t -> bool = "caml_obj_is_block"
|
||||
external is_int : t -> bool = "%obj_is_int"
|
||||
-external tag : t -> int = "caml_obj_tag"
|
||||
+external tag : t -> int = "caml_obj_tag" [@@noalloc]
|
||||
external set_tag : t -> int -> unit = "caml_obj_set_tag"
|
||||
external size : t -> int = "%obj_size"
|
||||
external truncate : t -> int -> unit = "caml_obj_truncate"
|
||||
@@ -49,9 +49,6 @@ val int_tag : int
|
||||
val out_of_heap_tag : int
|
||||
val unaligned_tag : int
|
||||
|
||||
-val marshal : t -> string
|
||||
-val unmarshal : string -> int -> t * int
|
||||
-
|
||||
(** Additional functions *)
|
||||
|
||||
val dump : ?custom:(Obj.t -> (Buffer.t -> Obj.t -> unit) option) -> ?depth:int -> 'a -> string
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catch2";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catchorg";
|
||||
repo = "Catch2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JVxBYhKTejc8lfqgxz5Ig5G9H90YuIcGAUopGJG/3Dg=";
|
||||
hash = "sha256-t/4iCrzPeDZNNlgibVqx5rhe+d3lXwm1GmBMDDId0VQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
38
pkgs/development/libraries/epoll-shim/default.nix
Normal file
38
pkgs/development/libraries/epoll-shim/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "epoll-shim";
|
||||
version = "unstable-2023-02-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jiixyj";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "702e845d7850e30a7b9e29f759c9c8f7bb40784b";
|
||||
hash = "sha256-QfBnF0/P2KjQggEdJCdqVJDeV/+iaN0OZIwIGyIyr68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_PKGCONFIGDIR=${placeholder "out"}/lib/pkgconfig"
|
||||
"-DBUILD_TESTING=${lib.boolToString finalAttrs.doCheck}"
|
||||
];
|
||||
|
||||
# https://github.com/jiixyj/epoll-shim/issues/41
|
||||
# https://github.com/jiixyj/epoll-shim/pull/34
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small epoll implementation using kqueue";
|
||||
homepage = "https://github.com/jiixyj/epoll-shim";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.darwin ++ platforms.freebsd ++ platforms.netbsd ++ platforms.openbsd;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
};
|
||||
})
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s2n-tls";
|
||||
version = "1.3.37";
|
||||
version = "1.3.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NqOr2R61s4aUjHWI2QkyLpxUm/+c4vkAUg+UDduu3j4=";
|
||||
sha256 = "sha256-2vMEzHgwvcjHJZ4eloAWv1ioUXAatGfHT9OEclwKB3A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
let
|
||||
inherit (lib) lists strings trivial;
|
||||
inherit (cudaPackages) cudatoolkit cudaFlags cudaVersion;
|
||||
inherit (cudaPackages) backendStdenv cudaFlags cudaVersion;
|
||||
inherit (magmaRelease) version hash supportedGpuTargets;
|
||||
|
||||
# NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements
|
||||
|
@ -80,26 +80,33 @@ let
|
|||
cudaArchitecturesString = strings.concatStringsSep ";" cudaArchitectures;
|
||||
minArch =
|
||||
let
|
||||
minArch' = builtins.head (builtins.sort builtins.lessThan cudaArchitectures);
|
||||
minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures);
|
||||
in
|
||||
# If this fails some day, something must've changed and we should re-validate our assumptions
|
||||
assert builtins.stringLength minArch' == 2;
|
||||
# "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273
|
||||
"${minArch'}0";
|
||||
|
||||
cuda-common-redist = with cudaPackages; [
|
||||
libcublas # cublas_v2.h
|
||||
libcusparse # cusparse.h
|
||||
];
|
||||
|
||||
cuda_joined = symlinkJoin {
|
||||
name = "cuda-redist-${cudaVersion}";
|
||||
# Build-time dependencies
|
||||
cuda-native-redist = symlinkJoin {
|
||||
name = "cuda-native-redist-${cudaVersion}";
|
||||
paths = with cudaPackages; [
|
||||
cuda_nvcc
|
||||
cuda_cudart # cuda_runtime.h
|
||||
libcublas
|
||||
libcusparse
|
||||
cuda_nvcc
|
||||
] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [
|
||||
cuda_nvprof # <cuda_profiler_api.h>
|
||||
] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [
|
||||
cuda_profiler_api # <cuda_profiler_api.h>
|
||||
];
|
||||
] ++ cuda-common-redist;
|
||||
};
|
||||
|
||||
# Run-time dependencies
|
||||
cuda-redist = symlinkJoin {
|
||||
name = "cuda-redist-${cudaVersion}";
|
||||
paths = cuda-common-redist;
|
||||
};
|
||||
in
|
||||
|
||||
|
@ -119,6 +126,8 @@ stdenv.mkDerivation {
|
|||
cmake
|
||||
ninja
|
||||
gfortran
|
||||
] ++ lists.optionals cudaSupport [
|
||||
cuda-native-redist
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -126,7 +135,7 @@ stdenv.mkDerivation {
|
|||
lapack
|
||||
blas
|
||||
] ++ lists.optionals cudaSupport [
|
||||
cuda_joined
|
||||
cuda-redist
|
||||
] ++ lists.optionals rocmSupport [
|
||||
hip
|
||||
hipblas
|
||||
|
@ -139,8 +148,8 @@ stdenv.mkDerivation {
|
|||
] ++ lists.optionals cudaSupport [
|
||||
"-DCMAKE_CUDA_ARCHITECTURES=${cudaArchitecturesString}"
|
||||
"-DMIN_ARCH=${minArch}" # Disarms magma's asserts
|
||||
"-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/cc"
|
||||
"-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/c++"
|
||||
"-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc"
|
||||
"-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++"
|
||||
"-DMAGMA_ENABLE_CUDA=ON"
|
||||
] ++ lists.optionals rocmSupport [
|
||||
"-DCMAKE_C_COMPILER=${hip}/bin/hipcc"
|
||||
|
@ -148,13 +157,6 @@ stdenv.mkDerivation {
|
|||
"-DMAGMA_ENABLE_HIP=ON"
|
||||
];
|
||||
|
||||
# NOTE: The stdenv's CXX is used when compiling the CMake test to determine the version of
|
||||
# CUDA available. This isn't necessarily the same as cudatoolkit.cc, so we must set
|
||||
# CUDAHOSTCXX.
|
||||
preConfigure = strings.optionalString cudaSupport ''
|
||||
export CUDAHOSTCXX=${cudatoolkit.cc}/bin/c++
|
||||
'';
|
||||
|
||||
buildFlags = [
|
||||
"magma"
|
||||
"magma_sparse"
|
||||
|
@ -171,7 +173,7 @@ stdenv.mkDerivation {
|
|||
license = licenses.bsd3;
|
||||
homepage = "http://icl.cs.utk.edu/magma/index.html";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ tbenst ];
|
||||
maintainers = with maintainers; [ connorbaker ];
|
||||
# CUDA and ROCm are mutually exclusive
|
||||
broken = cudaSupport && rocmSupport || cudaSupport && strings.versionOlder cudaVersion "9";
|
||||
};
|
||||
|
|
|
@ -6,13 +6,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nextcloudmonitor";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meichthys";
|
||||
repo = "nextcloud_monitor";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b0c7gzx1d5kgbsfj1lbrqsirc5g5br6v8w2njaj1ys03kj669cx";
|
||||
hash = "sha256-Ivo5dqKcvE1e+1crZNzKHydprtMXkZdzDl4MsZviLQQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "13.2.3";
|
||||
version = "13.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GhoVV+PWe3fDb6grvskj5KLMFtNIpyXe2jifoSXj7HQ=";
|
||||
hash = "sha256-1faEVqSGhRr+CaRHgZMS093fSC3hBgK2CX0oCxAIjCU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -25,11 +25,6 @@ buildPythonPackage rec {
|
|||
hash = "sha256-wKbCIA6Xp+VYhcQ5ZpHo5usB+ksnMAJyv5naBvl4Cxo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Drop broken version specifier
|
||||
sed -i '/python_requires/d' setup.py
|
||||
'';
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
|
|||
exclusive lock on the processed tables during processing. pg_repack is efficient to boot,
|
||||
with performance comparable to using CLUSTER directly.
|
||||
'';
|
||||
homepage = "https://github.com/reorg/pg_repack";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ danbst ];
|
||||
inherit (postgresql.meta) platforms;
|
||||
inherit (src.meta) homepage;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "elvish";
|
||||
version = "0.18.0";
|
||||
version = "0.19.2";
|
||||
|
||||
subPackages = [ "cmd/elvish" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X src.elv.sh/pkg/buildinfo.Version==${version}" "-X src.elv.sh/pkg/buildinfo.Reproducible=true" ];
|
||||
ldflags = [ "-s" "-w" "-X src.elv.sh/pkg/buildinfo.Version==${version}" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elves";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AyTkJiNebpq17vdPluwJBztivezd+c1KAdWFTYYDIFE=";
|
||||
sha256 = "sha256-eCPJXCgmMvrJ2yVqYgXHXJWb6Ec0sutc91LNs4yRBYk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iuklI7XEQUgZ2ObYRROxyiccZ1JkajK5OJA7hIcpRZQ=";
|
||||
vendorSha256 = "sha256-VMI20IP1jVkUK3rJm35szaFDfZGEEingUEL/xfVJ1cc=";
|
||||
|
||||
strictDeps = true;
|
||||
doCheck = false;
|
||||
|
@ -33,7 +33,6 @@ buildGoModule rec {
|
|||
}
|
||||
|
||||
expect version ${version}
|
||||
expect reproducible \$true
|
||||
"
|
||||
|
||||
runHook postInstallCheck
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyperfine";
|
||||
version = "1.16.0";
|
||||
version = "1.16.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-cbox7TAgeb0ZPt0i3SphWClAz/mUUgRlFKCOS/E0MT4=";
|
||||
sha256 = "sha256-OdOlFdhIYxBi3e94QAief0xZqVdr+wnbaPFSKJ20DNM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Bc3twE42iB7NNkI5cPcniEb+JcR1wjc9nx80p6HCDVc=";
|
||||
cargoSha256 = "sha256-RgoMq52GkRbfhsBipMKhCSu3YQoOtDB/Fdg+9OPzGtk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "feroxbuster";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epi052";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-l+F4Zmeoq2ozgd+xq5n+cevThr8ub/7GiLq3Fe+C9yY=";
|
||||
hash = "sha256-HSZqqZngXs5ACsk9xzaqBWK5mUxPyGx3qJOtTURXPgg=";
|
||||
};
|
||||
|
||||
# disable linker overrides on aarch64-linux
|
||||
|
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
|||
rm .cargo/config
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-ivwXgHAg7+DnaIOBw9S2gIzJeoge0eStFtKZkJhrTYE=";
|
||||
cargoHash = "sha256-pisMqSgW6uPlBXgTUqJBJya84dRmbOJbEYYezuut6Wo=";
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
|
|
@ -1104,6 +1104,7 @@ mapAliases ({
|
|||
odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
|
||||
ofp = throw "ofp is not compatible with odp-dpdk";
|
||||
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
|
||||
opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
|
||||
opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
|
||||
openafs_1_8 = openafs; # Added 2022-08-22
|
||||
openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
|
||||
|
|
|
@ -15649,10 +15649,6 @@ with pkgs;
|
|||
|
||||
ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { };
|
||||
|
||||
opa = callPackage ../development/compilers/opa {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
|
||||
};
|
||||
|
||||
opaline = callPackage ../development/tools/ocaml/opaline { };
|
||||
|
||||
opam = callPackage ../development/tools/ocaml/opam {
|
||||
|
@ -19808,6 +19804,8 @@ with pkgs;
|
|||
|
||||
entt = callPackage ../development/libraries/entt { };
|
||||
|
||||
epoll-shim = callPackage ../development/libraries/epoll-shim { };
|
||||
|
||||
libepoxy = callPackage ../development/libraries/libepoxy {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon OpenGL;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue