Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
23eaff7dae
39 changed files with 3764 additions and 1052 deletions
|
|
@ -6667,6 +6667,12 @@
|
|||
githubId = 54999;
|
||||
name = "Ariel Nunez";
|
||||
};
|
||||
ionutnechita = {
|
||||
email = "ionut_n2001@yahoo.com";
|
||||
github = "ionutnechita";
|
||||
githubId = 9405900;
|
||||
name = "Ionut Nechita";
|
||||
};
|
||||
iopq = {
|
||||
email = "iop_jr@yahoo.com";
|
||||
github = "iopq";
|
||||
|
|
|
|||
|
|
@ -341,6 +341,28 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
sqlite3 = super.sqlite3.overrideAttrs (old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ];
|
||||
|
||||
postBuild = ''
|
||||
pushd working/sqlite3
|
||||
make
|
||||
popd
|
||||
'';
|
||||
|
||||
postInstall = (old.postInstall or "") + "\n" + ''
|
||||
pushd source
|
||||
outd=$out/share/emacs/site-lisp/elpa/sqlite3-*
|
||||
install -m444 -t $outd sqlite3-api.so
|
||||
rm $outd/*.c $outd/*.h
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = old.meta // {
|
||||
maintainers = [ lib.maintainers.DamienCassou ];
|
||||
};
|
||||
});
|
||||
|
||||
libgit = super.libgit.overrideAttrs(attrs: {
|
||||
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ];
|
||||
buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -29,11 +29,11 @@ rec {
|
|||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "113.0b3";
|
||||
version = "113.0b4";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "52fe2551eac62c88366445e469f92471e6a00e5a1bce502dc10c2de8b94d170adc603ad53afad3083c38d4a9fa6f988883287882b26ba2d8709edb637769bced";
|
||||
sha512 = "8f6e10bc1a0de54aec1f9ea3f6de67a7bed0ee176e65147a4944baa7f30d63714a37d89fe9437973b73f8504a0d771a4ad57fff2c80857966239273c137acc6f";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -56,12 +56,12 @@ rec {
|
|||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "113.0b3";
|
||||
version = "113.0b4";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "e0efa46db05105dd747d6105a668263b006ef1651514526d18e8d1daa2787db6ef00f4ead12542b2eb9d2d35ba5caf6aa0dfc26569c66474d07c1053ebd1cdfa";
|
||||
sha512 = "d89ccceebf66b8aadbfd2d4cc7d57322f0484cfc6818b3cabae04b700d9b62145c597eadd645233b920db09ffdc7d5f19fb74b1b8b672ae1dfa63b6f2178ac15";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,231 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, makeWrapper
|
||||
, writeText
|
||||
|
||||
# Common run-time dependencies
|
||||
, zlib
|
||||
|
||||
# libxul run-time dependencies
|
||||
, atk
|
||||
, cairo
|
||||
, dbus
|
||||
, dbus-glib
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, libxcb
|
||||
, libX11
|
||||
, libXext
|
||||
, libXrender
|
||||
, libXt
|
||||
, libXtst
|
||||
, mesa
|
||||
, pango
|
||||
, pciutils
|
||||
|
||||
, libnotifySupport ? stdenv.isLinux
|
||||
, libnotify
|
||||
|
||||
, audioSupport ? mediaSupport
|
||||
, pulseaudioSupport ? mediaSupport
|
||||
, libpulseaudio
|
||||
, apulse
|
||||
, alsa-lib
|
||||
|
||||
# Media support (implies audio support)
|
||||
, mediaSupport ? true
|
||||
, ffmpeg
|
||||
|
||||
# Extra preferences
|
||||
, extraPrefs ? ""
|
||||
}:
|
||||
|
||||
let
|
||||
libPath = lib.makeLibraryPath (
|
||||
[
|
||||
alsa-lib
|
||||
atk
|
||||
cairo
|
||||
dbus
|
||||
dbus-glib
|
||||
fontconfig
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libxcb
|
||||
libX11
|
||||
libXext
|
||||
libXrender
|
||||
libXt
|
||||
libXtst
|
||||
mesa # for libgbm
|
||||
pango
|
||||
pciutils
|
||||
stdenv.cc.cc
|
||||
stdenv.cc.libc
|
||||
zlib
|
||||
] ++ lib.optionals libnotifySupport [ libnotify ]
|
||||
++ lib.optionals pulseaudioSupport [ libpulseaudio ]
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
tag = "mullvad-browser-102.9.0esr-12.0-2-build1";
|
||||
version = "12.0.4";
|
||||
lang = "ALL";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/mullvad/mullvad-browser/releases/download/${tag}/mullvad-browser-linux64-${version}_${lang}.tar.xz";
|
||||
hash = "sha256-q4dTKNQkcqaRwiF25iVOQSvwVLA3tJRlQ4DzC3tuG5A=";
|
||||
};
|
||||
};
|
||||
|
||||
distributionIni = writeText "distribution.ini" (lib.generators.toINI {} {
|
||||
# Some light branding indicating this build uses our distro preferences
|
||||
Global = {
|
||||
id = "nixos";
|
||||
version = "1.0";
|
||||
about = "Mullvad Browser for NixOS";
|
||||
};
|
||||
});
|
||||
|
||||
policiesJson = writeText "policies.json" (builtins.toJSON {
|
||||
policies.DisableAppUpdate = true;
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mullvad-browser";
|
||||
inherit version;
|
||||
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
|
||||
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
|
||||
desktopItems = [(makeDesktopItem {
|
||||
name = "mullvadbrowser";
|
||||
exec = "mullvad-browser %U";
|
||||
icon = "mullvad-browser";
|
||||
desktopName = "Mullvad Browser";
|
||||
genericName = "Web Browser";
|
||||
comment = meta.description;
|
||||
categories = [ "Network" "WebBrowser" "Security" ];
|
||||
})];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# For convenience ...
|
||||
MB_IN_STORE=$out/share/mullvad-browser
|
||||
|
||||
# Unpack & enter
|
||||
mkdir -p "$MB_IN_STORE"
|
||||
tar xf "$src" -C "$MB_IN_STORE" --strip-components=2
|
||||
pushd "$MB_IN_STORE"
|
||||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "mullvadbrowser.real"
|
||||
|
||||
# mullvadbrowser is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
|
||||
mv mullvadbrowser.real mullvadbrowser
|
||||
|
||||
# store state at `~/.mullvad` instead of relative to executable
|
||||
touch "$MB_IN_STORE/system-install"
|
||||
|
||||
# Add bundled libraries to libPath.
|
||||
libPath=${libPath}:$MB_IN_STORE
|
||||
|
||||
# apulse uses a non-standard library path. For now special-case it.
|
||||
${lib.optionalString (audioSupport && !pulseaudioSupport) ''
|
||||
libPath=${apulse}/lib/apulse:$libPath
|
||||
''}
|
||||
|
||||
# Prepare for autoconfig.
|
||||
#
|
||||
# See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
|
||||
cat >defaults/pref/autoconfig.js <<EOF
|
||||
//
|
||||
pref("general.config.filename", "mozilla.cfg");
|
||||
pref("general.config.obscure_value", 0);
|
||||
EOF
|
||||
|
||||
# Hard-coded Firefox preferences.
|
||||
cat >mozilla.cfg <<EOF
|
||||
// First line must be a comment
|
||||
|
||||
// Reset pref that captures store paths.
|
||||
clearPref("extensions.xpiState");
|
||||
|
||||
// Stop obnoxious first-run redirection.
|
||||
lockPref("noscript.firstRunRedirection", false);
|
||||
|
||||
// Allow sandbox access to sound devices if using ALSA directly
|
||||
${if (audioSupport && !pulseaudioSupport) then ''
|
||||
pref("security.sandbox.content.write_path_whitelist", "/dev/snd/");
|
||||
'' else ''
|
||||
clearPref("security.sandbox.content.write_path_whitelist");
|
||||
''}
|
||||
|
||||
${lib.optionalString (extraPrefs != "") ''
|
||||
${extraPrefs}
|
||||
''}
|
||||
EOF
|
||||
|
||||
# FONTCONFIG_FILE is required to make fontconfig read the MB
|
||||
# fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
|
||||
# indicates the system fonts.conf being used instead.
|
||||
FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf
|
||||
sed -i "$FONTCONFIG_FILE" \
|
||||
-e "s,<dir>fonts</dir>,<dir>$MB_IN_STORE/fonts</dir>,"
|
||||
|
||||
mkdir -p $out/bin
|
||||
|
||||
makeWrapper "$MB_IN_STORE/mullvadbrowser" "$out/bin/mullvad-browser" \
|
||||
--prefix LD_LIBRARY_PATH : "$libPath" \
|
||||
--set FONTCONFIG_FILE "$FONTCONFIG_FILE" \
|
||||
--set-default MOZ_ENABLE_WAYLAND 1
|
||||
|
||||
# Easier access to docs
|
||||
mkdir -p $out/share/doc
|
||||
ln -s $MB_IN_STORE/Data/Docs $out/share/doc/mullvad-browser
|
||||
|
||||
# Install icons
|
||||
for i in 16 32 48 64 128; do
|
||||
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/
|
||||
ln -s $out/share/mullvad-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/mullvad-browser.png
|
||||
done
|
||||
|
||||
# Check installed apps
|
||||
echo "Checking mullvad-browser wrapper ..."
|
||||
$out/bin/mullvad-browser --version >/dev/null
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Install distribution customizations
|
||||
install -Dvm644 ${distributionIni} $out/share/mullvad-browser/distribution/distribution.ini
|
||||
install -Dvm644 ${policiesJson} $out/share/mullvad-browser/distribution/policies.json
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad";
|
||||
homepage = "https://www.mullvad.net/en/browser";
|
||||
changelog = "https://github.com/mullvad/mullvad-browser/releases/tag/${tag}";
|
||||
platforms = attrNames srcs;
|
||||
maintainers = with maintainers; [ felschr ];
|
||||
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
|
||||
# the compound is "libre" in a strict sense (some components place certain
|
||||
# restrictions on redistribution), it's free enough for our purposes.
|
||||
license = with licenses; [ mpl20 lgpl21Plus lgpl3Plus free ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
@ -46,15 +46,16 @@
|
|||
, systemd
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, libqt5pas
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yandex-browser";
|
||||
version = "22.9.1.1110-1";
|
||||
version = "23.3.1.906-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb";
|
||||
sha256 = "sha256-u6pY7AmXgnkSVuko+PUyhDqY72i+UHv7qmePbu2wAf0=";
|
||||
sha256 = "sha256-hQwAHtPUcGSDKD7SmWa8H1f/T4Imu9061tIvenw0KWQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -106,6 +107,7 @@ stdenv.mkDerivation rec {
|
|||
nss
|
||||
pango
|
||||
stdenv.cc.cc.lib
|
||||
libqt5pas
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
@ -118,6 +120,7 @@ stdenv.mkDerivation rec {
|
|||
cp $TMP/ya/{usr/share,opt} $out/ -R
|
||||
substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/
|
||||
ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser
|
||||
ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser-beta
|
||||
'';
|
||||
|
||||
runtimeDependencies = map lib.getLib [
|
||||
|
|
@ -131,7 +134,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://browser.yandex.ru/";
|
||||
license = licenses.unfree;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ dan4ik605743 ];
|
||||
maintainers = with maintainers; [ dan4ik605743 ionutnechita ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
knownVulnerabilities = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib, stdenv, buildNpmPackage, fetchFromGitHub, copyDesktopItems
|
||||
, python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }:
|
||||
, python3, pipewire, libpulseaudio, xdg-utils, electron_24, makeDesktopItem }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "webcord";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpacingBat3";
|
||||
repo = "WebCord";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Buu7eKmI0UGV/9Kfj+urmDcjBtR9HSwW+mlHaYhfUa4=";
|
||||
sha256 = "sha256-530iWNvehImwSYt5HnZaqa4TAslrwxAOZi3gRm1K2/w=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-PeoOoEljbkHynjZwocCWCTyYvIvSE1gQiABUzIiXEdM=";
|
||||
npmDepsHash = "sha256-YguZtGn8CT4EqOQWS0GeNGBdZSC3Lj1gFR0ZiegWTJU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
|
@ -46,7 +46,7 @@ buildNpmPackage rec {
|
|||
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
|
||||
|
||||
# Add xdg-utils to path via suffix, per PR #181171
|
||||
makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \
|
||||
makeWrapper '${electron_24}/bin/electron' $out/bin/webcord \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
|
||||
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
|
||||
|
|
@ -73,6 +73,6 @@ buildNpmPackage rec {
|
|||
changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ huantian ];
|
||||
platforms = electron_22.meta.platforms;
|
||||
platforms = electron_24.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,11 +43,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mullvad-vpn";
|
||||
version = "2023.2";
|
||||
version = "2023.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
|
||||
sha256 = "sha256-3evIB8IW0bioRqtpAdCRQhDywu8xPMN1oxhqQGIBANY=";
|
||||
sha256 = "sha256-+XK9xUeSs93egmtsQ7qATug/n9taeQkmc4ZgObPYvn4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@ in
|
|||
sha256 = "sha256-ItmtZHDhCeLAVtN7K80dqyAh20o7TM4xk2sTb9QgHvk=";
|
||||
};
|
||||
z3_4_8 = common {
|
||||
version = "4.8.15";
|
||||
sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5";
|
||||
version = "4.8.17";
|
||||
sha256 = "sha256-BSwjgOU9EgCcm18Zx0P9mnoPc9ZeYsJwEu0ffnACa+8=";
|
||||
};
|
||||
z3_4_8_5 = common {
|
||||
tag = "Z3";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-gtk";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RdvoBs/QeBR032nMh79TLMGU6U7dsY6Ep+QKq4IKRTk=";
|
||||
sha256 = "sha256-eBclDq9Uiu5rA74tlBkOiP3fRwAZn84F3LPA2cKkuw8=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-qt";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-qt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/TDzjlB8rW/TorndcLbxY9pc3q7vY3M6eLxBRfnBs9Y=";
|
||||
hash = "sha256-9DT1U0iKj5C/Tc9MggEr/RwHhVr4GSOJQVhTiLFk9NY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -284,4 +284,8 @@ stdenvNoCC.mkDerivation (args // {
|
|||
} // args.passthru or { };
|
||||
|
||||
meta = (args.meta or { }) // { inherit platforms; };
|
||||
})
|
||||
}
|
||||
# ICU tries to unconditionally load files from /usr/share/icu on Darwin, which makes builds fail
|
||||
# in the sandbox, so disable ICU on Darwin. This, as far as I know, shouldn't cause any built packages
|
||||
# to behave differently, just the dotnet build tool.
|
||||
// lib.optionalAttrs stdenvNoCC.isDarwin { DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1; })
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaru";
|
||||
version = "22.10.3";
|
||||
version = "23.04.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu";
|
||||
repo = "yaru";
|
||||
rev = version;
|
||||
hash = "sha256-ZWt9I/Q5p6fAkheR6QlZI1DI/HL8bSNmHuO5+V3vunY=";
|
||||
hash = "sha256-8MtRYNJJVhZzE5Ds1HSk+Ej3FUD/z2hGZAsuCeGzWb4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
|
||||
|
|
|
|||
|
|
@ -13,12 +13,6 @@ stdenv.mkDerivation rec {
|
|||
updateScript = gnome.updateScript { packageName = "gnome-common"; attrPath = "gnome.gnome-common"; };
|
||||
};
|
||||
|
||||
patches = [(fetchurl {
|
||||
name = "gnome-common-patch";
|
||||
url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
|
||||
sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
|
||||
})];
|
||||
|
||||
propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -37,18 +37,8 @@ stdenv.mkDerivation rec {
|
|||
# submitted by Fedora on the GNOME Bugzilla
|
||||
# (https://bugzilla.gnome.org/787443). Upstream thinks the patch
|
||||
# could be merged, but dev can not make a new release.
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589";
|
||||
sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998";
|
||||
decode = "xz -d";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056";
|
||||
sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
|
||||
decode = "xz -d";
|
||||
})
|
||||
./patches/gnome_bugzilla_787443_359589_deepin.patch
|
||||
./patches/gnome_bugzilla_787443_361056_deepin.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,93 @@
|
|||
From 78636289b073d67209a20145ef0dc003f2d77db6 Mon Sep 17 00:00:00 2001
|
||||
From: Sian Cao <yinshuiboy@gmail.com>
|
||||
Date: Tue, 12 Apr 2016 11:36:51 +0800
|
||||
Subject: [PATCH 1/2] Add GL_ARB_shader_texture_lod support
|
||||
|
||||
The patch is used to do lod biased texturing. I can achieve
|
||||
faster blurring of images instead of using large blur radius.
|
||||
|
||||
---
|
||||
cogl/cogl-context.h | 1 +
|
||||
cogl/cogl-glsl-shader.c | 13 +++++++++++--
|
||||
cogl/cogl-types.h | 3 ++-
|
||||
cogl/driver/gl/gl/cogl-driver-gl.c | 7 +++++++
|
||||
4 files changed, 21 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cogl/cogl-context.h b/cogl/cogl-context.h
|
||||
index 07badeb..261ce49 100644
|
||||
--- a/cogl/cogl-context.h
|
||||
+++ b/cogl/cogl-context.h
|
||||
@@ -290,6 +290,7 @@ typedef enum _CoglFeatureID
|
||||
COGL_FEATURE_ID_PER_VERTEX_POINT_SIZE,
|
||||
COGL_FEATURE_ID_TEXTURE_RG,
|
||||
COGL_FEATURE_ID_BUFFER_AGE,
|
||||
+ COGL_FEATURE_ID_SHADER_TEXTURE_LOD,
|
||||
|
||||
/*< private >*/
|
||||
_COGL_N_FEATURE_IDS /*< skip >*/
|
||||
diff --git a/cogl/cogl-glsl-shader.c b/cogl/cogl-glsl-shader.c
|
||||
index 196e0c7..4fb0eb5 100644
|
||||
--- a/cogl/cogl-glsl-shader.c
|
||||
+++ b/cogl/cogl-glsl-shader.c
|
||||
@@ -87,8 +87,8 @@ _cogl_glsl_shader_set_source_with_boilerplate (CoglContext *ctx,
|
||||
const char *vertex_boilerplate;
|
||||
const char *fragment_boilerplate;
|
||||
|
||||
- const char **strings = g_alloca (sizeof (char *) * (count_in + 4));
|
||||
- GLint *lengths = g_alloca (sizeof (GLint) * (count_in + 4));
|
||||
+ const char **strings = g_alloca (sizeof (char *) * (count_in + 5));
|
||||
+ GLint *lengths = g_alloca (sizeof (GLint) * (count_in + 5));
|
||||
char *version_string;
|
||||
int count = 0;
|
||||
|
||||
@@ -111,6 +111,15 @@ _cogl_glsl_shader_set_source_with_boilerplate (CoglContext *ctx,
|
||||
lengths[count++] = sizeof (texture_3d_extension) - 1;
|
||||
}
|
||||
|
||||
+ if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_GL_PROGRAMMABLE) &&
|
||||
+ cogl_has_feature (ctx, COGL_FEATURE_ID_SHADER_TEXTURE_LOD))
|
||||
+ {
|
||||
+ static const char shader_texture_lod_ext[] =
|
||||
+ "#extension GL_ARB_shader_texture_lod : enable\n";
|
||||
+ strings[count] = shader_texture_lod_ext;
|
||||
+ lengths[count++] = sizeof (shader_texture_lod_ext) - 1;
|
||||
+ }
|
||||
+
|
||||
if (shader_gl_type == GL_VERTEX_SHADER)
|
||||
{
|
||||
strings[count] = vertex_boilerplate;
|
||||
diff --git a/cogl/cogl-types.h b/cogl/cogl-types.h
|
||||
index 6accf8d..77964c6 100644
|
||||
--- a/cogl/cogl-types.h
|
||||
+++ b/cogl/cogl-types.h
|
||||
@@ -470,7 +470,8 @@ typedef enum
|
||||
COGL_FEATURE_MAP_BUFFER_FOR_READ = (1 << 21),
|
||||
COGL_FEATURE_MAP_BUFFER_FOR_WRITE = (1 << 22),
|
||||
COGL_FEATURE_ONSCREEN_MULTIPLE = (1 << 23),
|
||||
- COGL_FEATURE_DEPTH_TEXTURE = (1 << 24)
|
||||
+ COGL_FEATURE_DEPTH_TEXTURE = (1 << 24),
|
||||
+ COGL_FEATURE_SHADER_TEXTURE_LOD = (1 << 25)
|
||||
} CoglFeatureFlags;
|
||||
|
||||
/**
|
||||
diff --git a/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/driver/gl/gl/cogl-driver-gl.c
|
||||
index 716d1dd..f305b6a 100644
|
||||
--- a/cogl/driver/gl/gl/cogl-driver-gl.c
|
||||
+++ b/cogl/driver/gl/gl/cogl-driver-gl.c
|
||||
@@ -568,6 +568,13 @@ _cogl_driver_update_features (CoglContext *ctx,
|
||||
COGL_FEATURE_ID_TEXTURE_RECTANGLE, TRUE);
|
||||
}
|
||||
|
||||
+ if (_cogl_check_extension ("GL_ARB_shader_texture_lod", gl_extensions))
|
||||
+ {
|
||||
+ flags |= COGL_FEATURE_SHADER_TEXTURE_LOD;
|
||||
+ COGL_FLAGS_SET (ctx->features,
|
||||
+ COGL_FEATURE_ID_SHADER_TEXTURE_LOD, TRUE);
|
||||
+ }
|
||||
+
|
||||
if (ctx->glTexImage3D)
|
||||
{
|
||||
flags |= COGL_FEATURE_TEXTURE_3D;
|
||||
--
|
||||
2.9.5
|
||||
|
||||
|
|
@ -0,0 +1,368 @@
|
|||
From d8b34ab0604d80d0be22b8b78e9aa6bf4fac7db0 Mon Sep 17 00:00:00 2001
|
||||
From: Sian Cao <yinshuiboy@gmail.com>
|
||||
Date: Thu, 27 Oct 2016 15:19:32 +0800
|
||||
Subject: [PATCH 2/2] texture: Support copy_sub_image
|
||||
|
||||
We need copy_sub_image to implement blurring effects of partial framebuffer
|
||||
contents as texture sources.
|
||||
|
||||
---
|
||||
cogl/cogl-atlas-texture.c | 1 +
|
||||
cogl/cogl-driver.h | 10 ++++++++
|
||||
cogl/cogl-sub-texture.c | 1 +
|
||||
cogl/cogl-texture-2d-sliced.c | 1 +
|
||||
cogl/cogl-texture-2d.c | 30 ++++++++++++++++++++++
|
||||
cogl/cogl-texture-3d.c | 1 +
|
||||
cogl/cogl-texture-private.h | 9 +++++++
|
||||
cogl/cogl-texture-rectangle.c | 1 +
|
||||
cogl/cogl-texture.c | 33 ++++++++++++++++++++++++
|
||||
cogl/cogl-texture.h | 9 +++++++
|
||||
cogl/driver/gl/cogl-texture-2d-gl-private.h | 9 +++++++
|
||||
cogl/driver/gl/cogl-texture-2d-gl.c | 39 +++++++++++++++++++++++++++++
|
||||
cogl/driver/gl/gl/cogl-driver-gl.c | 1 +
|
||||
cogl/driver/gl/gles/cogl-driver-gles.c | 1 +
|
||||
cogl/driver/nop/cogl-driver-nop.c | 1 +
|
||||
cogl/winsys/cogl-texture-pixmap-x11.c | 1 +
|
||||
16 files changed, 148 insertions(+)
|
||||
|
||||
diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl-atlas-texture.c
|
||||
index 1c8b569..e411302 100644
|
||||
--- a/cogl/cogl-atlas-texture.c
|
||||
+++ b/cogl/cogl-atlas-texture.c
|
||||
@@ -1027,6 +1027,7 @@ cogl_atlas_texture_vtable =
|
||||
FALSE, /* not primitive */
|
||||
_cogl_atlas_texture_allocate,
|
||||
_cogl_atlas_texture_set_region,
|
||||
+ NULL, /* copy_sub_image */
|
||||
NULL, /* get_data */
|
||||
_cogl_atlas_texture_foreach_sub_texture_in_region,
|
||||
_cogl_atlas_texture_get_max_waste,
|
||||
diff --git a/cogl/cogl-driver.h b/cogl/cogl-driver.h
|
||||
index 648228c..4a0aeaf 100644
|
||||
--- a/cogl/cogl-driver.h
|
||||
+++ b/cogl/cogl-driver.h
|
||||
@@ -192,6 +192,16 @@ struct _CoglDriverVtable
|
||||
int level,
|
||||
CoglError **error);
|
||||
|
||||
+ CoglBool
|
||||
+ (* texture_2d_copy_sub_image) (CoglTexture2D *tex_2d,
|
||||
+ GLint xoffset,
|
||||
+ GLint yoffset,
|
||||
+ GLint x,
|
||||
+ GLint y,
|
||||
+ GLsizei width,
|
||||
+ GLsizei height,
|
||||
+ CoglError **error);
|
||||
+
|
||||
/* Reads back the full contents of the given texture and write it to
|
||||
* @data in the given @format and with the given @rowstride.
|
||||
*
|
||||
diff --git a/cogl/cogl-sub-texture.c b/cogl/cogl-sub-texture.c
|
||||
index 7baf95e..0a16193 100644
|
||||
--- a/cogl/cogl-sub-texture.c
|
||||
+++ b/cogl/cogl-sub-texture.c
|
||||
@@ -460,6 +460,7 @@ cogl_sub_texture_vtable =
|
||||
FALSE, /* not primitive */
|
||||
_cogl_sub_texture_allocate,
|
||||
_cogl_sub_texture_set_region,
|
||||
+ NULL, /* copy_sub_image */
|
||||
NULL, /* get_data */
|
||||
_cogl_sub_texture_foreach_sub_texture_in_region,
|
||||
_cogl_sub_texture_get_max_waste,
|
||||
diff --git a/cogl/cogl-texture-2d-sliced.c b/cogl/cogl-texture-2d-sliced.c
|
||||
index e76bef6..b0b099f 100644
|
||||
--- a/cogl/cogl-texture-2d-sliced.c
|
||||
+++ b/cogl/cogl-texture-2d-sliced.c
|
||||
@@ -1526,6 +1526,7 @@ cogl_texture_2d_sliced_vtable =
|
||||
FALSE, /* not primitive */
|
||||
_cogl_texture_2d_sliced_allocate,
|
||||
_cogl_texture_2d_sliced_set_region,
|
||||
+ NULL, /* copy_sub_image */
|
||||
NULL, /* get_data */
|
||||
_cogl_texture_2d_sliced_foreach_sub_texture_in_region,
|
||||
_cogl_texture_2d_sliced_get_max_waste,
|
||||
diff --git a/cogl/cogl-texture-2d.c b/cogl/cogl-texture-2d.c
|
||||
index cc28cd9..d9ab188 100644
|
||||
--- a/cogl/cogl-texture-2d.c
|
||||
+++ b/cogl/cogl-texture-2d.c
|
||||
@@ -628,6 +628,35 @@ _cogl_texture_2d_set_region (CoglTexture *tex,
|
||||
}
|
||||
|
||||
static CoglBool
|
||||
+_cogl_texture_2d_copy_sub_image (CoglTexture *tex,
|
||||
+ GLint xoffset,
|
||||
+ GLint yoffset,
|
||||
+ GLint x,
|
||||
+ GLint y,
|
||||
+ GLsizei width,
|
||||
+ GLsizei height,
|
||||
+ CoglError **error)
|
||||
+{
|
||||
+ CoglContext *ctx = tex->context;
|
||||
+ CoglTexture2D *tex_2d = COGL_TEXTURE_2D (tex);
|
||||
+
|
||||
+ cogl_texture_allocate (tex, NULL); /* (abort on error) */
|
||||
+
|
||||
+ ctx->driver_vtable->texture_2d_copy_sub_image (tex_2d,
|
||||
+ xoffset,
|
||||
+ yoffset,
|
||||
+ x,
|
||||
+ y,
|
||||
+ width,
|
||||
+ height,
|
||||
+ error);
|
||||
+
|
||||
+ tex_2d->mipmaps_dirty = TRUE;
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+static CoglBool
|
||||
_cogl_texture_2d_get_data (CoglTexture *tex,
|
||||
CoglPixelFormat format,
|
||||
int rowstride,
|
||||
@@ -675,6 +704,7 @@ cogl_texture_2d_vtable =
|
||||
TRUE, /* primitive */
|
||||
_cogl_texture_2d_allocate,
|
||||
_cogl_texture_2d_set_region,
|
||||
+ _cogl_texture_2d_copy_sub_image,
|
||||
_cogl_texture_2d_get_data,
|
||||
NULL, /* foreach_sub_texture_in_region */
|
||||
_cogl_texture_2d_get_max_waste,
|
||||
diff --git a/cogl/cogl-texture-3d.c b/cogl/cogl-texture-3d.c
|
||||
index 8e2ff08..a59d386 100644
|
||||
--- a/cogl/cogl-texture-3d.c
|
||||
+++ b/cogl/cogl-texture-3d.c
|
||||
@@ -741,6 +741,7 @@ cogl_texture_3d_vtable =
|
||||
TRUE, /* primitive */
|
||||
_cogl_texture_3d_allocate,
|
||||
_cogl_texture_3d_set_region,
|
||||
+ NULL, /* copy_sub_image */
|
||||
_cogl_texture_3d_get_data,
|
||||
NULL, /* foreach_sub_texture_in_region */
|
||||
_cogl_texture_3d_get_max_waste,
|
||||
diff --git a/cogl/cogl-texture-private.h b/cogl/cogl-texture-private.h
|
||||
index 472c41d..34ff81c 100644
|
||||
--- a/cogl/cogl-texture-private.h
|
||||
+++ b/cogl/cogl-texture-private.h
|
||||
@@ -90,6 +90,15 @@ struct _CoglTextureVtable
|
||||
CoglBitmap *bitmap,
|
||||
CoglError **error);
|
||||
|
||||
+ CoglBool (* copy_sub_image) (CoglTexture *texture,
|
||||
+ GLint xoffset,
|
||||
+ GLint yoffset,
|
||||
+ GLint x,
|
||||
+ GLint y,
|
||||
+ GLsizei width,
|
||||
+ GLsizei height,
|
||||
+ CoglError **error);
|
||||
+
|
||||
/* This should copy the image data of the texture into @data. The
|
||||
requested format will have been first passed through
|
||||
ctx->texture_driver->find_best_gl_get_data_format so it should
|
||||
diff --git a/cogl/cogl-texture-rectangle.c b/cogl/cogl-texture-rectangle.c
|
||||
index 65d2f06..9f533c9 100644
|
||||
--- a/cogl/cogl-texture-rectangle.c
|
||||
+++ b/cogl/cogl-texture-rectangle.c
|
||||
@@ -761,6 +761,7 @@ cogl_texture_rectangle_vtable =
|
||||
TRUE, /* primitive */
|
||||
_cogl_texture_rectangle_allocate,
|
||||
_cogl_texture_rectangle_set_region,
|
||||
+ NULL, /* copy_sub_image */
|
||||
_cogl_texture_rectangle_get_data,
|
||||
NULL, /* foreach_sub_texture_in_region */
|
||||
_cogl_texture_rectangle_get_max_waste,
|
||||
diff --git a/cogl/cogl-texture.c b/cogl/cogl-texture.c
|
||||
index d93db22..1f4b43c 100644
|
||||
--- a/cogl/cogl-texture.c
|
||||
+++ b/cogl/cogl-texture.c
|
||||
@@ -514,6 +514,39 @@ cogl_texture_set_region (CoglTexture *texture,
|
||||
}
|
||||
|
||||
CoglBool
|
||||
+cogl_texture_copy_sub_image (CoglTexture *texture,
|
||||
+ int xoffset,
|
||||
+ int yoffset,
|
||||
+ int x,
|
||||
+ int y,
|
||||
+ size_t width,
|
||||
+ size_t height)
|
||||
+{
|
||||
+ CoglError *ignore_error = NULL;
|
||||
+ CoglBool status;
|
||||
+
|
||||
+ if (!texture->allocated)
|
||||
+ cogl_texture_allocate (texture, NULL);
|
||||
+
|
||||
+ if (!texture->vtable->copy_sub_image)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ status = texture->vtable->copy_sub_image (texture,
|
||||
+ xoffset,
|
||||
+ yoffset,
|
||||
+ x,
|
||||
+ y,
|
||||
+ width,
|
||||
+ height,
|
||||
+ &ignore_error);
|
||||
+
|
||||
+ if (!status)
|
||||
+ cogl_error_free (ignore_error);
|
||||
+ return status;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+CoglBool
|
||||
cogl_texture_set_data (CoglTexture *texture,
|
||||
CoglPixelFormat format,
|
||||
int rowstride,
|
||||
diff --git a/cogl/cogl-texture.h b/cogl/cogl-texture.h
|
||||
index 2718830..81657d1 100644
|
||||
--- a/cogl/cogl-texture.h
|
||||
+++ b/cogl/cogl-texture.h
|
||||
@@ -399,6 +399,15 @@ cogl_texture_set_region (CoglTexture *texture,
|
||||
unsigned int rowstride,
|
||||
const uint8_t *data);
|
||||
|
||||
+CoglBool
|
||||
+cogl_texture_copy_sub_image (CoglTexture *texture,
|
||||
+ int xoffset,
|
||||
+ int yoffset,
|
||||
+ int x,
|
||||
+ int y,
|
||||
+ size_t width,
|
||||
+ size_t height);
|
||||
+
|
||||
#if defined (COGL_ENABLE_EXPERIMENTAL_API)
|
||||
|
||||
/**
|
||||
diff --git a/cogl/driver/gl/cogl-texture-2d-gl-private.h b/cogl/driver/gl/cogl-texture-2d-gl-private.h
|
||||
index e5c6585..d2f9985 100644
|
||||
--- a/cogl/driver/gl/cogl-texture-2d-gl-private.h
|
||||
+++ b/cogl/driver/gl/cogl-texture-2d-gl-private.h
|
||||
@@ -109,6 +109,15 @@ _cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
|
||||
int dst_y,
|
||||
int level,
|
||||
CoglError **error);
|
||||
+CoglBool
|
||||
+_cogl_texture_2d_gl_copy_sub_image (CoglTexture2D *tex_2d,
|
||||
+ GLint xoffset,
|
||||
+ GLint yoffset,
|
||||
+ GLint x,
|
||||
+ GLint y,
|
||||
+ GLsizei width,
|
||||
+ GLsizei height,
|
||||
+ CoglError **error);
|
||||
|
||||
void
|
||||
_cogl_texture_2d_gl_get_data (CoglTexture2D *tex_2d,
|
||||
diff --git a/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/driver/gl/cogl-texture-2d-gl.c
|
||||
index 8675f52..bc15ac5 100644
|
||||
--- a/cogl/driver/gl/cogl-texture-2d-gl.c
|
||||
+++ b/cogl/driver/gl/cogl-texture-2d-gl.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <config.h>
|
||||
|
||||
#include <string.h>
|
||||
+#include <stdio.h>
|
||||
|
||||
#include "cogl-private.h"
|
||||
#include "cogl-texture-private.h"
|
||||
@@ -719,6 +720,44 @@ _cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
|
||||
return status;
|
||||
}
|
||||
|
||||
+CoglBool
|
||||
+_cogl_texture_2d_gl_copy_sub_image (CoglTexture2D *tex_2d,
|
||||
+ GLint xoffset,
|
||||
+ GLint yoffset,
|
||||
+ GLint x,
|
||||
+ GLint y,
|
||||
+ GLsizei width,
|
||||
+ GLsizei height,
|
||||
+ CoglError **error)
|
||||
+{
|
||||
+ CoglContext *ctx = COGL_TEXTURE (tex_2d)->context;
|
||||
+
|
||||
+ if (ctx->current_read_buffer == NULL)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ if (ctx->current_draw_buffer)
|
||||
+ _cogl_framebuffer_flush_journal (ctx->current_draw_buffer);
|
||||
+
|
||||
+ if (ctx->current_read_buffer != NULL &&
|
||||
+ ctx->current_read_buffer != ctx->current_draw_buffer)
|
||||
+ _cogl_framebuffer_flush_journal (ctx->current_read_buffer);
|
||||
+
|
||||
+ _cogl_bind_gl_texture_transient (GL_TEXTURE_2D,
|
||||
+ tex_2d->gl_texture,
|
||||
+ tex_2d->is_foreign);
|
||||
+
|
||||
+ ctx->glCopyTexSubImage2D (GL_TEXTURE_2D,
|
||||
+ 0,
|
||||
+ xoffset,
|
||||
+ yoffset,
|
||||
+ x,
|
||||
+ y,
|
||||
+ width,
|
||||
+ height);
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
void
|
||||
_cogl_texture_2d_gl_get_data (CoglTexture2D *tex_2d,
|
||||
CoglPixelFormat format,
|
||||
diff --git a/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/driver/gl/gl/cogl-driver-gl.c
|
||||
index f305b6a..f7f5020 100644
|
||||
--- a/cogl/driver/gl/gl/cogl-driver-gl.c
|
||||
+++ b/cogl/driver/gl/gl/cogl-driver-gl.c
|
||||
@@ -695,6 +695,7 @@ _cogl_driver_gl =
|
||||
_cogl_texture_2d_gl_get_gl_handle,
|
||||
_cogl_texture_2d_gl_generate_mipmap,
|
||||
_cogl_texture_2d_gl_copy_from_bitmap,
|
||||
+ _cogl_texture_2d_gl_copy_sub_image,
|
||||
_cogl_texture_2d_gl_get_data,
|
||||
_cogl_gl_flush_attributes_state,
|
||||
_cogl_clip_stack_gl_flush,
|
||||
diff --git a/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/driver/gl/gles/cogl-driver-gles.c
|
||||
index e94449f..f5ac771 100644
|
||||
--- a/cogl/driver/gl/gles/cogl-driver-gles.c
|
||||
+++ b/cogl/driver/gl/gles/cogl-driver-gles.c
|
||||
@@ -476,6 +476,7 @@ _cogl_driver_gles =
|
||||
_cogl_texture_2d_gl_get_gl_handle,
|
||||
_cogl_texture_2d_gl_generate_mipmap,
|
||||
_cogl_texture_2d_gl_copy_from_bitmap,
|
||||
+ _cogl_texture_2d_gl_copy_sub_image,
|
||||
NULL, /* texture_2d_get_data */
|
||||
_cogl_gl_flush_attributes_state,
|
||||
_cogl_clip_stack_gl_flush,
|
||||
diff --git a/cogl/driver/nop/cogl-driver-nop.c b/cogl/driver/nop/cogl-driver-nop.c
|
||||
index 53f5975..9d88955 100644
|
||||
--- a/cogl/driver/nop/cogl-driver-nop.c
|
||||
+++ b/cogl/driver/nop/cogl-driver-nop.c
|
||||
@@ -80,6 +80,7 @@ _cogl_driver_nop =
|
||||
_cogl_texture_2d_nop_get_gl_handle,
|
||||
_cogl_texture_2d_nop_generate_mipmap,
|
||||
_cogl_texture_2d_nop_copy_from_bitmap,
|
||||
+ NULL, /* texture_2d_copy_from_image */
|
||||
NULL, /* texture_2d_get_data */
|
||||
_cogl_nop_flush_attributes_state,
|
||||
_cogl_clip_stack_nop_flush,
|
||||
diff --git a/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/winsys/cogl-texture-pixmap-x11.c
|
||||
index 398c357..a44cdaf 100644
|
||||
--- a/cogl/winsys/cogl-texture-pixmap-x11.c
|
||||
+++ b/cogl/winsys/cogl-texture-pixmap-x11.c
|
||||
@@ -1164,6 +1164,7 @@ cogl_texture_pixmap_x11_vtable =
|
||||
FALSE, /* not primitive */
|
||||
_cogl_texture_pixmap_x11_allocate,
|
||||
_cogl_texture_pixmap_x11_set_region,
|
||||
+ NULL, /* copy_sub_image */
|
||||
_cogl_texture_pixmap_x11_get_data,
|
||||
_cogl_texture_pixmap_x11_foreach_sub_texture_in_region,
|
||||
_cogl_texture_pixmap_x11_get_max_waste,
|
||||
--
|
||||
2.9.5
|
||||
|
||||
|
|
@ -46,10 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
./patches/2.0-immodules.cache.patch
|
||||
./patches/gtk2-theme-paths.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
url = "https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776";
|
||||
sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
|
||||
})
|
||||
./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch
|
||||
./patches/2.0-darwin-x11.patch
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
From 8b822ab0060acdf4217f589411fe71574cbb09c0 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Trebbien <dtrebbien@gmail.com>
|
||||
Date: Fri, 3 Jul 2015 12:08:18 -0400
|
||||
Subject: [PATCH] quartz: Bug 557780 - Missing support for depth == 1 in
|
||||
gdk_image_new_for_depth()
|
||||
|
||||
When the gtk2 client of Freeciv is started, an assertion failure is seen
|
||||
immediately and the client stops:
|
||||
"Gdk:ERROR:gdkimage-quartz.c:325:_gdk_image_new_for_depth: assertion
|
||||
failed: (depth == 24 || depth == 32)"
|
||||
|
||||
In this case, _gdk_image_new_for_depth() is being called from
|
||||
_gdk_quartz_image_copy_to_image(). The GdkImage passed to this function
|
||||
is NULL so a new GdkImage is created. However, the depth of the passed
|
||||
GdkDrawable is 1 and this is passed directly as the `depth' parameter to
|
||||
_gdk_image_new_for_depth(), leading to the assertion failure.
|
||||
|
||||
In _gdk_quartz_image_copy_to_image(), rather than directly pass the
|
||||
GdkDrawable's depth to _gdk_image_new_for_depth(), if the depth is 1,
|
||||
then create the new GdkImage with depth 24. The case where the depth is
|
||||
1 is already handled in _gdk_quartz_image_copy_to_image().
|
||||
|
||||
This allows the Freeciv 2.5.0 gtk2 client to start and play a game.
|
||||
---
|
||||
gdk/quartz/gdkimage-quartz.c | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gdk/quartz/gdkimage-quartz.c b/gdk/quartz/gdkimage-quartz.c
|
||||
index 493efba..853ef61 100644
|
||||
--- a/gdk/quartz/gdkimage-quartz.c
|
||||
+++ b/gdk/quartz/gdkimage-quartz.c
|
||||
@@ -43,10 +43,15 @@ _gdk_quartz_image_copy_to_image (GdkDrawable *drawable,
|
||||
|
||||
screen = gdk_drawable_get_screen (drawable);
|
||||
if (!image)
|
||||
- image = _gdk_image_new_for_depth (screen, GDK_IMAGE_FASTEST, NULL,
|
||||
- width, height,
|
||||
- gdk_drawable_get_depth (drawable));
|
||||
-
|
||||
+ {
|
||||
+ gint drawable_depth = gdk_drawable_get_depth (drawable);
|
||||
+ if (drawable_depth == 1)
|
||||
+ drawable_depth = 24;
|
||||
+ image = _gdk_image_new_for_depth (screen, GDK_IMAGE_FASTEST, NULL,
|
||||
+ width, height,
|
||||
+ drawable_depth);
|
||||
+ }
|
||||
+
|
||||
if (GDK_IS_PIXMAP_IMPL_QUARTZ (drawable))
|
||||
{
|
||||
GdkPixmapImplQuartz *pix_impl;
|
||||
--
|
||||
2.3.2 (Apple Git-55)
|
||||
|
||||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqalculate";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Chjkpb0v+nzl63UWprEl+BB4+cFtXrLQzTELhf7u/KY=";
|
||||
sha256 = "sha256-GOVSNEnEl/oef54q88s+YuLyqPMLyx1eoX7DlWrmo2c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ogre";
|
||||
version = "13.6.3";
|
||||
version = "13.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OGRECave";
|
||||
repo = "ogre";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+A+GpS6kZREczX0oOETAQJ+smiFVAEzPMIskU/Vh/9U=";
|
||||
hash = "sha256-MSBWCO0s46t+ExWDdmqi16OxmcQXnduhgFt6I4BG1g8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -48177,7 +48177,6 @@ in lib.makeScope pkgs.newScope (self: {
|
|||
systems = [ "mcclim-bezier" ];
|
||||
lispLibs = [ (getAttr "clim" self) (getAttr "clim-pdf" self) (getAttr "clim-postscript" self) (getAttr "flexichain" self) (getAttr "mcclim-clx" self) (getAttr "mcclim-null" self) (getAttr "mcclim-render" self) ];
|
||||
meta = {
|
||||
broken = true;
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -579,6 +579,18 @@ let
|
|||
];
|
||||
};
|
||||
|
||||
polyclot = build-asdf-system {
|
||||
pname = "polyclot";
|
||||
version = "trunk";
|
||||
src = pkgs.fetchfossil {
|
||||
url = "https://fossil.turtleware.eu/polyclot";
|
||||
rev = "e678b3c3e002f53b446780406c9ed13f8451309d22a1dc50ced4dbeedf08a1ec";
|
||||
sha256 = "sha256-J08bU9HSVbzEivYtQsyIYPZJTrugj+jJSa4LglS0Olg=";
|
||||
};
|
||||
systems = [ "eu.turtleware.polyclot" "eu.turtleware.polyclot/demo" ];
|
||||
lispLibs = with super; [ clim mcclim mcclim-layouts ];
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
in packages
|
||||
|
|
|
|||
|
|
@ -203,6 +203,27 @@ let
|
|||
patches = [ ./patches/math-no-compile-time-directory.patch ];
|
||||
nativeLibs = [ pkgs.fontconfig ];
|
||||
});
|
||||
mcclim-fonts = super.mcclim-fonts.overrideLispAttrs (o: {
|
||||
lispLibs = o.lispLibs ++ [
|
||||
super.cl-dejavu
|
||||
super.zpb-ttf
|
||||
super.cl-vectors
|
||||
super.cl-paths-ttf
|
||||
super.flexi-streams
|
||||
];
|
||||
systems = [ "mcclim-fonts" "mcclim-fonts/truetype" ];
|
||||
});
|
||||
mcclim-render = super.mcclim-render.overrideLispAttrs (o: {
|
||||
lispLibs = o.lispLibs ++ [
|
||||
self.mcclim-fonts
|
||||
];
|
||||
});
|
||||
mcclim-layouts = super.mcclim-layouts.overrideLispAttrs (o: {
|
||||
systems = [ "mcclim-layouts" "mcclim-layouts/tab" ];
|
||||
lispLibs = o.lispLibs ++ [
|
||||
self.mcclim
|
||||
];
|
||||
});
|
||||
});
|
||||
|
||||
qlpkgs =
|
||||
|
|
|
|||
53
pkgs/development/ocaml-modules/uring/default.nix
Normal file
53
pkgs/development/ocaml-modules/uring/default.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, cstruct
|
||||
, dune-configurator
|
||||
, fetchurl
|
||||
, fmt
|
||||
, optint
|
||||
, mdx
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "uring";
|
||||
version = "0.5";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-multicore/ocaml-uring/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "106w7mabqihdhj4csk9jfqag220rwhqdp5lapn0xmw2035scvxvk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cstruct
|
||||
fmt
|
||||
optint
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dune-configurator
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mdx
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mdx.bin
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ocaml-multicore/ocaml-${pname}";
|
||||
changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/v${version}/CHANGES.md";
|
||||
description = "Bindings to io_uring for OCaml";
|
||||
license = with lib.licenses; [ isc mit ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ toastal ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "parsy";
|
||||
version = "1.4.0";
|
||||
version = "2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "parsy";
|
||||
owner = "python-parsy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FislrLb+u4T5m/eEER7kazZHJKEwPHe+Vg/YDJp4PyM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/Bu3xZUpXI4WiYJKKWTJTdSFq8pwC1PFDw0Kr8s3Fe8=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -30,7 +30,8 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/python-parsy/parsy";
|
||||
description = "Easy-to-use parser combinators, for parsing in pure Python";
|
||||
license = [ licenses.mit ];
|
||||
changelog = "https://github.com/python-parsy/parsy/blob/v${version}/docs/history.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ milibopp ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
68
pkgs/development/python-modules/pydruid/default.nix
Normal file
68
pkgs/development/python-modules/pydruid/default.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
# required dependencies
|
||||
, requests
|
||||
, setuptools
|
||||
# optional dependencies
|
||||
, pandas
|
||||
, tornado
|
||||
, sqlalchemy
|
||||
# test dependencies
|
||||
, pycurl
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydruid";
|
||||
version = "0.6.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "druid-io";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9+xomjSwWDVHkret/mqAZKWOPFRMvVB3CWtFPzrT81k=";
|
||||
};
|
||||
|
||||
# patch out the CLI because it doesn't work with newer versions of pygments
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace '"console_scripts": ["pydruid = pydruid.console:main"],' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pycurl
|
||||
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pydruid"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
optional-dependencies = {
|
||||
pandas = [ pandas ];
|
||||
async = [ tornado ];
|
||||
sqlalchemy = [ sqlalchemy ];
|
||||
# druid has a `cli` extra, but it doesn't work with nixpkgs pygments
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple API to create, execute, and analyze Druid queries";
|
||||
homepage = "https://github.com/druid-io/pydruid";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HrkSwaLBhjotQYkkpFpRF8NXgPAeugvINBSCKS2l2I4=";
|
||||
hash = "sha256-tv5f298MQepGuLPeqe4/7LtVZ77WjTOOZVEvde8ZbZQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
, bash
|
||||
, btrfs-progs
|
||||
, coreutils
|
||||
, linuxHeaders_5_19
|
||||
, python3Packages
|
||||
, util-linux
|
||||
, nixosTests
|
||||
|
|
@ -15,13 +14,13 @@ let
|
|||
|
||||
bees = stdenv.mkDerivation rec {
|
||||
pname = "bees";
|
||||
version = "0.8";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zygo";
|
||||
repo = "bees";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xBejyi/W8DLQmcicTqEQb5c4uZKu7jsLGjmWmW74t88=";
|
||||
sha256 = "sha256-krG8TzfOz3m7h3GfkBU+NJz7EdlXiWOOXY8bQRq9z4Q=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
371
pkgs/tools/misc/kalker/Cargo.lock
generated
371
pkgs/tools/misc/kalker/Cargo.lock
generated
|
|
@ -4,9 +4,9 @@ version = 3
|
|||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "0.7.15"
|
||||
version = "0.7.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
|
||||
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
|
@ -33,33 +33,27 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "az"
|
||||
version = "1.0.0"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e9bcd47d94aa4eb8c076b50fc61a75020789394ffb9bd74a180b3379130f6569"
|
||||
checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.2.1"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.4.0"
|
||||
version = "3.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
|
||||
checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.66"
|
||||
version = "1.0.79"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
|
|
@ -69,11 +63,11 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "console_error_panic_hook"
|
||||
version = "0.1.6"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
|
||||
checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
"cfg-if",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
|
|
@ -92,29 +86,29 @@ version = "2.0.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"cfg-if",
|
||||
"dirs-sys-next",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys"
|
||||
version = "0.3.6"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
|
||||
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users 0.4.0",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys-next"
|
||||
version = "0.1.1"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d"
|
||||
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users 0.3.5",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
|
|
@ -130,57 +124,48 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.1.15"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
|
||||
checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi 0.9.0+wasi-snapshot-preview1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"wasi 0.10.2+wasi-snapshot-preview1",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gmp-mpfr-sys"
|
||||
version = "1.4.7"
|
||||
source = "git+https://gitlab.com/tspiteri/gmp-mpfr-sys.git#21966f4bfb56c87d407eb14c72e92ef4e55856aa"
|
||||
version = "1.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b560063e2ffa8ce9c2ef9bf487f2944a97deca5b8de0b5bcd0ae6437ef8b75f"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.18"
|
||||
version = "0.1.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
|
||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.46"
|
||||
version = "0.3.61"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
|
||||
checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
|
||||
dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "kalk"
|
||||
version = "3.0.0"
|
||||
version = "3.0.3"
|
||||
dependencies = [
|
||||
"gmp-mpfr-sys",
|
||||
"lazy_static",
|
||||
"regex",
|
||||
"rug",
|
||||
|
|
@ -191,7 +176,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "kalker"
|
||||
version = "2.0.0"
|
||||
version = "2.0.3"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
|
|
@ -212,24 +197,24 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.81"
|
||||
version = "0.2.141"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
|
||||
checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.11"
|
||||
version = "0.4.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
|
||||
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.3.4"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
|
|
@ -239,86 +224,76 @@ checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
|
|||
dependencies = [
|
||||
"bitflags",
|
||||
"cc",
|
||||
"cfg-if 1.0.0",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.24"
|
||||
name = "once_cell"
|
||||
version = "1.17.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
|
||||
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.56"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
|
||||
dependencies = [
|
||||
"unicode-xid",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.7"
|
||||
version = "1.0.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
|
||||
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.1.57"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
|
||||
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.3.5"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
|
||||
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
|
||||
dependencies = [
|
||||
"getrandom 0.1.15",
|
||||
"redox_syscall 0.1.57",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
|
||||
dependencies = [
|
||||
"getrandom 0.2.3",
|
||||
"redox_syscall 0.2.10",
|
||||
"getrandom",
|
||||
"redox_syscall",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.4.2"
|
||||
version = "1.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
|
||||
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax",
|
||||
"thread_local",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.21"
|
||||
version = "0.6.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
|
||||
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||
|
||||
[[package]]
|
||||
name = "rug"
|
||||
version = "1.11.0"
|
||||
version = "1.19.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e538d00da450a8e48aac7e6322e67b2dc86ec71a1feeac0e3954c4f07f01bc45"
|
||||
checksum = "555e8b44763d034526db899c88cd56ccc4486cd38b444c8aa0e79d4e70ae5a34"
|
||||
dependencies = [
|
||||
"az",
|
||||
"gmp-mpfr-sys",
|
||||
|
|
@ -332,7 +307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "8227301bfc717136f0ecbd3d064ba8199e44497a0bdd46bb01ede4387cfd2cec"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if 1.0.0",
|
||||
"cfg-if",
|
||||
"dirs-next",
|
||||
"fs2",
|
||||
"libc",
|
||||
|
|
@ -348,9 +323,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "scoped-tls"
|
||||
version = "1.0.0"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
|
||||
checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
|
|
@ -360,131 +335,148 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
|||
|
||||
[[package]]
|
||||
name = "seahorse"
|
||||
version = "1.1.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce7d9440e2865cce0db733bdc530591b37d37a2d32badace34a1fc9ba5686d58"
|
||||
checksum = "8bee1fe454786f1d236a07cb3d3adcbaca96e9ba42d23bc58de059937bb059bd"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.118"
|
||||
version = "1.0.160"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
|
||||
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.54"
|
||||
version = "1.0.109"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-xid",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "test-case"
|
||||
version = "1.0.0"
|
||||
version = "1.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "199464148b42bcf3da8b2a56f6ee87ca68f47402496d1268849291ec9fb463c8"
|
||||
checksum = "e9e5f048404b43e8ae66dce036163515b6057024cf58c6377be501f250bd3c6a"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"syn 1.0.109",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thread_local"
|
||||
version = "1.0.1"
|
||||
name = "thiserror"
|
||||
version = "1.0.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
|
||||
checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.5.7"
|
||||
version = "0.5.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
|
||||
checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
version = "1.7.1"
|
||||
name = "unicode-ident"
|
||||
version = "1.0.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
|
||||
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
version = "1.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.8"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
|
||||
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
|
||||
[[package]]
|
||||
name = "utf8parse"
|
||||
version = "0.2.0"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
|
||||
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.2"
|
||||
version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
|
||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.9.0+wasi-snapshot-preview1"
|
||||
version = "0.11.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.69"
|
||||
version = "0.2.84"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
|
||||
checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"cfg-if",
|
||||
"wasm-bindgen-macro",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.69"
|
||||
version = "0.2.84"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
|
||||
checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"lazy_static",
|
||||
"log",
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"syn 1.0.109",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-futures"
|
||||
version = "0.4.19"
|
||||
version = "0.4.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
|
||||
checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"cfg-if",
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
"web-sys",
|
||||
|
|
@ -492,9 +484,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.69"
|
||||
version = "0.2.84"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
|
||||
checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
|
|
@ -502,28 +494,28 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.69"
|
||||
version = "0.2.84"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
|
||||
checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"syn 1.0.109",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.69"
|
||||
version = "0.2.84"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
|
||||
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-test"
|
||||
version = "0.3.19"
|
||||
version = "0.3.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0355fa0c1f9b792a09b6dcb6a8be24d51e71e6d74972f9eb4a44c4c004d24a25"
|
||||
checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b"
|
||||
dependencies = [
|
||||
"console_error_panic_hook",
|
||||
"js-sys",
|
||||
|
|
@ -535,9 +527,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-test-macro"
|
||||
version = "0.3.19"
|
||||
version = "0.3.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "27e07b46b98024c2ba2f9e83a10c2ef0515f057f2da299c1762a2017de80438b"
|
||||
checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -545,9 +537,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.46"
|
||||
version = "0.3.61"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
|
||||
checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
|
|
@ -576,10 +568,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "winres"
|
||||
version = "0.1.11"
|
||||
name = "windows-sys"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc"
|
||||
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.42.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
|
||||
|
||||
[[package]]
|
||||
name = "winres"
|
||||
version = "0.1.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
|
||||
dependencies = [
|
||||
"toml",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,31 +1,34 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, gcc
|
||||
, gmp, mpfr, libmpc
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, gmp
|
||||
, mpfr
|
||||
, libmpc
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kalker";
|
||||
version = "2.0.0";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PaddiM8";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D7FlX72fcbeVtQ/OtK2Y3P1hZ5Bmowa04up5rTTXDDU=";
|
||||
sha256 = "sha256-Pj3rcjEbUt+pnmbOZlv2JIvUhVdeiXYDKc5FED6qO7E=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"gmp-mpfr-sys-1.4.7" = "sha256-zHpGbEgh3MgAUVdlWrXq4Clj1boybi6DMOcsjgZbAh0=";
|
||||
};
|
||||
};
|
||||
|
||||
buildInputs = [ gmp mpfr libmpc ];
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput "lib" "$lib"
|
||||
'';
|
||||
|
|
@ -41,6 +44,6 @@ rustPlatform.buildRustPackage rec {
|
|||
variables, functions, derivation, integration, and complex numbers
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
maintainers = with maintainers; [ figsoda lovesegfault ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
1722
pkgs/tools/networking/zerotierone/Cargo.lock
generated
Normal file
1722
pkgs/tools/networking/zerotierone/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
|
||||
, buildPackages
|
||||
, iproute2
|
||||
|
|
@ -15,18 +14,32 @@
|
|||
|
||||
let
|
||||
pname = "zerotierone";
|
||||
version = "1.10.3";
|
||||
version = "1.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zerotier";
|
||||
repo = "ZeroTierOne";
|
||||
rev = version;
|
||||
sha256 = "sha256-MhkGcmt1YPvlePF54XsLVFUX+P979uUqhtJjudRx69g=";
|
||||
sha256 = "sha256-mapFKeF+8jMGkxSuHaw5oUdTdSQgAdxEwF/S6iyVLbY=";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"jwt-0.16.0" = "sha256-P5aJnNlcLe9sBtXZzfqHdRvxNfm6DPBcfcKOVeLZxcM=";
|
||||
};
|
||||
};
|
||||
postPatch = "cp ${./Cargo.lock} Cargo.lock";
|
||||
|
||||
preConfigure = ''
|
||||
cmp ./Cargo.lock ./zeroidc/Cargo.lock || {
|
||||
echo 1>&2 "Please make sure that the derivation's Cargo.lock is identical to ./zeroidc/Cargo.lock!"
|
||||
exit 1
|
||||
}
|
||||
|
||||
patchShebangs ./doc/build.sh
|
||||
substituteInPlace ./doc/build.sh \
|
||||
--replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \
|
||||
|
|
@ -34,17 +47,12 @@ in stdenv.mkDerivation {
|
|||
substituteInPlace ./make-linux.mk \
|
||||
--replace '-march=armv6zk' "" \
|
||||
--replace '-mcpu=arm1176jzf-s' ""
|
||||
|
||||
# Upstream does not define the cargo settings necessary to use the vendorized rust-jwt version, so it has to be added manually.
|
||||
# Can be removed once ZeroTierOne's zeroidc no longer uses a git url in Cargo.toml for jwt
|
||||
echo '[source."https://github.com/glimberg/rust-jwt"]
|
||||
git = "https://github.com/glimberg/rust-jwt"
|
||||
replace-with = "vendored-sources"' >> ./zeroidc/.cargo/config.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
ronn
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.rust.rustc
|
||||
];
|
||||
|
|
@ -79,6 +87,8 @@ replace-with = "vendored-sources"' >> ./zeroidc/.cargo/config.toml
|
|||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create flat virtual Ethernet networks of almost unlimited size";
|
||||
homepage = "https://www.zerotier.com";
|
||||
|
|
|
|||
7
pkgs/tools/networking/zerotierone/update.sh
Executable file
7
pkgs/tools/networking/zerotierone/update.sh
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
||||
version=$(curl --silent "https://api.github.com/repos/zerotier/ZeroTierOne/releases" | jq '.[0].tag_name' --raw-output)
|
||||
|
||||
curl --silent "https://raw.githubusercontent.com/zerotier/ZeroTierOne/$version/zeroidc/Cargo.lock" > "$(dirname "$0")/Cargo.lock"
|
||||
update-source-version zerotierone "$version"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, nix, fetchFromGitHub, makeWrapper }:
|
||||
{ lib, stdenv, nix, jq, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nixos-shell";
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/nixos-shell \
|
||||
--prefix PATH : ${lib.makeBinPath [ nix ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ nix jq ]}
|
||||
'';
|
||||
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
|
|
|||
|
|
@ -25227,6 +25227,8 @@ with pkgs;
|
|||
|
||||
mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { };
|
||||
|
||||
mullvad-browser = callPackage ../applications/networking/browsers/mullvad-browser { };
|
||||
|
||||
mycorrhiza = callPackage ../servers/mycorrhiza { };
|
||||
|
||||
napalm = with python3Packages; toPythonApplication (
|
||||
|
|
|
|||
|
|
@ -1624,6 +1624,8 @@ let
|
|||
|
||||
uri-sexp = callPackage ../development/ocaml-modules/uri/sexp.nix { };
|
||||
|
||||
uring = callPackage ../development/ocaml-modules/uring { };
|
||||
|
||||
utop = callPackage ../development/tools/ocaml/utop { };
|
||||
|
||||
uucd = callPackage ../development/ocaml-modules/uucd { };
|
||||
|
|
|
|||
|
|
@ -8202,6 +8202,8 @@ self: super: with self; {
|
|||
|
||||
pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };
|
||||
|
||||
pydruid = callPackage ../development/python-modules/pydruid { };
|
||||
|
||||
pydsdl = callPackage ../development/python-modules/pydsdl { };
|
||||
|
||||
pydub = callPackage ../development/python-modules/pydub { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue