Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e8caa03cd0
37 changed files with 3751 additions and 5610 deletions
|
|
@ -418,6 +418,12 @@
|
|||
githubId = 1250775;
|
||||
name = "Adolfo E. García Castro";
|
||||
};
|
||||
adriandole = {
|
||||
email = "adrian@dole.tech";
|
||||
github = "adriandole";
|
||||
githubId = 25236206;
|
||||
name = "Adrian Dole";
|
||||
};
|
||||
AdsonCicilioti = {
|
||||
name = "Adson Cicilioti";
|
||||
email = "adson.cicilioti@live.com";
|
||||
|
|
@ -2778,6 +2784,12 @@
|
|||
githubId = 3471749;
|
||||
name = "Claudio Bley";
|
||||
};
|
||||
cbourjau = {
|
||||
email = "christianb@posteo.de";
|
||||
github = "cbourjau";
|
||||
githubId = 3288058;
|
||||
name = "Christian Bourjau";
|
||||
};
|
||||
cbrewster = {
|
||||
email = "cbrewster@hey.com";
|
||||
github = "cbrewster";
|
||||
|
|
|
|||
|
|
@ -32,7 +32,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
in
|
||||
''
|
||||
with subtest("Wait for login"):
|
||||
machine.wait_for_x()
|
||||
# wait_for_x() checks graphical-session.target, which is expected to be
|
||||
# inactive on Budgie before #228946 (i.e. systemd managed gnome-session) is
|
||||
# done on upstream.
|
||||
# https://github.com/BuddiesOfBudgie/budgie-desktop/blob/v10.7.2/src/session/budgie-desktop.in#L16
|
||||
#
|
||||
# Previously this was unconditionally touched by xsessionWrapper but was
|
||||
# changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP).
|
||||
# machine.wait_for_x()
|
||||
machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
|
||||
machine.wait_for_file("${user.home}/.Xauthority")
|
||||
machine.succeed("xauth merge ${user.home}/.Xauthority")
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
|
||||
nodes.machine = { nodes, ... }:
|
||||
let
|
||||
user = nodes.machine.config.users.users.alice;
|
||||
user = nodes.machine.users.users.alice;
|
||||
in
|
||||
|
||||
{ imports = [ ./common/user-account.nix ];
|
||||
|
|
@ -27,12 +27,20 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
};
|
||||
|
||||
testScript = { nodes, ... }: let
|
||||
user = nodes.machine.config.users.users.alice;
|
||||
user = nodes.machine.users.users.alice;
|
||||
uid = toString user.uid;
|
||||
xauthority = "/run/user/${uid}/gdm/Xauthority";
|
||||
in ''
|
||||
with subtest("Login to GNOME Flashback with GDM"):
|
||||
machine.wait_for_x()
|
||||
# wait_for_x() checks graphical-session.target, which is expected to be
|
||||
# inactive on gnome-flashback before #228946 (i.e. systemd managed
|
||||
# gnome-session) is done.
|
||||
# https://github.com/NixOS/nixpkgs/pull/208060
|
||||
#
|
||||
# Previously this was unconditionally touched by xsessionWrapper but was
|
||||
# changed in #233981 (we have GNOME-Flashback:GNOME in XDG_CURRENT_DESKTOP).
|
||||
# machine.wait_for_x()
|
||||
machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
|
||||
# Wait for alice to be logged in"
|
||||
machine.wait_for_unit("default.target", "${user.name}")
|
||||
machine.wait_for_file("${xauthority}")
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "uxn";
|
||||
version = "unstable-2023-07-26";
|
||||
version = "unstable-2023-07-30";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "e2e5e8653193e2797131813938cb0d633ca3f40c";
|
||||
hash = "sha256-VZYvpHUyNeJMsX2ccLEBRuHgdgwOVuv+iakPiHnGAfg=";
|
||||
rev = "9ca8e9623d0ab1c299f08d3dd9d54098557f5749";
|
||||
hash = "sha256-K51YiLnBwFWgD3h3l2BhsvzhnHHolZPsjjUWJSe4sPQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2023-07-31
|
||||
# Last updated: 2023-08-02
|
||||
{
|
||||
compatList = {
|
||||
rev = "c40af830523cf820b6a391a3ef420bcc1b68b367";
|
||||
rev = "95617e06f8f19e3dcd76b694d6ba87408011cd4d";
|
||||
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
|
||||
};
|
||||
|
||||
mainline = {
|
||||
version = "1513";
|
||||
hash = "sha256:0mqrdsl55aimm39rws7ap6rw9qq6m4pzp7zlyvp3dchh1x58zzgq";
|
||||
version = "1515";
|
||||
hash = "sha256:0w9kg2rq43x9khws2yx6p7qad4xw6vkd04adiw021hjv1scajrlm";
|
||||
};
|
||||
|
||||
ea = {
|
||||
version = "3783";
|
||||
distHash = "sha256:01prkdximgypikgggq2y53hlpf7gmg1z7zfbc9yi18f6s5cncs18";
|
||||
fullHash = "sha256:0pggknr2sxlc3pdy3jh423318z8rr8f0iz43zw85qwhqnj1h9q19";
|
||||
version = "3788";
|
||||
distHash = "sha256:0w8jm51b2fwfbr5rmqdagjkay4kams2g12qqkqla6n696zn302jx";
|
||||
fullHash = "sha256:1fdv7645ijnl58749f4qa5ni7bag4chmm1c8gvji5408grfp0ldq";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubecfg";
|
||||
version = "0.31.4";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubecfg";
|
||||
repo = "kubecfg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1hjSuHGZ7NTsYLeV9Cw3wP5tUdAHRSmGlKkL54G/09U=";
|
||||
hash = "sha256-qjXc/2QY0PukvhiudukZGhBkovQMutsLg3Juxg1mgTc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0cpb5thhTJ7LPOYSd4WSPnS9OTXU608nk8xX5bsAm5w=";
|
||||
vendorHash = "sha256-9kVFOEMFjix2WRwGi0jWHPagzXkISucGHmd88vcBJfk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.27.3";
|
||||
version = "1.27.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g/YRwhhGjeBhbSFS/6xJbljTTMiwJHE3WRySwJlzKys=";
|
||||
hash = "sha256-Tb+T7kJHyZPXwUcEATj3jBr9qa7Sk6b+wL8HhqFOhYM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -827,11 +827,11 @@
|
|||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-GH8y9NkoNydzEpwl6wxmHIpaq6IfRv8cOz/NidiT488=",
|
||||
"hash": "sha256-PLlgHUIQWxBCBmTRuQ6RSLuqkilqUb4svmklbSoYEtA=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v5.6.0",
|
||||
"rev": "v5.7.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -980,13 +980,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"scaleway": {
|
||||
"hash": "sha256-NFBDqRVlSzEHTptAWg3OnK5zYm6JnvuzZnfh8mTtl2Q=",
|
||||
"hash": "sha256-xllc6uQN0Pjak/8eFNWCn639Kpf2UQPoDUPnX9YhoOc=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.25.1",
|
||||
"rev": "v2.26.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-rgM+TkygUIUXbw+QNsZOr003A/42iC52Zybw2zBJ15U="
|
||||
"vendorHash": "sha256-39MrDm4v7UIYDK/KNt9ES0SstkxEQ73CHvnxpZq1K5g="
|
||||
},
|
||||
"secret": {
|
||||
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
|
||||
|
|
@ -1025,11 +1025,11 @@
|
|||
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
|
||||
},
|
||||
"signalfx": {
|
||||
"hash": "sha256-ez9mmgzurLPBya6eJW2iWNtiTt8yg63Yavf6xiplZ9w=",
|
||||
"hash": "sha256-zIXlrb/2g/N/slOfvyLmNG2keGXKTes0rHXJmZLV0Sg=",
|
||||
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
|
||||
"owner": "splunk-terraform",
|
||||
"repo": "terraform-provider-signalfx",
|
||||
"rev": "v8.0.0",
|
||||
"rev": "v8.1.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY="
|
||||
},
|
||||
|
|
@ -1197,12 +1197,12 @@
|
|||
"vendorHash": "sha256-ZOJ4J+t8YIWAFZe9dnVHezdXdjz5y2ho53wmyS4dJEo="
|
||||
},
|
||||
"vault": {
|
||||
"hash": "sha256-XwM+WDfeWKwSz9pboaf5JfP2PrXevaRUw/YRnw8XXGw=",
|
||||
"hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v3.18.0",
|
||||
"rev": "v3.19.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0="
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.7.11";
|
||||
version = "3.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
|
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rrxY5liF4IzuaZ3kjJ2zEUzK1p7jGbS/T/bM1HQGzbA=";
|
||||
hash = "sha256-sAA01/Hs8yGFJM+ttwhonrBqTpGsEoWrYDU8w/YmE6A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,17 +16,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-clone";
|
||||
version = "5.0.11";
|
||||
version = "5.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZOJc8R82R9q87Qpf/J4CXE+xL6nvbsXRIs0boNY+2uk=";
|
||||
hash = "sha256-yxYmRSiw/pjgHftu75S9yx0ZXrWRz0VbU8jPjl4baqQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace app/{deepin-clone-ionice,deepin-clone-pkexec,deepin-clone.desktop,com.deepin.pkexec.deepin-clone.policy.tmp} \
|
||||
substituteInPlace app/{deepin-clone-ionice,deepin-clone-pkexec,com.deepin.pkexec.deepin-clone.policy.tmp} \
|
||||
--replace "/usr" "$out"
|
||||
|
||||
substituteInPlace app/src/corelib/ddevicediskinfo.cpp \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
|
|
@ -9,7 +8,6 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, polkit
|
||||
, python3
|
||||
, vala
|
||||
, wrapGAppsHook
|
||||
, editorconfig-core-c
|
||||
|
|
@ -28,24 +26,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-code";
|
||||
version = "7.0.0";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "code";
|
||||
rev = version;
|
||||
sha256 = "sha256-6ZOdlOCIDy5aWQre15+SrTH/vhY9OeTffY/uTSroELc=";
|
||||
sha256 = "sha256-Dtm0+NqDwfn5HUQEYtHTiyrpM3mHp1wUFOGaxH86YUo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix global search action disabled at startup
|
||||
# https://github.com/elementary/code/pull/1254
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/code/commit/1e75388b07c060cc10ecd612076f235b1833fab8.patch";
|
||||
sha256 = "sha256-8Djh1orMcmICdYwQFENJCaYlXK0E52NhCmuhlHCz7oM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
|
|
@ -53,7 +42,6 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
polkit # needed for ITS rules
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
|
@ -79,11 +67,6 @@ stdenv.mkDerivation rec {
|
|||
)
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,7 +10,10 @@
|
|||
, gtk3
|
||||
, libxml2
|
||||
, libhandy
|
||||
, libportal-gtk3
|
||||
, webkitgtk_4_1
|
||||
, elementary-gtk-theme
|
||||
, elementary-icon-theme
|
||||
, folks
|
||||
, glib-networking
|
||||
, granite
|
||||
|
|
@ -21,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-mail";
|
||||
version = "7.1.0";
|
||||
version = "7.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "mail";
|
||||
rev = version;
|
||||
sha256 = "sha256-dvDlvn8KvFmiP/NClRtHNEs5gPTUjlzgTYmgIaCfoLw=";
|
||||
sha256 = "sha256-hBOogZ9ZNS9KnuNn+jNhTtlupBxZL2DG/CiuBR1kFu0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -41,6 +44,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
elementary-icon-theme
|
||||
evolution-data-server
|
||||
folks
|
||||
glib-networking
|
||||
|
|
@ -48,6 +52,7 @@ stdenv.mkDerivation rec {
|
|||
gtk3
|
||||
libgee
|
||||
libhandy
|
||||
libportal-gtk3
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
|
|
@ -56,6 +61,15 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# The GTK theme is hardcoded.
|
||||
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
|
||||
# The icon theme is hardcoded.
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
||||
)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
|
|
@ -21,20 +20,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-security-privacy";
|
||||
version = "7.0.0";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-J3lUyLNyxlleD2jklXB2jMRvLY6WG5iccA2lIaJL3d4=";
|
||||
sha256 = "sha256-2eQ89FpEMF85UmqVu9FJUvSlaVGmsrRBnhAW7oUiUqg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
];
|
||||
|
||||
|
|
@ -51,11 +49,6 @@ stdenv.mkDerivation rec {
|
|||
zeitgeist
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -47,11 +47,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.19.11";
|
||||
version = "1.19.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${version}.src.tar.gz";
|
||||
hash = "sha256-4lyaty2BEUK39B/22lFl/sLRvl/uw+8sZrwL3stDFIk=";
|
||||
hash = "sha256-7l1Q4Kf9dLobE3y4eWCaqu+YgL9ytdF0IQDjiucrtVc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -5,11 +5,13 @@ mkCoqDerivation {
|
|||
owner = "snu-sf";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.13" "8.17"; out = "4.2.0"; }
|
||||
{ case = range "8.12" "8.17"; out = "4.1.2"; }
|
||||
{ case = range "8.9" "8.13"; out = "4.1.1"; }
|
||||
{ case = range "8.6" "8.13"; out = "4.0.2"; }
|
||||
{ case = isEq "8.5"; out = "1.2.8"; }
|
||||
] null;
|
||||
release."4.2.0".sha256 = "sha256-YHYtiz9hium96n3owL/C99AjJAFTlTCmmb2+ttevgMY=";
|
||||
release."4.1.2".sha256 = "sha256:1l8mwakqp4wnppsldl8wp2j24h1jvadnvrsgf35xnvdyygypjp2v";
|
||||
release."4.1.1".sha256 = "1qap8cyv649lr1s11r7h5jzdjd4hsna8kph15qy5fw24h5nx6byy";
|
||||
release."4.0.2".sha256 = "1q96bsxclqx84xn5vkid501jkwlc1p6fhb8szrlrp82zglj58b0b";
|
||||
|
|
|
|||
53
pkgs/development/libraries/mongocxx/default.nix
Normal file
53
pkgs/development/libraries/mongocxx/default.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, mongoc
|
||||
, cmake
|
||||
, validatePkgConfig
|
||||
, testers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mongocxx";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-cxx-driver";
|
||||
rev = "refs/tags/r${finalAttrs.version}";
|
||||
hash = "sha256-7pMVBWMIGV6k04/0rKULwNcl0NMO4hqMnOzWv+0/DrA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/bsoncxx/config/CMakeLists.txt \
|
||||
src/mongocxx/config/CMakeLists.txt \
|
||||
--replace "\\\''${prefix}/" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
validatePkgConfig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
mongoc
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_STANDARD=20"
|
||||
"-DBUILD_VERSION=${finalAttrs.version}"
|
||||
"-DENABLE_UNINSTALL=OFF"
|
||||
];
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The official C++ client library for MongoDB";
|
||||
homepage = "http://mongocxx.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ adriandole ];
|
||||
pkgConfigModules = [ "libmongocxx" "libbsoncxx" ];
|
||||
platforms = platforms.all;
|
||||
badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14
|
||||
};
|
||||
})
|
||||
|
|
@ -1,59 +1,98 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, cmake
|
||||
, python3Packages
|
||||
, libpng
|
||||
, zlib
|
||||
, eigen
|
||||
, protobuf
|
||||
, howard-hinnant-date
|
||||
, nlohmann_json
|
||||
, boost
|
||||
, oneDNN_2
|
||||
, Foundation
|
||||
, abseil-cpp
|
||||
, gtest
|
||||
, pythonSupport ? false
|
||||
, cmake
|
||||
, libpng
|
||||
, nlohmann_json
|
||||
, nsync
|
||||
, flatbuffers
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
, re2
|
||||
, zlib
|
||||
, microsoft-gsl
|
||||
, iconv
|
||||
, gtest
|
||||
, protobuf3_21
|
||||
, pythonSupport ? true
|
||||
}:
|
||||
|
||||
# Python Support
|
||||
#
|
||||
# When enabling Python support a wheel is made and stored in a `dist` output.
|
||||
# This wheel is then installed in a separate derivation.
|
||||
|
||||
assert pythonSupport -> lib.versionOlder protobuf.version "3.20";
|
||||
let
|
||||
howard-hinnant-date = fetchFromGitHub {
|
||||
owner = "HowardHinnant";
|
||||
repo = "date";
|
||||
rev = "v2.4.1";
|
||||
sha256 = "sha256-BYL7wxsYRI45l8C3VwxYIIocn5TzJnBtU0UZ9pHwwZw=";
|
||||
};
|
||||
|
||||
eigen = fetchFromGitLab {
|
||||
owner = "libeigen";
|
||||
repo = "eigen";
|
||||
rev = "d10b27fe37736d2944630ecd7557cefa95cf87c9";
|
||||
sha256 = "sha256-Lmco0s9gIm9sIw7lCr5Iewye3RmrHEE4HLfyzRkQCm0=";
|
||||
};
|
||||
|
||||
mp11 = fetchFromGitHub {
|
||||
owner = "boostorg";
|
||||
repo = "mp11";
|
||||
rev = "boost-1.79.0";
|
||||
sha256 = "sha256-ZxgPDLvpISrjpEHKpLGBowRKGfSwTf6TBfJD18yw+LM=";
|
||||
};
|
||||
|
||||
safeint = fetchFromGitHub {
|
||||
owner = "dcleblanc";
|
||||
repo = "safeint";
|
||||
rev = "ff15c6ada150a5018c5ef2172401cb4529eac9c0";
|
||||
sha256 = "sha256-PK1ce4C0uCR4TzLFg+elZdSk5DdPCRhhwT3LvEwWnPU=";
|
||||
};
|
||||
|
||||
pytorch_cpuinfo = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "cpuinfo";
|
||||
# There are no tags in the repository
|
||||
rev = "5916273f79a21551890fd3d56fc5375a78d1598d";
|
||||
sha256 = "sha256-nXBnloVTuB+AVX59VDU/Wc+Dsx94o92YQuHp3jowx2A=";
|
||||
};
|
||||
|
||||
flatbuffers = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "flatbuffers";
|
||||
rev = "v1.12.0";
|
||||
sha256 = "sha256-L1B5Y/c897Jg9fGwT2J3+vaXsZ+lfXnskp8Gto1p/Tg=";
|
||||
};
|
||||
|
||||
gtest' = gtest.overrideAttrs (oldAttrs: rec {
|
||||
version = "1.13.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "googletest";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ=";
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "onnxruntime";
|
||||
version = "1.13.1";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "onnxruntime";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-paaeq6QeiOzwiibbz0GkYZxEI/V80lvYNYTm6AuyAXQ=";
|
||||
sha256 = "sha256-SnHo2sVACc++fog7Tg6f2LK/Sv/EskFzN7RZS7D113s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use dnnl from nixpkgs instead of submodules
|
||||
(fetchpatch {
|
||||
name = "system-dnnl.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=9c392fb542979981fe0026e0fe3cc361a5f00a36";
|
||||
sha256 = "sha256-+kedzJHLFU1vMbKO9cn8fr+9A5+IxIuiqzOfR2AfJ0k=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3Packages.python
|
||||
gtest
|
||||
protobuf3_21
|
||||
] ++ lib.optionals pythonSupport (with python3Packages; [
|
||||
setuptools
|
||||
wheel
|
||||
|
|
@ -64,18 +103,26 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
libpng
|
||||
zlib
|
||||
howard-hinnant-date
|
||||
nlohmann_json
|
||||
boost
|
||||
oneDNN_2
|
||||
protobuf
|
||||
] ++ lib.optionals pythonSupport [
|
||||
nsync
|
||||
re2
|
||||
microsoft-gsl
|
||||
] ++ lib.optionals pythonSupport [
|
||||
python3Packages.numpy
|
||||
python3Packages.pybind11
|
||||
python3Packages.packaging
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Foundation
|
||||
iconv
|
||||
];
|
||||
|
||||
nativeCheckInputs = lib.optionals pythonSupport (with python3Packages; [
|
||||
gtest'
|
||||
pytest
|
||||
sympy
|
||||
onnx
|
||||
]);
|
||||
|
||||
# TODO: build server, and move .so's to lib output
|
||||
# Python's wheel is stored in a separate dist output
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals pythonSupport [ "dist" ];
|
||||
|
|
@ -85,15 +132,23 @@ stdenv.mkDerivation rec {
|
|||
cmakeDir = "../cmake";
|
||||
|
||||
cmakeFlags = [
|
||||
"-Donnxruntime_PREFER_SYSTEM_LIB=ON"
|
||||
"-Donnxruntime_BUILD_SHARED_LIB=ON"
|
||||
"-Donnxruntime_ENABLE_LTO=ON"
|
||||
"-Donnxruntime_BUILD_UNIT_TESTS=ON"
|
||||
"-Donnxruntime_USE_PREINSTALLED_EIGEN=ON"
|
||||
"-Donnxruntime_USE_MPI=ON"
|
||||
"-Deigen_SOURCE_PATH=${eigen.src}"
|
||||
"-DCMAKE_BUILD_TYPE=RELEASE"
|
||||
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
|
||||
"-DFETCHCONTENT_QUIET=OFF"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}"
|
||||
"-Donnxruntime_USE_DNNL=YES"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_DATE=${howard-hinnant-date}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_EIGEN=${eigen}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${flatbuffers}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_GOOGLE_NSYNC=${nsync.src}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_ONNX=${python3Packages.onnx.src}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}"
|
||||
"-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS"
|
||||
"-Donnxruntime_BUILD_SHARED_LIB=ON"
|
||||
"-Donnxruntime_BUILD_UNIT_TESTS=ON"
|
||||
"-Donnxruntime_ENABLE_LTO=ON"
|
||||
"-Donnxruntime_USE_FULL_PROTOBUF=OFF"
|
||||
] ++ lib.optionals pythonSupport [
|
||||
"-Donnxruntime_ENABLE_PYTHON=ON"
|
||||
];
|
||||
|
|
@ -103,6 +158,9 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
substituteInPlace cmake/libonnxruntime.pc.cmake.in \
|
||||
--replace '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
|
||||
'' + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") ''
|
||||
# https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
|
||||
rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc
|
||||
'';
|
||||
|
||||
postBuild = lib.optionalString pythonSupport ''
|
||||
|
|
@ -118,7 +176,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
inherit protobuf;
|
||||
protobuf = protobuf3_21;
|
||||
tests = lib.optionalAttrs pythonSupport {
|
||||
python = python3Packages.onnxruntime;
|
||||
};
|
||||
|
|
@ -140,6 +198,6 @@ stdenv.mkDerivation rec {
|
|||
# https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer puffnfresh ck3d ];
|
||||
maintainers = with maintainers; [ jonringer puffnfresh ck3d cbourjau ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
8307
pkgs/development/node-packages/node-packages.nix
generated
8307
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-compute";
|
||||
version = "30.0.0";
|
||||
version = "30.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-cyD7r8OSdwsD7QK2h2AYXmCUVS7ZjX/V6nchClpRPHg=";
|
||||
hash = "sha256-pWN525DU4kwHi8h0XQ5fdzIp+e8GfNcSwQ+qmIYVp1s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-objects";
|
||||
version = "0.24.0";
|
||||
version = "0.24.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yaKrG+PXrS9wwQcpEYGAGFp+xRYbhiWFE8PxUEXG52Y=";
|
||||
hash = "sha256-DpRnbvGF6HOCAcQ7HRf9x1bzrHHnL95Fz/TzpCosRZo=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, autoPatchelfHook
|
||||
, pythonRelaxDepsHook
|
||||
|
|
@ -7,6 +8,7 @@
|
|||
, numpy
|
||||
, packaging
|
||||
, oneDNN
|
||||
, re2
|
||||
|
||||
}:
|
||||
|
||||
|
|
@ -34,8 +36,9 @@ buildPythonPackage {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
pythonRelaxDepsHook
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
# This project requires fairly large dependencies such as sympy which we really don't always need.
|
||||
|
|
@ -48,6 +51,7 @@ buildPythonPackage {
|
|||
# Libraries are not linked correctly.
|
||||
buildInputs = [
|
||||
oneDNN
|
||||
re2
|
||||
onnxruntime.protobuf
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "opower";
|
||||
version = "0.0.15";
|
||||
version = "0.0.18";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hSwKdxtWgxJCdKk9tw7iCBC7I4buxbRfx4GRwyym6rg=";
|
||||
hash = "sha256-IlM4BPwZ42Bequs3edzP+iclOsHRf6bsDaaZOg+ynx4=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydata-google-auth";
|
||||
version = "1.8.0";
|
||||
version = "1.8.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "pydata";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PMQj+ySdin02MUBIumyW/PvCGqUhmloDCnBFJggd4I8=";
|
||||
hash = "sha256-Wo+tXbzOuz/cW8GuWoSxLA/Lr2S9NMdePa8tIV39mbY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.97.0";
|
||||
version = "1.97.1";
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ii8j1SBG+dGIBzh5fekvVjHhpkQnL84b5yYz6fSYyvo=";
|
||||
sha256 = "sha256-qEoSq4sLobsYYdwR8vp5WpugeQdLbXDtBVBTAztxPkY=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goa";
|
||||
version = "3.12.1";
|
||||
version = "3.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goadesign";
|
||||
repo = "goa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cQyBPg+3Sf2ABjRv3n9dVgMvhUpndNPUnOsRS4a+ABw=";
|
||||
sha256 = "sha256-OWYIfzJcR0V5GogVntzu5hOe3h3JO5FYWxSqYSxRp6A=";
|
||||
};
|
||||
vendorHash = "sha256-XQyE99o6notsinQv39JbxW0XG3FqlMoDfDJQ72U5GTA=";
|
||||
vendorHash = "sha256-Zt8Nzga9xRYuUv8ofCJa3yL2Kq+xvnqs3c0g2BnrgTo=";
|
||||
|
||||
subPackages = [ "cmd/goa" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsonpath";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v0ldek";
|
||||
repo = "rsonpath";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1fopV2qWbWoCH5cT3s6vLxNTv5LgBm8bug0MJ9p7NmU=";
|
||||
hash = "sha256-RRMT//OnwzoZEsOPZyHfQQbkphopZBI1u8xQe8LsPBo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4IFhUIP5MWNYoHoVi9tjRRzQrsdduiCnmVde5gctdsY=";
|
||||
cargoHash = "sha256-o9L6GUYDDm/WM8iD0k/OGf26w9O8DLH0jMr//ruKnrs=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, qtcharts, qtbase, wrapQtAppsHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, gdb, qtcharts, qtbase, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seer";
|
||||
|
|
@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
|
|||
cd src
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace src/{SeerGdbConfigPage,SeerMainWindow,SeerGdbWidget}.cpp \
|
||||
--replace "/usr/bin/gdb" "${gdb}/bin/gdb"
|
||||
'';
|
||||
|
||||
buildInputs = [ qtbase qtcharts ];
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.55";
|
||||
version = "0.9.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
hash = "sha256-RiQf2cbgAif1bGzjqUBcD+XhHApEp9aGOwnrzqGEOZ4=";
|
||||
hash = "sha256-vtKe0cl9PxZgc1zUJQI1YCQm4cRHmzqlBEC4RGUxM44=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0JSRgsr+9q/K3Pgh/8WXYCnV9DkM5oA8Pw9gJ61ktoM=";
|
||||
cargoHash = "sha256-o7nuDoBpSst84jyAVfrE8pLoYcKMF922r39G+gruBUo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
596
pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
generated
596
pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-shuttle";
|
||||
version = "0.21.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shuttle-hq";
|
||||
repo = "shuttle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tmFj1hqsAWeWOCmw1rELveK57uxMtCEkZygRjGm54IY=";
|
||||
hash = "sha256-mHmeNKr9Q/wIHO2G8xVOJTSr5myIzhXWl6R+SLEbDN8=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-sliding-sync";
|
||||
version = "0.99.4";
|
||||
version = "0.99.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "sliding-sync";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s7hQ4qCOhkNS8Mc2HZjFqedtj0KqXMAxVMZRIjPyvOA=";
|
||||
hash = "sha256-L2cWKPVclurOCpyQezHPB+5zYD91EREBXjRYBzjxkII=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-447P2TbBUEHmHubHiiZCrFVCj2/tmEuYFzLo27UyCk4=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "static-web-server";
|
||||
version = "2.20.1";
|
||||
version = "2.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "static-web-server";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-48pACFuknurqn97bRcAbyLSPs5OUyIgNU/jzYTwSRWg=";
|
||||
hash = "sha256-wC19wEQz/dQDJ+VKgCWhe3zYyxb4JrzmWENgdgSUGi0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-M6XWSzrw34AJI2HEHnqPARt/O4VSKgpwVGVyRI2Sods=";
|
||||
cargoHash = "sha256-q6rwbt4RdE69LxBSP8oDS/sI9Txr5R1tDSnvzQaZMmI=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
|
|
|||
|
|
@ -25,6 +25,10 @@ stdenv.mkDerivation {
|
|||
|
||||
sourceRoot = "source/src/cpp";
|
||||
|
||||
patches = [
|
||||
./fix-compilation-with-newer-onnxruntime.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr/local/include/onnxruntime" "${onnxruntime}"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
diff --git a/src/cpp/synthesize.hpp b/src/cpp/synthesize.hpp
|
||||
index ef61aef..4c7db7a 100644
|
||||
--- a/synthesize.hpp
|
||||
+++ b/synthesize.hpp
|
||||
@@ -119,11 +119,11 @@ void synthesize(SynthesisConfig &synthesisConfig, ModelSession &session,
|
||||
|
||||
// Clean up
|
||||
for (size_t i = 0; i < outputTensors.size(); i++) {
|
||||
- Ort::OrtRelease(outputTensors[i].release());
|
||||
+ Ort::detail::OrtRelease(outputTensors[i].release());
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < inputTensors.size(); i++) {
|
||||
- Ort::OrtRelease(inputTensors[i].release());
|
||||
+ Ort::detail::OrtRelease(inputTensors[i].release());
|
||||
}
|
||||
}
|
||||
} // namespace larynx
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gvproxy";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "gvisor-tap-vsock";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3WBL+ByYSiYKXzFkeoUnCxTdhvy3XxLKUHgJ2hO6oIo=";
|
||||
hash = "sha256-BCRUMAM/OeFf4gftYwLrRmeCkRGplYaF9QZ1ZI2YLLY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -5956,7 +5956,7 @@ with pkgs;
|
|||
online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools;
|
||||
|
||||
onnxruntime = callPackage ../development/libraries/onnxruntime {
|
||||
protobuf = protobuf3_19;
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
};
|
||||
|
||||
xkbd = callPackage ../applications/misc/xkbd { };
|
||||
|
|
@ -28990,6 +28990,9 @@ with pkgs;
|
|||
|
||||
fira-code = callPackage ../data/fonts/fira-code { };
|
||||
fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { };
|
||||
fira-code-nerdfont = nerdfonts.override {
|
||||
fonts = [ "FiraCode" ];
|
||||
};
|
||||
|
||||
fira-go = callPackage ../data/fonts/fira-go { };
|
||||
|
||||
|
|
@ -40078,6 +40081,8 @@ with pkgs;
|
|||
|
||||
mongoc = darwin.apple_sdk_11_0.callPackage ../development/libraries/mongoc { };
|
||||
|
||||
mongocxx = callPackage ../development/libraries/mongocxx/default.nix { };
|
||||
|
||||
mongoose = callPackage ../development/libraries/science/math/mongoose { };
|
||||
|
||||
morph = callPackage ../tools/package-management/morph { };
|
||||
|
|
|
|||
|
|
@ -126,7 +126,10 @@ let
|
|||
(lib.versionAtLeast self.coq.version "8.14") {
|
||||
compcert = self.compcert.override { version = "3.11"; };
|
||||
}) // (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") {
|
||||
ITree = self.ITree.override { version = "4.0.0"; };
|
||||
ITree = self.ITree.override {
|
||||
version = "4.0.0";
|
||||
paco = self.paco.override { version = "4.1.2"; };
|
||||
};
|
||||
}));
|
||||
zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {};
|
||||
filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self;
|
||||
|
|
|
|||
Loading…
Reference in a new issue