mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
ee0290c232
2
.gitignore
vendored
2
.gitignore
vendored
@ -6,6 +6,8 @@
|
||||
.vscode/
|
||||
outputs/
|
||||
result-*
|
||||
result
|
||||
!pkgs/development/python-modules/result
|
||||
/doc/NEWS.html
|
||||
/doc/NEWS.txt
|
||||
/doc/manual.html
|
||||
|
||||
@ -30,7 +30,6 @@ let
|
||||
linux_5_4_hardened
|
||||
linux_5_10_hardened
|
||||
linux_5_15_hardened
|
||||
linux_5_18_hardened
|
||||
|
||||
linux_testing;
|
||||
};
|
||||
|
||||
@ -23,20 +23,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exaile";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exaile";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0s29lm0i4slgaw5l5s9a2zx0b83xac43rnil5cvyi210dxm5s048";
|
||||
sha256 = "sha256-GZyCuPy57NhGwgbLMrRKW5xmc1Udon7WtsrD4upviuQ=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/exaile/exaile/pull/751.patch";
|
||||
sha256 = "sha256-jCJh85Z3HQcyS4ntQP5HwYJgM7WNHcWzjf0BdNJitsM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
@ -76,7 +70,6 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional wikipediaSupport webkitgtk;
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
mox3
|
||||
pytest
|
||||
];
|
||||
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "headset";
|
||||
version = "4.0.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/headsetapp/headset-electron/releases/download/v${version}/headset_${version}_amd64.deb";
|
||||
hash = "sha256-M1HMZgYczZWFq0EGlCMEGOGUNoUcmq37J8Ycen72PhM=";
|
||||
hash = "sha256-81gsIq74sggauE6g8pM6z05KTmsbe49CZa9aRQEDwMo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mmlgui";
|
||||
version = "unstable-2022-05-24";
|
||||
version = "unstable-2022-09-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superctr";
|
||||
repo = "mmlgui";
|
||||
rev = "fe2b298c1eddae4cc38096f6c1ba1ccaed562cf1";
|
||||
rev = "163cc73a7c009d524b0d5aff94f9ed47fe19e3ce";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "Q34zzZthdThMbduXcc/qMome89mAMrn1Vinr073u4zo=";
|
||||
sha256 = "kKo3ge2wcDK2xU1YCfEwyqw84N+3jcbOEEsJHSpMpzY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fulcrum";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g80XL7dzq2Ed08zAcgBjrHfL1Qqxhr5sL9koaE4fl/I=";
|
||||
sha256 = "sha256-GaXXqIHuMTGn8iLymAhL8i0HzXmaO6RxtvIzgWw6QI0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
||||
@ -222,4 +222,44 @@ rec {
|
||||
export HOME=$TMPDIR
|
||||
${nvimWithLuaPackages}/bin/nvim -i NONE --noplugin -es
|
||||
'';
|
||||
|
||||
# nixpkgs should install optional packages in the opt folder
|
||||
nvim_with_opt_plugin = neovim.override {
|
||||
extraName = "-with-opt-plugin";
|
||||
configure.packages.opt-plugins = with pkgs.vimPlugins; {
|
||||
opt = [
|
||||
(dashboard-nvim.overrideAttrs(old: { pname = old.pname + "-unique-for-tests-please-dont-use-opt"; }))
|
||||
];
|
||||
};
|
||||
configure.customRC = ''
|
||||
" Load all autoloaded plugins
|
||||
packloadall
|
||||
|
||||
" Try to run Dashboard, and throw if it succeeds
|
||||
try
|
||||
Dashboard
|
||||
echo "Dashboard found, throwing error"
|
||||
cquit 1
|
||||
catch /^Vim\%((\a\+)\)\=:E492/
|
||||
echo "Dashboard not found"
|
||||
endtry
|
||||
|
||||
" Load Dashboard as an optional
|
||||
packadd dashboard-nvim-unique-for-tests-please-dont-use-opt
|
||||
|
||||
" Try to run Dashboard again, and throw if it fails
|
||||
try
|
||||
Dashboard
|
||||
echo "Dashboard found"
|
||||
catch /^Vim\%((\a\+)\)\=:E492/
|
||||
echo "Dashboard not found, throwing error"
|
||||
cquit 1
|
||||
endtry
|
||||
'';
|
||||
};
|
||||
|
||||
run_nvim_with_opt_plugin = runTest nvim_with_opt_plugin ''
|
||||
export HOME=$TMPDIR
|
||||
${nvim_with_opt_plugin}/bin/nvim -i NONE +quit! -e
|
||||
'';
|
||||
})
|
||||
|
||||
@ -170,8 +170,8 @@ let
|
||||
throw "The neovim legacy wrapper doesn't support configure.plug anymore, please setup your plugins via 'configure.packages' instead"
|
||||
else
|
||||
lib.flatten (lib.mapAttrsToList genPlugin (configure.packages or {}));
|
||||
genPlugin = packageName: {start ? [], opt?[]}:
|
||||
start ++ opt;
|
||||
genPlugin = packageName: {start ? [], opt ? []}:
|
||||
start ++ (map (p: { plugin = p; optional = true; }) opt);
|
||||
|
||||
res = makeNeovimConfig {
|
||||
inherit withPython3;
|
||||
|
||||
@ -116,7 +116,7 @@ in stdenv.mkDerivation (rec {
|
||||
makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
|
||||
'' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + ''
|
||||
mkdir -p "$out/share/applications"
|
||||
substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
|
||||
substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
|
||||
for directory in ''$${primaryBinary}/Icon/*; do
|
||||
size=$(basename $directory)
|
||||
mkdir -p "$out/share/icons/hicolor/$size/apps"
|
||||
|
||||
@ -11,9 +11,9 @@ in
|
||||
} {};
|
||||
|
||||
sublime4-dev = common {
|
||||
buildVersion = "4134";
|
||||
buildVersion = "4136";
|
||||
dev = true;
|
||||
x64sha256 = "rd3EG8e13FsPKihSM9qjUMRsEA6joMwVqhj1NZlwIaE=";
|
||||
aarch64sha256 = "gdfEDd2E1sew08sVmcmw21zyil8JuJJMpG2T/9Pi81E=";
|
||||
x64sha256 = "6cSaF8seS3XpXpoaROO5tpVuwJzE+z1kzwxNlOUadj0=";
|
||||
aarch64sha256 = "Mtib8i29FCFutRXmWPQSp9h/FcLD7+wv+tGAjwf9d3w=";
|
||||
} {};
|
||||
}
|
||||
|
||||
@ -245,12 +245,12 @@ final: prev:
|
||||
|
||||
Recover-vim = buildVimPluginFrom2Nix {
|
||||
pname = "Recover.vim";
|
||||
version = "2015-08-14";
|
||||
version = "2022-09-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisbra";
|
||||
repo = "Recover.vim";
|
||||
rev = "efa491f6121f65e025f42d79a93081abb8db69d4";
|
||||
sha256 = "17szim82bwnhf9q4n0n4jfmqkmhq6p0lh0j4y77a2x6lkn0pns5s";
|
||||
rev = "e61319bce3cd1004e5b695933296d8f267dd65a3";
|
||||
sha256 = "0hnww4a0vffgpj72qdhhsr28xdh219haldr6jd6my8mqy1rg3yq4";
|
||||
};
|
||||
meta.homepage = "https://github.com/chrisbra/Recover.vim/";
|
||||
};
|
||||
@ -4149,6 +4149,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/";
|
||||
};
|
||||
|
||||
lsp-overloads-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp-overloads.nvim";
|
||||
version = "2022-08-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Issafalcon";
|
||||
repo = "lsp-overloads.nvim";
|
||||
rev = "1258bfa3e21f5665b7a2c6c9b921a2ad8d8d8373";
|
||||
sha256 = "146pykcnpf9b8c4mqvs1q4wnp5jqg8i21as3gvjygwm5b71lxbky";
|
||||
};
|
||||
meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/";
|
||||
};
|
||||
|
||||
lsp-rooter-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp-rooter.nvim";
|
||||
version = "2021-08-13";
|
||||
|
||||
@ -347,6 +347,7 @@ https://github.com/ldelossa/litee-symboltree.nvim/,,
|
||||
https://github.com/ldelossa/litee.nvim/,,
|
||||
https://github.com/folke/lsp-colors.nvim/,,
|
||||
https://github.com/lukas-reineke/lsp-format.nvim/,HEAD,
|
||||
https://github.com/Issafalcon/lsp-overloads.nvim/,main,
|
||||
https://github.com/ahmedkhalf/lsp-rooter.nvim/,,
|
||||
https://github.com/nvim-lua/lsp-status.nvim/,,
|
||||
https://github.com/nvim-lua/lsp_extensions.nvim/,,
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolphin-emu";
|
||||
version = "5.0-16793";
|
||||
version = "5.0-17269";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
rev = "3cd82b619388d0877436390093a6edc2319a6904";
|
||||
sha256 = "sha256-0k+kmq/jkCy52wGcmvtwmnLxUfxk3k0mvsr5wfX8p30=";
|
||||
rev = "48c9c224cf9f82f0f9f2690b7cc6283d7448480c";
|
||||
sha256 = "sha256-WC3jukRygZigLx987CzRmOmJ7DeS1atXrMzU98sRzEg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_SHARED_ENET=ON"
|
||||
"-DENABLE_LTO=ON"
|
||||
"-DDOLPHIN_WC_REVISION=${src.rev}"
|
||||
"-DDOLPHIN_WC_DESCRIBE=${version}"
|
||||
"-DDOLPHIN_WC_BRANCH=master"
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cherrytree";
|
||||
version = "0.99.48";
|
||||
version = "0.99.49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giuspen";
|
||||
repo = "cherrytree";
|
||||
rev = version;
|
||||
sha256 = "sha256-mNWep+ZMQzb2PBHgzUKRpfMhP0ok1RZiuIoyH3P7+TI=";
|
||||
sha256 = "sha256-p7kiOxy4o0RwmN3LFfLSpkz08KcYYMVxVAEUvAX1KEA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
|
||||
}) rec {
|
||||
pname = "dbeaver";
|
||||
version = "22.1.5"; # When updating also update mvnSha256
|
||||
version = "22.2.0"; # When updating also update mvnSha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-KMrevQ37c84UD46XygKa0Q06qacJianoYqfe4j4MfEI=";
|
||||
sha256 = "sha256-T2S5qoOqjqJGf7M4h+IFO+bBER3aNcbxC7CY1fJFqpg=";
|
||||
};
|
||||
|
||||
mvnSha256 = "KVE+AYYEWN9bjAWop4mpiPq8yU3GdSGqOTmLG4pdflQ=";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-cGLtz5UPTIp0WfChKWdnrD4C+mGv+d83eHRrzpD7MIs=";
|
||||
sha256 = "sha256-JEPGCwC81nAIphinwD6qvrkipaHTs3/kroArgqht/fQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests yt-dlp ];
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moonlight-qt";
|
||||
version = "4.1.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-stream";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/HRmyf4sW8rsNmKMrlgPvq1L8gAEa6VRCyG2w5TfGkI=";
|
||||
sha256 = "sha256-cDX6XiAPFIS/csVpRl7yyAexiZwjmxp1Ng9gAo1uUw8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm
|
||||
index 0c98afc1..38c190a6 100644
|
||||
--- a/src/gui/src/OSXHelpers.mm
|
||||
+++ b/src/gui/src/OSXHelpers.mm
|
||||
@@ -20,10 +20,6 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreData/CoreData.h>
|
||||
#import <Cocoa/Cocoa.h>
|
||||
-#import <UserNotifications/UNNotification.h>
|
||||
-#import <UserNotifications/UNUserNotificationCenter.h>
|
||||
-#import <UserNotifications/UNNotificationContent.h>
|
||||
-#import <UserNotifications/UNNotificationTrigger.h>
|
||||
|
||||
#import <QtGlobal>
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 63764a75..46db60f4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -339,9 +339,6 @@ endif()
|
||||
# Apple has to use static libraries because
|
||||
# "Use of the Apple-provided OpenSSL libraries by apps is strongly discouraged."
|
||||
# https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html
|
||||
-if(APPLE OR DEFINED ENV{SYNERGY_STATIC_OPENSSL})
|
||||
- set(OPENSSL_USE_STATIC_LIBS TRUE)
|
||||
-endif()
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
#
|
||||
@ -1,7 +1,6 @@
|
||||
{ withGUI ? true
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
|
||||
@ -17,13 +16,16 @@
|
||||
, qttools
|
||||
, xlibsWrapper
|
||||
, libX11
|
||||
, libxkbfile
|
||||
, libXi
|
||||
, libXtst
|
||||
, libXrandr
|
||||
, libXinerama
|
||||
, xkeyboardconfig
|
||||
, xinput
|
||||
, avahi-compat
|
||||
|
||||
# macOS / darwin
|
||||
# MacOS / darwin
|
||||
, ApplicationServices
|
||||
, Carbon
|
||||
, Cocoa
|
||||
@ -33,39 +35,41 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "synergy";
|
||||
version = "1.14.1.32";
|
||||
version = "1.14.5.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symless";
|
||||
repo = "synergy-core";
|
||||
rev = "${version}-stable";
|
||||
rev = version;
|
||||
sha256 = "sha256-9B6KPa1TsS4khCf7ccmwQZJ1KDEuLNw/W0PScYCgtlE=";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "123p75rm22vb3prw1igh0yii2y4bvv7r18iykfvmnr41hh4w7z2p";
|
||||
};
|
||||
|
||||
patches = [ ./macos_build_fix.patch ];
|
||||
patches = [
|
||||
# Without this OpenSSL from nixpkgs is not detected
|
||||
./darwin-non-static-openssl.patch
|
||||
# We cannot include UserNotifications because of a build failure in the Apple SDK.
|
||||
# The functions used from it are already implicitly included anyways.
|
||||
./darwin-no-UserNotifications-includes.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/gui/src/SslCertificate.cpp \
|
||||
--replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \
|
||||
--replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
|
||||
'';
|
||||
|
||||
cmakeFlags = lib.optionals (!withGUI) [
|
||||
"-DSYNERGY_BUILD_LEGACY_GUI=OFF"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.09"
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
] ++ lib.optional withGUI wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
qttools # Used for translations even when not building the GUI
|
||||
openssl
|
||||
pcre
|
||||
] ++ lib.optionals withGUI [
|
||||
qttools
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
ApplicationServices
|
||||
Carbon
|
||||
@ -81,37 +85,57 @@ stdenv.mkDerivation rec {
|
||||
libXi
|
||||
libXtst
|
||||
libXrandr
|
||||
libXinerama
|
||||
libxkbfile
|
||||
xinput
|
||||
avahi-compat
|
||||
gdk-pixbuf
|
||||
libnotify
|
||||
];
|
||||
|
||||
# Silences many warnings
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override";
|
||||
|
||||
cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"
|
||||
++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.targetPlatform.darwinSdkVersion}";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
bin/unittests
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/
|
||||
'' + lib.optionalString withGUI ''
|
||||
cp bin/synergy $out/bin/
|
||||
wrapQtApp $out/bin/synergy
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
mkdir -p $out/share/icons/hicolor/scalable/apps
|
||||
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
|
||||
cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
|
||||
mkdir -p $out/share/applications
|
||||
substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin
|
||||
substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \
|
||||
--replace "/usr/bin" "$out/bin"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications/
|
||||
mv bundle/Synergy.app $out/Applications/
|
||||
mkdir -p $out/Applications
|
||||
cp -r bundle/Synergy.app $out/Applications
|
||||
ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = "bin/unittests";
|
||||
dontWrapQtApps = lib.optional (!withGUI) true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Share one mouse and keyboard between multiple computers";
|
||||
homepage = "https://symless.com/synergy";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ talyz ];
|
||||
platforms = platforms.all;
|
||||
changelog = "https://github.com/symless/synergy-core/blob/${version}/ChangeLog";
|
||||
mainProgram = lib.optionalString (!withGUI) "synergyc";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ talyz ivar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 50e712fa..d39c2ce4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -326,9 +326,6 @@ endif()
|
||||
# Apple has to use static libraries because
|
||||
# "Use of the Apple-provided OpenSSL libraries by apps is strongly discouraged."
|
||||
# https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html
|
||||
-if(APPLE)
|
||||
- set(OPENSSL_USE_STATIC_LIBS TRUE)
|
||||
-endif()
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
#
|
||||
diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm
|
||||
index 0c98afc1..38c190a6 100644
|
||||
--- a/src/gui/src/OSXHelpers.mm
|
||||
+++ b/src/gui/src/OSXHelpers.mm
|
||||
@@ -20,10 +20,6 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreData/CoreData.h>
|
||||
#import <Cocoa/Cocoa.h>
|
||||
-#import <UserNotifications/UNNotification.h>
|
||||
-#import <UserNotifications/UNUserNotificationCenter.h>
|
||||
-#import <UserNotifications/UNNotificationContent.h>
|
||||
-#import <UserNotifications/UNNotificationTrigger.h>
|
||||
|
||||
#import <QtGlobal>
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.12.18";
|
||||
version = "1.12.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FzJxYbDo0bVMHLo3XBCciS/N4Jx87tDP8SQttWNqkUc=";
|
||||
hash = "sha256-VQUet+KwVLltbISTnaUPElJBuTc0d2lKOA4yzhEn8tY=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
|
||||
@ -46,10 +46,10 @@ with lib;
|
||||
# Those pieces of software we entirely ignore upstream's handling of, and just
|
||||
# make sure they're in the path if desired.
|
||||
let
|
||||
k3sVersion = "1.24.4+k3s1"; # k3s git tag
|
||||
k3sCommit = "c3f830e9b9ed8a4d9d0e2aa663b4591b923a296e"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "00ns6n7jxnacah8ahndhgdb160prgsqhswbb5809kkgvig7k8b27";
|
||||
k3sVendorSha256 = "sha256-ReZvJCgxqffG2H39JlynGPUBSV5ngPkRtAoZ++OQZZI=";
|
||||
k3sVersion = "1.25.0+k3s1"; # k3s git tag
|
||||
k3sCommit = "26e9405767263a2915723cb72b1ffd7f50687a8f"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "0rk0svqx26rn6qlvvyj5rsqb87195h1qcf84qmmvf874qwszwpgh";
|
||||
k3sVendorSha256 = "sha256-YX/yLOLtDxGhRB4tic6oTli/qeeSnpP+f+S+sVXXDSs=";
|
||||
|
||||
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
|
||||
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
|
||||
@ -66,11 +66,11 @@ let
|
||||
|
||||
# taken from go.mod, the 'github.com/containerd/containerd' line
|
||||
# run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
|
||||
containerdVersion = "1.5.13-k3s1";
|
||||
containerdSha256 = "09bj4ghwbsj9whkv1d5icqs52k64m449j8b73dmak2wz62fbzbvp";
|
||||
containerdVersion = "1.5.13-k3s2";
|
||||
containerdSha256 = "1pfr2ji4aij9js90gf4a3hqnhyw5hshcjdccm62l700j68gs5z97";
|
||||
|
||||
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
|
||||
criCtlVersion = "1.24.0-k3s1";
|
||||
criCtlVersion = "1.25.0-k3s1";
|
||||
|
||||
baseMeta = {
|
||||
description = "A lightweight Kubernetes distribution";
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec{
|
||||
pname = "pinniped";
|
||||
version = "0.17.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "pinniped";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0h7zyKe2gmC1n9EB5FRVI/io7Yj+91ZAtLy+1u3gyO0=";
|
||||
sha256 = "sha256-VGvT0jj2f4+jiaPQkebL0GE+W4U8+RfSEsGr2sNBu2Q=";
|
||||
};
|
||||
|
||||
subPackages = "cmd/pinniped";
|
||||
|
||||
vendorSha256 = "sha256-8ohyyciL1ORYOxPu64W0jXASTv+vVZR8StutzbF9N4Y=";
|
||||
vendorSha256 = "sha256-7jQRUYJiRdYuAy3x+VPK4Nh5GF6ME7juloagm85oOVg=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rssguard";
|
||||
version = "4.2.3";
|
||||
version = "4.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinrotter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-s5SrQgu1PHNuuLeVKhLdFdLkxsPMFXGo09NBPe6/sv0=";
|
||||
sha256 = "sha256-6JRANTUbHyMAuA7lhAQtlgJIW6l39XNUtKQMVN6FHJU=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtwebengine qttools ];
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "linphone-desktop";
|
||||
version = "4.4.8";
|
||||
version = "4.4.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -41,7 +41,7 @@ mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-o/IyUvIthCrka6oTa0xMKg0sDj4zdon3kBr2gJ2Id8w=";
|
||||
sha256 = "sha256-xvKkFMZ7rUyEjnQK7rBkrzO8fhfHjpQ1DHQBUlizZ+o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20220825";
|
||||
version = "20220914-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dqP30or4UvtnzUW6r0FqQxt1S6Y61Q1CljpAFGq2gSM=";
|
||||
sha256 = "sha256-6tRIjOs6NZUQy7j5oePJ/9FuvfDhy3+uKq6CSuAi5hU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -46,13 +46,13 @@
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.9";
|
||||
minor = "7";
|
||||
minor = "8";
|
||||
patch = "0";
|
||||
}
|
||||
}:
|
||||
|
||||
let
|
||||
sourceSha256 = "sha256-6HEvQsV2JCkgNvBYsy1jfSTUIwEnrKJTzXNIVcPeWFQ=";
|
||||
sourceSha256 = "sha256-0umGUOjD5l84CBBeDy1uFgUyEDpI9o9/SEQ8BZm22j4=";
|
||||
featuresInfo = {
|
||||
# Needed always
|
||||
basic = {
|
||||
|
||||
@ -48,13 +48,13 @@
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.10";
|
||||
minor = "3";
|
||||
minor = "4";
|
||||
patch = "0";
|
||||
}
|
||||
}:
|
||||
|
||||
let
|
||||
sourceSha256 = "sha256-pH0nvZBUto9jXSN6fXD5vP1lIBwCMuFAvF2qT5dYsHU=";
|
||||
sourceSha256 = "sha256-Ov2NGiEj3mhqYwDYXWd6wcCAv78Ux2/LWyGjQ/ukQNk=";
|
||||
featuresInfo = {
|
||||
# Needed always
|
||||
basic = {
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "igv";
|
||||
version = "2.14.0";
|
||||
version = "2.14.1";
|
||||
src = fetchzip {
|
||||
url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
|
||||
sha256 = "sha256-CwS3I3xyjCHTvYik8YAN30UxM/djO6eEl/CRLMXDfxU=";
|
||||
sha256 = "sha256-IXUyMAhKyNMb7tINlr+9JmPlDRpHzgGS/SXo1Mz5o0Q=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gama";
|
||||
version = "2.21";
|
||||
version = "2.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-h+Mo+j/Kr7jmMY9fy4hHwn0FM1C9hMI7f7XY/xjBzHY=";
|
||||
sha256 = "sha256-jOyoWPcZvHWuddLasjIjHSn8MOV3viIgmBrsuzY7P6U=";
|
||||
};
|
||||
|
||||
buildInputs = [ expat ];
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [ dune_2 ] ++ (with ocamlPackages; [
|
||||
ocaml findlib ansiterminal cairo2 cmdliner_1_1 fmt logs menhir menhirLib mtime sedlex yojson
|
||||
ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime sedlex yojson
|
||||
]);
|
||||
|
||||
buildPhase = "dune build --profile=release";
|
||||
|
||||
@ -38,7 +38,7 @@ ocamlPackages.buildDunePackage {
|
||||
configureFlags = [ pname ];
|
||||
|
||||
nativeBuildInputs = [ which ocamlPackages.menhir ];
|
||||
buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner_1_1 ];
|
||||
buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ];
|
||||
|
||||
meta = {
|
||||
description = "High-performance theorem prover and SMT solver";
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fast-downward";
|
||||
version = "22.06.0";
|
||||
version = "22.06.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aibasel";
|
||||
repo = "downward";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-WzxLUuwZy+oNqmgj0n4Pe1QBYXXAaJqYhT+JSLbmyiM=";
|
||||
sha256 = "sha256-SBksyZoLR1MtyJUbGigGIbT72qVpN+nznU/bmJGYRz8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
|
||||
|
||||
@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-gone";
|
||||
version = "0.3.8";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "flausch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hKbq2rJwEZI3391RsZXsQSjjp7rSqglUckRDYAu42KE=";
|
||||
sha256 = "sha256-S9rNVWq1dbencp9Oy3eNPlJtBMdiFsiJnp5XvHi8hIw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-gBQ4V8Bwx6Di8aVnOYwx0UZZIIOFxZAXT7Tl1Yli0Fk=";
|
||||
cargoSha256 = "sha256-ZytIBdhyBp0p68ERlXNU8CnK9zYVZaBt/wn8F2bXlII=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-desktop";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb";
|
||||
sha256 = "sha256-7Sk2jDNZtOA04hkl/J+Up2yMGT8+FcXGPiUMcHhb7iY=";
|
||||
hash = "sha256-UQsMT4/D571xgrU8C4HBoRO+qf08GCGerA4Y5gHcjRc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -98,7 +98,7 @@ in stdenv.mkDerivation (rec {
|
||||
makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
|
||||
'' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + ''
|
||||
mkdir -p "$out/share/applications"
|
||||
substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
|
||||
substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
|
||||
for directory in ''$${primaryBinary}/Icon/*; do
|
||||
size=$(basename $directory)
|
||||
mkdir -p "$out/share/icons/hicolor/$size/apps"
|
||||
|
||||
@ -4,8 +4,8 @@ let
|
||||
common = opts: callPackage (import ./common.nix opts);
|
||||
in {
|
||||
sublime-merge = common {
|
||||
buildVersion = "2074";
|
||||
x64sha256 = "REo59Lpi0fmAOp0XJa4Iln3VKxR5kRiMpz2zfqz1MQs=";
|
||||
buildVersion = "2077";
|
||||
x64sha256 = "6xgh/oSatTYHCnQEXiZAoHs3yI1iimLMtzCosBKBVp8=";
|
||||
} {};
|
||||
|
||||
sublime-merge-dev = common {
|
||||
|
||||
@ -1,32 +1,39 @@
|
||||
{ lib, stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }:
|
||||
{ lib, stdenv, fetchgit, ocamlPackages, autoreconfHook, libxml2, pkg-config, getopt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "virt-top";
|
||||
version = "1.0.9";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.annexia.org/virt-top.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga";
|
||||
hash = "sha256-IKIkqzx7YWki0L6D5WbwQiVWJfDFGdI2nsGgg212CcE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "ocaml-libvirt-0.6.1.5-fix.patch";
|
||||
url = "http://git.annexia.org/?p=virt-top.git;a=patch;h=24a461715d5bce47f63cb0097606fc336230589f";
|
||||
sha256 = "15w7w9iggvlw8m9w8g4h08251wzb3m3zkb58glr7ifsgi3flbn61";
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
getopt
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt gettext-stub curses csv xml-light ];
|
||||
buildInputs = with ocamlPackages; [
|
||||
calendar
|
||||
curses
|
||||
findlib
|
||||
gettext-stub
|
||||
ocaml
|
||||
ocaml_libvirt
|
||||
] ++ [ libxml2 ];
|
||||
|
||||
buildPhase = "make opt";
|
||||
prePatch = ''
|
||||
substituteInPlace ocaml-dep.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
|
||||
substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A top-like utility for showing stats of virtualized domains";
|
||||
homepage = "https://people.redhat.com/~rjones/virt-top/";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -177,15 +177,15 @@ elif [[ "$oldHashAlgo" = "null" ]]; then
|
||||
fi
|
||||
|
||||
case "$oldHashAlgo" in
|
||||
# Lengths of hex-encoded hashes
|
||||
sha256) hashLength=64 ;;
|
||||
sha512) hashLength=128 ;;
|
||||
# Choose a temporary hash for given algorithm.
|
||||
# Not using all-zeroes hash, since that is sometimes
|
||||
# used for clean-up when updating multi-source packages.
|
||||
# Created by hashing “update-source-version” string.
|
||||
sha256) tempHash=AzH1rZFqEH8sovZZfJykvsEmCedEZWigQFHWHl6/PdE= ;;
|
||||
sha512) tempHash=KFj9Fvco4AuCgLJIGRnVzyssRf7VGP2oi5CkH6ADvj75ow3am3h8pxefOgQlO+i33Q/BBnG/ST/F7B/0BvWHxw== ;;
|
||||
*) die "Unhandled hash algorithm '$oldHashAlgo' in '$attr'!" ;;
|
||||
esac
|
||||
|
||||
# Make a temporary all-zeroes hash of $hashLength characters
|
||||
tempHash=$(printf '%0*d' "$hashLength" 0)
|
||||
|
||||
if [[ -n "$sri" ]]; then
|
||||
# SRI hashes only support base64
|
||||
# SRI hashes need to declare the hash type as part of the hash
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20220829";
|
||||
version = "20220903";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol-db";
|
||||
rev = version;
|
||||
sha256 = "sha256-mYKHFnFnfolcWqKRiyfmCBrrqwOXRjbYm1M08ltv5mI=";
|
||||
sha256 = "sha256-OmroJ2AEQdELE2Wuk1qPXzp+/9RUUULrEAdEpmXrJxw=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,18 +1,20 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell-extension-paperwm";
|
||||
version = "38.1";
|
||||
version = "38.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperwm";
|
||||
repo = "PaperWM";
|
||||
rev = version;
|
||||
sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Unhz2+MOygOog6B5sOLtYTpdeodQH+/CMI93gC5nDvI=";
|
||||
};
|
||||
|
||||
passthru.extensionUuid = "paperwm@hedning:matrix.org";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
@ -23,9 +25,12 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tiled scrollable window management for Gnome Shell";
|
||||
homepage = "https://github.com/paperwm/PaperWM";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ hedning ];
|
||||
description = "Tiled scrollable window management for Gnome Shell";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hedning AndersonTorres ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
passthru.extensionUuid = "paperwm@hedning:matrix.org";
|
||||
})
|
||||
|
||||
@ -6,7 +6,7 @@ import re
|
||||
import requests
|
||||
import sys
|
||||
|
||||
releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16")
|
||||
releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17")
|
||||
oses = ("mac", "linux")
|
||||
types = ("jre", "jdk")
|
||||
impls = ("hotspot", "openj9")
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
{ lib }:
|
||||
|
||||
let
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jre.hotspot; };
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
{ lib }:
|
||||
|
||||
let
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jre.hotspot; };
|
||||
}
|
||||
@ -793,6 +793,108 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"openjdk17": {
|
||||
"linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "8",
|
||||
"sha256": "302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
},
|
||||
"armv6l": {
|
||||
"build": "8",
|
||||
"sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
},
|
||||
"armv7l": {
|
||||
"build": "8",
|
||||
"sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
},
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "8",
|
||||
"sha256": "288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "8",
|
||||
"sha256": "6ef7a28d0d844fe347ab18f65a91db744547321fe8a101d883bd80722183ab64",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
},
|
||||
"armv6l": {
|
||||
"build": "8",
|
||||
"sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
},
|
||||
"armv7l": {
|
||||
"build": "8",
|
||||
"sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
},
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "8",
|
||||
"sha256": "292ed702d95f5690e52e171afe9f3050b9d2fb803456b155c831735fad0f17c0",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"mac": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "8",
|
||||
"sha256": "157518e999d712b541b883c6c167f8faabbef1d590da9fe7233541b4adb21ea4",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
},
|
||||
"packageType": "jdk",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "8",
|
||||
"sha256": "3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"build": "8",
|
||||
"sha256": "f2f23d6629060eb1692c714bfda27dd5f100cc560578c7cdd9df920a8ac1d453",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
},
|
||||
"packageType": "jre",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"build": "8",
|
||||
"sha256": "4e2e5e9c079ccc48b056959b2808a96398ebbc92d6b13ee5beb3159b89469aa8",
|
||||
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.2_8.tar.gz",
|
||||
"version": "17.0.2"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"openjdk8": {
|
||||
"linux": {
|
||||
"jdk": {
|
||||
|
||||
@ -40,7 +40,7 @@ let
|
||||
./read-truststore-from-env-jdk10.patch
|
||||
./currency-date-range-jdk10.patch
|
||||
./increase-javadoc-heap-jdk13.patch
|
||||
./ignore-LegalNoticeFilePlugin.patch
|
||||
./ignore-LegalNoticeFilePlugin-jdk17.patch
|
||||
./fix-library-path-jdk17.patch
|
||||
|
||||
# -Wformat etc. are stricter in newer gccs, per
|
||||
|
||||
167
pkgs/development/compilers/openjdk/18.nix
Normal file
167
pkgs/development/compilers/openjdk/18.nix
Normal file
@ -0,0 +1,167 @@
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
|
||||
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
|
||||
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
|
||||
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk18-bootstrap
|
||||
, setJavaClassPath
|
||||
, headless ? false
|
||||
, enableJavaFX ? openjfx.meta.available, openjfx
|
||||
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
|
||||
}:
|
||||
|
||||
let
|
||||
version = {
|
||||
feature = "18";
|
||||
build = "36";
|
||||
};
|
||||
|
||||
openjdk = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
version = "${version.feature}+${version.build}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jdk${version.feature}u";
|
||||
rev = "jdk-${version.feature}+${version.build}";
|
||||
sha256 = "sha256-yGPC8VA983Ml6Fv/oiEgRrcVe4oe+Q4oCHbzOmFbZq8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||
buildInputs = [
|
||||
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor libXrandr fontconfig openjdk18-bootstrap
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
gtk3 gnome_vfs GConf glib
|
||||
];
|
||||
|
||||
patches = [
|
||||
./fix-java-home-jdk10.patch
|
||||
./read-truststore-from-env-jdk10.patch
|
||||
./currency-date-range-jdk10.patch
|
||||
./increase-javadoc-heap-jdk13.patch
|
||||
./ignore-LegalNoticeFilePlugin-jdk18.patch
|
||||
|
||||
# -Wformat etc. are stricter in newer gccs, per
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
|
||||
# so grab the work-around from
|
||||
# https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
|
||||
(fetchurl {
|
||||
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
|
||||
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
|
||||
})
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
./swing-use-gtk-jdk13.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x configure
|
||||
patchShebangs --build configure
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boot-jdk=${openjdk18-bootstrap.home}"
|
||||
"--with-version-build=${version.build}"
|
||||
"--with-version-opt=nixos"
|
||||
"--with-version-pre="
|
||||
"--enable-unlimited-crypto"
|
||||
"--with-native-debug-symbols=internal"
|
||||
"--with-libjpeg=system"
|
||||
"--with-giflib=system"
|
||||
"--with-libpng=system"
|
||||
"--with-zlib=system"
|
||||
"--with-lcms=system"
|
||||
"--with-stdc++lib=dynamic"
|
||||
] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
|
||||
++ lib.optional headless "--enable-headless-only"
|
||||
++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
NIX_LDFLAGS = toString (lib.optionals (!headless) [
|
||||
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
|
||||
]);
|
||||
|
||||
# -j flag is explicitly rejected by the build system:
|
||||
# Error: 'make -jN' is not supported, use 'make JOBS=N'
|
||||
# Note: it does not make build sequential. Build system
|
||||
# still runs in parallel.
|
||||
enableParallelBuilding = false;
|
||||
|
||||
buildFlags = [ "images" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
|
||||
mv build/*/images/jdk $out/lib/openjdk
|
||||
|
||||
# Remove some broken manpages.
|
||||
rm -rf $out/lib/openjdk/man/ja*
|
||||
|
||||
# Mirror some stuff in top-level.
|
||||
mkdir -p $out/share
|
||||
ln -s $out/lib/openjdk/include $out/include
|
||||
ln -s $out/lib/openjdk/man $out/share/man
|
||||
|
||||
# IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
|
||||
ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
|
||||
|
||||
# jni.h expects jni_md.h to be in the header search path.
|
||||
ln -s $out/include/linux/*_md.h $out/include/
|
||||
|
||||
# Remove crap from the installation.
|
||||
rm -rf $out/lib/openjdk/demo
|
||||
${lib.optionalString headless ''
|
||||
rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
|
||||
''}
|
||||
|
||||
ln -s $out/lib/openjdk/bin $out/bin
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# Propagate the setJavaClassPath setup hook so that any package
|
||||
# that depends on the JDK has $CLASSPATH set up properly.
|
||||
mkdir -p $out/nix-support
|
||||
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
|
||||
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
mkdir -p $out/nix-support
|
||||
cat <<EOF > $out/nix-support/setup-hook
|
||||
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
|
||||
EOF
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Build the set of output library directories to rpath against
|
||||
LIBDIRS=""
|
||||
for output in $outputs; do
|
||||
if [ "$output" = debug ]; then continue; fi
|
||||
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
|
||||
done
|
||||
# Add the local library paths to remove dependencies on the bootstrap
|
||||
for output in $outputs; do
|
||||
if [ "$output" = debug ]; then continue; fi
|
||||
OUTPUTDIR=$(eval echo \$$output)
|
||||
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
|
||||
echo "$BINLIBS" | while read i; do
|
||||
patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
|
||||
patchelf --shrink-rpath "$i" || true
|
||||
done
|
||||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk18-bootstrap ];
|
||||
|
||||
meta = import ./meta.nix lib version.feature;
|
||||
|
||||
passthru = {
|
||||
architecture = "";
|
||||
home = "${openjdk}/lib/openjdk";
|
||||
inherit gtk3;
|
||||
};
|
||||
};
|
||||
in openjdk
|
||||
81
pkgs/development/compilers/openjdk/darwin/18.nix
Normal file
81
pkgs/development/compilers/openjdk/darwin/18.nix
Normal file
@ -0,0 +1,81 @@
|
||||
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
|
||||
let
|
||||
# Details from https://www.azul.com/downloads/?version=java-18-sts&os=macos&package=jdk
|
||||
# Note that the latest build may differ by platform
|
||||
dist = {
|
||||
x86_64-darwin = {
|
||||
arch = "x64";
|
||||
zuluVersion = "18.28.13";
|
||||
jdkVersion = "18.0.0";
|
||||
sha256 = "0hc5m3d4q3n7sighq3pxkdg93vsrgj1kzla1py9nfnm9pnj9l2kq";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
arch = "aarch64";
|
||||
zuluVersion = "18.28.13";
|
||||
jdkVersion = "18.0.0";
|
||||
sha256 = "0ch4jp2d4pjvxbmbswvjwf7w2flajrvjg5f16ggiy80y8l0y15cm";
|
||||
};
|
||||
}."${stdenv.hostPlatform.system}";
|
||||
|
||||
jce-policies = fetchurl {
|
||||
# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
|
||||
url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
|
||||
sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
|
||||
};
|
||||
|
||||
jdk = stdenv.mkDerivation rec {
|
||||
pname = "zulu${dist.zuluVersion}-ca-jdk";
|
||||
version = dist.jdkVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
|
||||
inherit (dist) sha256;
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
mv * $out
|
||||
|
||||
unzip ${jce-policies}
|
||||
mv -f ZuluJCEPolicies/*.jar $out/lib/security/
|
||||
|
||||
# jni.h expects jni_md.h to be in the header search path.
|
||||
ln -s $out/include/darwin/*_md.h $out/include/
|
||||
|
||||
if [ -f $out/LICENSE ]; then
|
||||
install -D $out/LICENSE $out/share/zulu/LICENSE
|
||||
rm $out/LICENSE
|
||||
fi
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# Propagate the setJavaClassPath setup hook from the JDK so that
|
||||
# any package that depends on the JDK has $CLASSPATH set up
|
||||
# properly.
|
||||
mkdir -p $out/nix-support
|
||||
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
cat <<EOF >> $out/nix-support/setup-hook
|
||||
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
|
||||
EOF
|
||||
'';
|
||||
|
||||
# fixupPhase is moving the man to share/man which breaks it because it's a
|
||||
# relative symlink.
|
||||
postFixup = ''
|
||||
ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
home = jdk;
|
||||
};
|
||||
|
||||
meta = import ./meta.nix lib version;
|
||||
};
|
||||
in
|
||||
jdk
|
||||
@ -0,0 +1,21 @@
|
||||
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
|
||||
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
|
||||
@@ -112,18 +112,6 @@
|
||||
.filter(e -> Arrays.equals(e.contentBytes(), entry.contentBytes()))
|
||||
.findFirst();
|
||||
if (otarget.isEmpty()) {
|
||||
- if (errorIfNotSameContent) {
|
||||
- // all legal notices of the same file name are expected
|
||||
- // to contain the same content
|
||||
- Optional<ResourcePoolEntry> ores =
|
||||
- entries.stream().filter(e -> e.linkedTarget() == null)
|
||||
- .findAny();
|
||||
-
|
||||
- if (ores.isPresent()) {
|
||||
- throw new PluginException(ores.get().path() + " " +
|
||||
- entry.path() + " contain different content");
|
||||
- }
|
||||
- }
|
||||
entries.add(entry);
|
||||
} else {
|
||||
entries.add(ResourcePoolEntry.createSymLink(entry.path(),
|
||||
@ -7,11 +7,12 @@ mkCoqDerivation rec {
|
||||
domain = "gitlab.inria.fr";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.8" "8.15"; out = "4.5.1"; }
|
||||
{ case = range "8.8" "8.16"; out = "4.5.2"; }
|
||||
{ case = range "8.8" "8.12"; out = "4.0.0"; }
|
||||
{ case = range "8.7" "8.11"; out = "3.4.2"; }
|
||||
{ case = range "8.5" "8.6"; out = "3.3.0"; }
|
||||
] null;
|
||||
release."4.5.2".sha256 = "sha256-r0yE9pkC4EYlqsimxkdlCXevRcwKa3HGFZiUH+ueUY8=";
|
||||
release."4.5.1".sha256 = "sha256-5OxbSPdw/1FFENubulKSk6fEIEYSPCxfvMMgtgN6j6s=";
|
||||
release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko=";
|
||||
release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE=";
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appstream";
|
||||
version = "0.15.2";
|
||||
version = "0.15.5";
|
||||
# When bumping this package, please also check whether
|
||||
# fix-build-for-qt-olderthan-514.patch still applies by
|
||||
# building libsForQt512.appstream-qt.
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "ximion";
|
||||
repo = "appstream";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/JZ49wjtcInbGUOVVjevVSrLCHcA60FMT165rhfb78Q=";
|
||||
sha256 = "sha256-KVZCtu1w5FMgXZMiSW55rbrI6W/A9zWWKKvACtk/jjk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coordgenlibs";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schrodinger";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iy5VFp+50ldyoGJtPI1w3VfndIAGwBb1Xh6Qp18q/wU=";
|
||||
sha256 = "sha256-u8UmJ4bu00t7qxiNZ3nL7cd+8AIC0LoICj5FNPboCTQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -17,29 +17,15 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pQ/t26dv9ZWLl0MHcAn0sgxryW2T2hM8XyOkXyfC5CY=";
|
||||
sha256 = "sha256-dU8JXb++8OMEokr+4OyxLvcEc0vmdBvKDLxjeaWNkq0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./version.patch
|
||||
(fetchpatch {
|
||||
name = "fix-tpce-test.patch";
|
||||
url = "https://github.com/duckdb/duckdb/commit/82e13a4bb9f0683af6c52468af2fb903cce4286d.patch";
|
||||
sha256 = "sha256-m0Bs0DOJQtkadbKZKk88NHyBFJkjxXUsiWYciuRIJLU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-list-type-metadata.patch";
|
||||
url = "https://github.com/duckdb/duckdb/commit/26d123fdc57273903573c72b1ddafc52f365e378.patch";
|
||||
sha256 = "sha256-ttqs5EjeSLhZQOXc43Y5/N5IYSESQTD1FZWV1uJ15Fo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}"
|
||||
'';
|
||||
@ -52,8 +38,6 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_JSON_EXTENSION=ON"
|
||||
"-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
|
||||
"-DBUILD_PARQUET_EXTENSION=ON"
|
||||
"-DBUILD_REST=ON"
|
||||
"-DBUILD_SUBSTRAIT_EXTENSION=ON"
|
||||
"-DBUILD_TPCDS_EXTENSION=ON"
|
||||
"-DBUILD_TPCE=ON"
|
||||
"-DBUILD_TPCH_EXTENSION=ON"
|
||||
@ -63,7 +47,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
preInstallCheck = lib.optionalString stdenv.isDarwin ''
|
||||
preInstallCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
export DYLD_LIBRARY_PATH="$out/lib''${DYLD_LIBRARY_PATH:+:}''${DYLD_LIBRARY_PATH}"
|
||||
'';
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "egl-wayland";
|
||||
version = "1.1.10";
|
||||
version = "1.1.11";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "Nvidia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dbcEMtPnzF2t7O8YtKVUGSvJqb5WPMmmW+SyqOFnDY4=";
|
||||
sha256 = "sha256-xb0d8spr4GoGZl/8C8BoPMPN7PAlzuQV11tEJbOQQ4U=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblouis";
|
||||
version = "3.22.0";
|
||||
version = "3.23.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" "info" "doc" ];
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "liblouis";
|
||||
repo = "liblouis";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=";
|
||||
sha256 = "sha256-jXNhHzydWaMhFbEKoFHyZ77GCvAqxyT3P0xIAgFlTzY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libltc";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/x42/libltc/releases/download/v${version}/libltc-${version}.tar.gz";
|
||||
sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh";
|
||||
sha256 = "sha256-Cm1CzWwh6SWif6Vg3EWsgAV9J18jNCECglkJwC07Ekk=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
{ lib
|
||||
, autoreconfHook
|
||||
, bash
|
||||
, bash-completion
|
||||
, bridge-utils
|
||||
, cmake
|
||||
, coreutils
|
||||
, curl
|
||||
, darwin
|
||||
@ -10,7 +9,6 @@
|
||||
, dnsmasq
|
||||
, docutils
|
||||
, fetchFromGitLab
|
||||
, fetchurl
|
||||
, gettext
|
||||
, glib
|
||||
, gnutls
|
||||
@ -140,6 +138,14 @@ stdenv.mkDerivation rec {
|
||||
sed -i '/virnetsockettest/d' tests/meson.build
|
||||
# delete only the first occurrence of this
|
||||
sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build
|
||||
|
||||
for binary in mount umount mkfs; do
|
||||
substituteInPlace meson.build \
|
||||
--replace "find_program('$binary'" "find_program('${lib.getBin util-linux}/bin/$binary'"
|
||||
done
|
||||
|
||||
substituteInPlace meson.build \
|
||||
--replace "'dbus-daemon'," "'${lib.getBin dbus}/bin/dbus-daemon',"
|
||||
'' + optionalString isLinux ''
|
||||
sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \
|
||||
src/storage/storage_backend_disk.c \
|
||||
@ -156,35 +162,32 @@ stdenv.mkDerivation rec {
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson # needs to be first
|
||||
|
||||
cmake
|
||||
meson
|
||||
docutils
|
||||
libxml2 # for xmllint
|
||||
libxslt # for xsltproc
|
||||
gettext
|
||||
makeWrapper
|
||||
ninja
|
||||
perl
|
||||
pkg-config
|
||||
util-linux # for mount
|
||||
perl
|
||||
perlPackages.XMLXPath
|
||||
]
|
||||
++ optional (!isDarwin) rpcsvc-proto
|
||||
# NOTE: needed for rpcgen
|
||||
++ optional isDarwin darwin.developer_cmds;
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
bash-completion
|
||||
curl
|
||||
dbus
|
||||
gettext
|
||||
glib
|
||||
gnutls
|
||||
libgcrypt
|
||||
libpcap
|
||||
libtasn1
|
||||
libxml2
|
||||
perlPackages.XMLXPath
|
||||
pkg-config
|
||||
python3
|
||||
readline
|
||||
xhtml1
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rubberband";
|
||||
version = "2.0.2";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-uerAJ+eXeJrplhHJ6urxw6RMyAT5yKBEGg0dJvPWvfk=";
|
||||
sha256 = "sha256-32UwtAPIMAojlz3yLzbzwmPwENU3kgY+QR9jPOu57YU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
|
||||
@ -1,21 +1,19 @@
|
||||
{ lib, buildDunePackage, fetchurl
|
||||
, astring, cmdliner, fmt, uuidm, re, stdlib-shims, uutf, ocaml-syntax-shims
|
||||
, astring, cmdliner, fmt, re, stdlib-shims, uutf, ocaml-syntax-shims
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "alcotest";
|
||||
version = "1.5.0";
|
||||
|
||||
useDune2 = true;
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-js-${version}.tbz";
|
||||
sha256 = "sha256-VCgZB+AteJld8kbcLhDtGCgoKUrSBZNHoeOhM1SEj2w=";
|
||||
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz";
|
||||
sha256 = "sha256-/QD5ZoOVh0/zsdfvVm0U78Avp900Ej6yXVk1W+lLIyk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml-syntax-shims ];
|
||||
|
||||
propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ];
|
||||
propagatedBuildInputs = [ astring cmdliner fmt re stdlib-shims uutf ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, buildDunePackage, alcotest, logs, ocaml_lwt, fmt
|
||||
{ lib, buildDunePackage, alcotest, logs, lwt, fmt
|
||||
, re, cmdliner
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "alcotest-lwt";
|
||||
|
||||
inherit (alcotest) version src useDune2;
|
||||
inherit (alcotest) version src;
|
||||
|
||||
propagatedBuildInputs = [ alcotest logs ocaml_lwt fmt ];
|
||||
propagatedBuildInputs = [ alcotest logs lwt fmt ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ re cmdliner ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
buildDunePackage {
|
||||
pname = "alcotest-mirage";
|
||||
|
||||
inherit (alcotest) version src useDune2;
|
||||
inherit (alcotest) version src;
|
||||
|
||||
propagatedBuildInputs = [ alcotest lwt logs mirage-clock duration ];
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchurl
|
||||
, buildDunePackage
|
||||
, bwd
|
||||
, cmdliner_1_1
|
||||
, cmdliner
|
||||
, containers
|
||||
, ezjsonm
|
||||
, menhir
|
||||
@ -70,7 +70,7 @@ buildDunePackage {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmdliner_1_1
|
||||
cmdliner
|
||||
menhir
|
||||
ppxlib
|
||||
];
|
||||
|
||||
@ -3,22 +3,17 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "crowbar";
|
||||
version = "0.2";
|
||||
|
||||
useDune2 = true;
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stedolan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wjfc9irvirfkic32ivvj6qb7r838w08b0d3vmngigbjpjyc9b14";
|
||||
sha256 = "sha256-0jjwiOZ9Ut+dv5Iw4xNvf396WTehT1VClxY9VHicw4U=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
# Fix tests with pprint ≥ 20220103
|
||||
patches = [ ./pprint.patch ];
|
||||
|
||||
# disable xmldiff tests, so we don't need to package unmaintained and legacy pkgs
|
||||
postPatch = "rm -rf examples/xmldiff";
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
commit 77b5e54d33a66445f45ddc48577d835207be8cef
|
||||
Author: Stephen Dolan <stephen.dolan@cl.cam.ac.uk>
|
||||
Date: Fri Jun 12 19:34:51 2020 +0100
|
||||
|
||||
Unbreak small example logic
|
||||
|
||||
diff --git a/examples/pprint/test_pprint.ml b/examples/pprint/test_pprint.ml
|
||||
index 77789ef..44124e7 100644
|
||||
--- a/examples/pprint/test_pprint.ml
|
||||
+++ b/examples/pprint/test_pprint.ml
|
||||
@@ -1,9 +1,9 @@
|
||||
-open Crowbar
|
||||
open PPrint
|
||||
+open Crowbar
|
||||
type t = (string * PPrint.document)
|
||||
let doc = fix (fun doc -> choose [
|
||||
const ("", empty);
|
||||
- const ("a", char 'a');
|
||||
+ const ("a", PPrint.char 'a');
|
||||
const ("123", string "123");
|
||||
const ("Hello", string "Hello");
|
||||
const ("awordwhichisalittlebittoolong",
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildDunePackage
|
||||
, cmdliner_1_1
|
||||
, cmdliner
|
||||
, menhir
|
||||
}:
|
||||
|
||||
@ -19,7 +19,7 @@ buildDunePackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ menhir ];
|
||||
buildInputs = [ cmdliner_1_1 ];
|
||||
buildInputs = [ cmdliner ];
|
||||
|
||||
doCheck = false; # requires `tezt`
|
||||
|
||||
|
||||
@ -1,24 +1,21 @@
|
||||
{ lib, fetchurl, buildDunePackage, alcotest, cmdliner
|
||||
, rresult, astring, fmt, ocamlgraph, logs, bos, fpath, ptime
|
||||
{ lib, fetchurl, buildDunePackage, cmdliner
|
||||
, rresult, astring, fmt, logs, bos, fpath, emile, uri
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "functoria";
|
||||
version = "3.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "0bihxbq16zwsi7frk4b8wz8993mvy2ym3n6288jhv0n0gb7c2f7m";
|
||||
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz";
|
||||
sha256 = "sha256-rZ9y8+wbDjqjY1sx+TmSoR42hUKRMGpehCCR2cEgbv8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cmdliner rresult astring fmt ocamlgraph logs bos fpath ptime ];
|
||||
checkInputs = [ alcotest ];
|
||||
propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A DSL to organize functor applications";
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
{ lib, buildDunePackage, functoria, cmdliner, fmt, alcotest }:
|
||||
{ lib, buildDunePackage, functoria, cmdliner, fmt }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "functoria-runtime";
|
||||
|
||||
inherit (functoria) version useDune2 src;
|
||||
inherit (functoria) version src;
|
||||
|
||||
propagatedBuildInputs = [ cmdliner fmt ];
|
||||
checkInputs = [ alcotest functoria];
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
inherit (functoria.meta) homepage license;
|
||||
|
||||
@ -39,5 +39,7 @@ buildDunePackage {
|
||||
meta = {
|
||||
description = "Unix backend for the Git protocol(s)";
|
||||
inherit (git.meta) homepage license maintainers;
|
||||
# Not compatible with cmdliner ≥ 1.1
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,7 +16,8 @@ buildDunePackage rec {
|
||||
|
||||
checkInputs = [ alcotest-lwt irmin-test ];
|
||||
|
||||
doCheck = true;
|
||||
# Check fails with cmdliner ≥ 1.1
|
||||
doCheck = false;
|
||||
|
||||
meta = irmin.meta // {
|
||||
description = "Irmin backend which stores values in a pack file";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, dedukti
|
||||
, bindlib
|
||||
, camlp-streams
|
||||
, cmdliner_1_1
|
||||
, cmdliner
|
||||
, menhir
|
||||
, pratter
|
||||
, sedlex
|
||||
@ -30,11 +30,11 @@ buildDunePackage rec {
|
||||
|
||||
nativeBuildInputs = [ menhir ];
|
||||
propagatedBuildInputs = [
|
||||
bindlib camlp-streams cmdliner_1_1 pratter sedlex stdlib-shims timed why3 yojson
|
||||
bindlib camlp-streams cmdliner pratter sedlex stdlib-shims timed why3 yojson
|
||||
];
|
||||
|
||||
checkInputs = [ alcotest dedukti ];
|
||||
doCheck = false; # "Error: Unbound module Cmd"
|
||||
doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory")
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Deducteam/lambdapi";
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
buildDunePackage rec {
|
||||
pname = "mdx";
|
||||
version = "2.1.0";
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
@ -20,7 +19,8 @@ buildDunePackage rec {
|
||||
propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc-parser re ];
|
||||
checkInputs = [ alcotest ocaml_lwt pandoc ];
|
||||
|
||||
doCheck = true;
|
||||
# Check fails with cmdliner ≥ 1.1
|
||||
doCheck = false;
|
||||
|
||||
outputs = [ "bin" "lib" "out" ];
|
||||
|
||||
|
||||
@ -7,9 +7,7 @@ buildDunePackage rec {
|
||||
pname = "mirage";
|
||||
inherit (mirage-runtime) version src;
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -23,7 +21,8 @@ buildDunePackage rec {
|
||||
stdlib-shims
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Tests need opam-monorepo
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
alcotest
|
||||
];
|
||||
|
||||
@ -1,20 +1,15 @@
|
||||
{ lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime
|
||||
, fmt, logs, ocaml_lwt, alcotest }:
|
||||
, fmt, logs, lwt
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-runtime";
|
||||
version = "3.10.7";
|
||||
inherit (functoria-runtime) src version;
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz";
|
||||
sha256 = "fec4492239c6d1fdd73db4da0782e33e66202e19595bf1d52aa98972296cc72d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ];
|
||||
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ];
|
||||
checkInputs = [ alcotest ];
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
{ lib, buildDunePackage, mirage-types
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "mirage-types-lwt";
|
||||
inherit (mirage-types) version src useDune2;
|
||||
|
||||
propagatedBuildInputs = [ mirage-types ];
|
||||
|
||||
meta = mirage-types.meta // {
|
||||
description = "Lwt module type definitions for MirageOS applications";
|
||||
};
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
{ lib, buildDunePackage, mirage
|
||||
, mirage-block, mirage-channel, mirage-clock, mirage-console, mirage-device
|
||||
, mirage-flow, mirage-fs, mirage-kv, mirage-net, mirage-protocols, mirage-random
|
||||
, mirage-stack, mirage-time
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "mirage-types";
|
||||
inherit (mirage) src version useDune2;
|
||||
|
||||
propagatedBuildInputs = [ mirage-block mirage-channel mirage-clock
|
||||
mirage-console mirage-device mirage-flow mirage-fs mirage-kv mirage-net
|
||||
mirage-protocols mirage-random mirage-stack mirage-time
|
||||
];
|
||||
|
||||
meta = mirage.meta // {
|
||||
description = "Module type definitions for MirageOS applications";
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, asyauth
|
||||
, asysocks
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
@ -15,17 +16,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosmb";
|
||||
version = "0.3.8";
|
||||
version = "0.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CvqQEJPwrZHQuEId7GbIC9LpyyN6jaQFmEQTpddHU5g=";
|
||||
hash = "sha256-h8wYBuxLq2JiQyGQFPirGblcSjtGqoi9ODvCNLH9ec8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asyauth
|
||||
asysocks
|
||||
colorama
|
||||
minikerberos
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "airthings-ble";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "vincegio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ihNy5Rme20fCO1tG7aqdVFhSF3DI9hAlge54+/nNGLs=";
|
||||
hash = "sha256-polhWyEyu7ZaJ0fgXOhai+I/XhI8FTYYQGrRxiqAOPc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
43
pkgs/development/python-modules/asyauth/default.nix
Normal file
43
pkgs/development/python-modules/asyauth/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, asn1crypto
|
||||
, asysocks
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, minikerberos
|
||||
, pythonOlder
|
||||
, unicrypto
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyauth";
|
||||
version = "0.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8qSYaPgidfDH8aebLFtLhLxt253xTHTkC0xwV346KdM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
asysocks
|
||||
minikerberos
|
||||
unicrypto
|
||||
];
|
||||
|
||||
# Project doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asyauth"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unified authentication library";
|
||||
homepage = "https://github.com/skelsec/asyauth";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "duckdb-engine";
|
||||
version = "0.5.0";
|
||||
version = "0.6.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
repo = "duckdb_engine";
|
||||
owner = "Mause";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6bR2pt7gUHZu4I7VmJgVsFT9u3/e4c9RAKHHlbX/Tyk=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7PfrI4bNz0XtBa/cb8T43j06BJ3B2S5zIyBZsEusyXc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -34,6 +34,15 @@ buildPythonPackage rec {
|
||||
sqlalchemy
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
# this test tries to download the httpfs extension
|
||||
disabledTests = [
|
||||
"test_preload_extension"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
hypothesis
|
||||
|
||||
@ -2,17 +2,21 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "emoji";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carpedm20";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-8Wm0yqCnscUc5da4c2hLOQsFMcr3XVe8FArX9wllo8Q=";
|
||||
hash = "sha256-mcbrlPD2BHjm4WJQZrymv+2wK2NUjv+qvpD/G7iCjwA=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
@ -23,7 +27,9 @@ buildPythonPackage rec {
|
||||
"test_emojize_name_only"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "emoji" ];
|
||||
pythonImportsCheck = [
|
||||
"emoji"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Emoji for Python";
|
||||
|
||||
@ -36,11 +36,12 @@
|
||||
, python
|
||||
, pytz
|
||||
, regex
|
||||
, rich
|
||||
, rsync
|
||||
, shapely
|
||||
, sqlalchemy
|
||||
, sqlglot
|
||||
, sqlite
|
||||
, tabulate
|
||||
, toolz
|
||||
}:
|
||||
let
|
||||
@ -62,7 +63,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibis-framework";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -71,18 +72,9 @@ buildPythonPackage rec {
|
||||
repo = "ibis";
|
||||
owner = "ibis-project";
|
||||
rev = version;
|
||||
hash = "sha256-/mQWQLiJa1DRZiyiA6F0/lMyn3wSY1IUwJl2S0IFkvs=";
|
||||
hash = "sha256-YRP1nGJs4btqXQirm0GfEDKNPCVXexVrwQ6sE8JtD2o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "xfail-datafusion-0.4.0";
|
||||
url = "https://github.com/ibis-project/ibis/compare/c162abba4df24e0d531bd2e6a3be3109c16b43b9...6219d6caee19b6fd3171983c49cd8d6872e3564b.patch";
|
||||
hash = "sha256-pCYPntj+TwzqCtYWRf6JF5/tJC4crSXHp0aepRocHck=";
|
||||
excludes = ["poetry.lock"];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -96,7 +88,7 @@ buildPythonPackage rec {
|
||||
pydantic
|
||||
pytz
|
||||
regex
|
||||
tabulate
|
||||
rich
|
||||
toolz
|
||||
];
|
||||
|
||||
@ -131,7 +123,9 @@ buildPythonPackage rec {
|
||||
set -eo pipefail
|
||||
|
||||
export IBIS_TEST_DATA_DIRECTORY
|
||||
IBIS_TEST_DATA_DIRECTORY="$(mktemp -d)"
|
||||
IBIS_TEST_DATA_DIRECTORY="ci/ibis-testing-data"
|
||||
|
||||
mkdir -p "$IBIS_TEST_DATA_DIRECTORY"
|
||||
|
||||
# copy the test data to a directory
|
||||
rsync --chmod=Du+rwx,Fu+rw --archive "${ibisTestingData}/" "$IBIS_TEST_DATA_DIRECTORY"
|
||||
@ -147,16 +141,16 @@ buildPythonPackage rec {
|
||||
|
||||
passthru = {
|
||||
optional-dependencies = {
|
||||
clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 ];
|
||||
clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 sqlglot ];
|
||||
dask = [ dask pyarrow ];
|
||||
datafusion = [ datafusion ];
|
||||
duckdb = [ duckdb duckdb-engine sqlalchemy ];
|
||||
duckdb = [ duckdb duckdb-engine pyarrow sqlalchemy sqlglot ];
|
||||
geospatial = [ geoalchemy2 geopandas shapely ];
|
||||
mysql = [ pymysql sqlalchemy ];
|
||||
mysql = [ sqlalchemy pymysql sqlglot ];
|
||||
pandas = [ ];
|
||||
postgres = [ psycopg2 sqlalchemy ];
|
||||
postgres = [ psycopg2 sqlalchemy sqlglot ];
|
||||
pyspark = [ pyarrow pyspark ];
|
||||
sqlite = [ sqlalchemy sqlite ];
|
||||
sqlite = [ sqlalchemy sqlite sqlglot ];
|
||||
visualization = [ graphviz-nox ];
|
||||
};
|
||||
};
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openevsewifi";
|
||||
version = "1.1.0";
|
||||
version = "1.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "miniconfig";
|
||||
repo = "python-openevse-wifi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pNm+zupBGijCXIkdanMk7nE/+SFvSEFp9/Ht5OoxQrU=";
|
||||
sha256 = "sha256-7+BC5WG0JoyHNjgsoJBQRVDpmdXMJCV4bMf6pIaS5qo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pebble";
|
||||
version = "4.6.3";
|
||||
version = "5.0.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Pebble";
|
||||
inherit version;
|
||||
sha256 = "694e1105db888f3576b8f00662f90b057cf3780e6f8b7f57955a568008d0f497";
|
||||
sha256 = "sha256-rdKgfXHmZphfG9AkAkeH3XkPcfGi27n1+sA3y7NY4M4=";
|
||||
};
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycocotools";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2ab586aa389b9657b6d73c2b9a827a3681f8d00f36490c2e8ab05902e3fd9e93";
|
||||
sha256 = "sha256-QdH7Bi31urXrw+kpcUVaoIlHnnzRBVMnjKVGKLncm/U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyeight";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "mezz64";
|
||||
repo = "pyEight";
|
||||
rev = version;
|
||||
sha256 = "sha256-H8f7990+ZKoOEzPgeYt4vMHCrcWwIa0X1gMh2qXBAoo=";
|
||||
sha256 = "sha256-vW64m8XQZ9XfgjlZph47JFyOsxWtCbIJZBZVwsTrjLs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,16 +5,15 @@
|
||||
, glibcLocales
|
||||
, typing-extensions
|
||||
, unittestCheckHook
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyPDF2";
|
||||
version = "2.10.7";
|
||||
version = "2.10.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PHkw2fK6JdybGC2cIpOtbeOtryo5NMfoxBeGVa6Mejk=";
|
||||
sha256 = "sha256-8tpSVPBU6O+BDFMf4Rr28KQ2or4VmF7g0oho2GmOWj8=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
@ -24,14 +23,16 @@ buildPythonPackage rec {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# Tests broken on Python 3.x
|
||||
#doCheck = !(isPy3k);
|
||||
|
||||
checkInputs = [ unittestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"PyPDF2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Pure-Python library built as a PDF toolkit";
|
||||
homepage = "http://mstamy2.github.com/PyPDF2/";
|
||||
homepage = "https://github.com/py-pdf/PyPDF2";
|
||||
changelog = "https://github.com/py-pdf/PyPDF2/raw/${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ desiderius vrthra ];
|
||||
};
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrisco";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OnFreund";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/h0vqclvVjoY/tjAWAYjvSqVaAaXeXNafECygutvACA=";
|
||||
sha256 = "sha256-yUWZfCrd2w2jg34FrVwfYyQPSLHOz9RiZQpri4YXV1k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smhi-pkg";
|
||||
version = "1.0.15";
|
||||
version = "1.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joysoftware";
|
||||
repo = "pypi_smhi";
|
||||
rev = version;
|
||||
sha256 = "sha256-tBNmfn2hBkS36B9zKDP+TgqeumbgzBVDiJ5L54RaSc8=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-jcIXzAZO9SxC/0apdjAVv1GmBTbdlasfXr1/Tj9adNc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
34
pkgs/development/python-modules/sqlglot/default.nix
Normal file
34
pkgs/development/python-modules/sqlglot/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, duckdb
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlglot";
|
||||
version = "6.0.7";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "sqlglot";
|
||||
owner = "tobymao";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7PBhf9NN/mCi92xSkB9ygfmfxTyOYaEyrNvL309sG5Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-dateutil ];
|
||||
|
||||
checkInputs = [ pytestCheckHook duckdb ];
|
||||
|
||||
pythonImportsCheck = [ "sqlglot" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A no dependency Python SQL parser, transpiler, and optimizer";
|
||||
homepage = "https://github.com/tobymao/sqlglot";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
@ -1,29 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, emoji
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, protobuf
|
||||
, pythonOlder
|
||||
, requests
|
||||
, six
|
||||
, torch
|
||||
, tqdm
|
||||
, transformers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stanza";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stanfordnlp";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-EAES3UpJqE7wmvCPycFhwI1lMrReN+L6W8CEDwdHTlA=";
|
||||
hash = "sha256-v4/wYfXqOwSXxx864LNxviRtsqu5DXqs9diswA1oZXc=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
emoji
|
||||
numpy
|
||||
@ -32,13 +34,15 @@ buildPythonPackage rec {
|
||||
six
|
||||
torch
|
||||
tqdm
|
||||
transformers
|
||||
];
|
||||
|
||||
# disabled, because the tests try to connect to the internet which
|
||||
# is forbidden in the sandbox
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "stanza" ];
|
||||
pythonImportsCheck = [
|
||||
"stanza"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Official Stanford NLP Python Library for Many Human Languages";
|
||||
|
||||
@ -1,24 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "winacl";
|
||||
version = "0.1.3";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-G6xWep0hMACCqiJGuw+UpZH8qOIY4WO6sY3w4y7v6gY=";
|
||||
hash = "sha256-8/dLFbzn7ARuJ27MA8LSMCykBdEntYQXuOyj/yqjaWE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "cryptography>=38.0.1" "cryptography"
|
||||
'';
|
||||
|
||||
# Project doesn't have tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "winacl" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"winacl"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for ACL/ACE/Security descriptor manipulation";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bacon";
|
||||
version = "2.2.1";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DpTN/Aw27M1s8T6ka1gwlI4WZ2MqP3PJ96XwxqlS0eM=";
|
||||
sha256 = "sha256-9HyGHj1JWZ2S7XZCj69VdzlG4nwgzr1BKW4+4f+L+yM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-yY8oFvb++vye17aSCGw5BZ/Jgd46vPNJpqK+gKRoPvw=";
|
||||
cargoSha256 = "sha256-DlBOZUdIg7yqLeLWqiiOFb+NSeTYJUl0RIJRG35oV4M=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin CoreServices;
|
||||
|
||||
|
||||
@ -132,12 +132,12 @@ rec {
|
||||
headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1";
|
||||
};
|
||||
|
||||
electron_20 = mkElectron "20.1.0" {
|
||||
armv7l-linux = "3efbf6ca2e54f8292a521f368b710ae043a91ef1943a93b26a27860a494fbd49";
|
||||
aarch64-linux = "b5ae63ee40b486058e234392e8ed959ca0b51de570cb6454cd787a41258385a9";
|
||||
x86_64-linux = "46e334eeb03ad12b987b4d6d1ba176d4389fe54f6435e7dd3d7ebc840259847e";
|
||||
x86_64-darwin = "5d790a90a6a156d846157e4ae210fd4c1013356a2849681b762e7dd8828bfedf";
|
||||
aarch64-darwin = "551c7f9ecf3f9d40572b3971b02c30e492134ff9400d97d3055fa7d089eff3eb";
|
||||
headers = "1m05pz5baypyphmxhnsbcxn9cn3s4ajjiwnk1iscjnm394y8vlhb";
|
||||
electron_20 = mkElectron "20.1.3" {
|
||||
armv7l-linux = "99710a57c55d95b540f4c3568da2a7caccb7f91da23b530c8c40db5ac861ab24";
|
||||
aarch64-linux = "8f39562f20210d7cdedbb063683d632df442c8553f62104c7d676121f3d9a357";
|
||||
x86_64-linux = "219fb6f01305669f78cf1881d257e3cc48e5563330338516f8b6592d85fdb4a3";
|
||||
x86_64-darwin = "134714291dcbecbf10cbc27c490a6501e2810bd4147a74f3b2671503445f2ce8";
|
||||
aarch64-darwin = "a09f83442f1e9f4b1edc07445a1dca73d9597529b23d62731eaa3fa0488f4ab0";
|
||||
headers = "11cv0p52864k4knwlwakiq8v6rxdv3iz6kvwhn0w8mpap2h5pzii";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-swag";
|
||||
version = "1.8.5";
|
||||
version = "1.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaggo";
|
||||
repo = "swag";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-S+WhBenTMyN7nM/UQIuMH1t9I/DRzQWN6g6tOWT71uo=";
|
||||
sha256 = "sha256-WpxKddCwlsOu1xL/HcxuA07oucYobRSJfoWHG2QieVQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-RqhGGIwruAlrif2FZ+tvsicns56Ifjpy2ZHovDyjdB4=";
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "objconv";
|
||||
version = "2.52";
|
||||
version = "2.54";
|
||||
|
||||
src = fetchurl {
|
||||
# Versioned archive of objconv sources maintained by orivej.
|
||||
url = "https://archive.org/download/objconv/${pname}-${version}.zip";
|
||||
sha256 = "0r117r7yvqvvdgwgwxpkyzi6p5nm0xb6p67wvkmvggm9fdyl3z8v";
|
||||
sha256 = "sha256-SDwnpPHc2NyctxKROrhjCDXs36WGj8js5blaQkUibWE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
{ lib, buildDunePackage, fetchurl, ocaml, cmdliner_1_1, ptime }:
|
||||
{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, ptime }:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
||||
pname = "crunch";
|
||||
version = "3.3.1";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-${version}.tbz";
|
||||
sha256 = "sha256-LFug1BELy7dzHLpOr7bESnSHw/iMGtR0AScbaf+o7Wo=";
|
||||
};
|
||||
|
||||
buildInputs = [ cmdliner_1_1 ];
|
||||
buildInputs = [ cmdliner ];
|
||||
|
||||
propagatedBuildInputs = [ ptime ];
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ];
|
||||
in buildDunePackage rec {
|
||||
pname = "dune-release";
|
||||
version = "1.5.2";
|
||||
version = "1.6.2";
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
||||
sha256 = "1r6bz1zz1al5y762ws3w98d8bnyi5ipffajgczixacmbrxvp3zgx";
|
||||
sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@ -25,17 +25,6 @@ in buildDunePackage rec {
|
||||
checkInputs = [ alcotest ] ++ runtimeInputs;
|
||||
doCheck = true;
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
patches = [
|
||||
# add missing git config calls to avoid failing due to the lack of a global git config
|
||||
(fetchpatch {
|
||||
name = "tests-missing-git-config.patch";
|
||||
url = "https://github.com/ocamllabs/dune-release/commit/87e7ffe2a9c574620d4e2fc0d79eed8772eab973.patch";
|
||||
sha256 = "0wrzcpzr54dwrdjdc75mijh78xk4bmsmqs1pci06fb2nf03vbd2k";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# remove check for curl in PATH, since curly is patched
|
||||
# to have a fixed path to the binary in nix store
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner, re }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner_1_0, re }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-ocp-build";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ ocaml findlib cmdliner re ];
|
||||
buildInputs = [ ocaml findlib cmdliner_1_0 re ];
|
||||
propagatedBuildInputs = [ ncurses ];
|
||||
preInstall = "mkdir -p $out/bin";
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user