diff --git a/.gitignore b/.gitignore index 3bd5fe66df49..e2df971a5289 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ .vscode/ outputs/ result-* +result +!pkgs/development/python-modules/result /doc/NEWS.html /doc/NEWS.txt /doc/manual.html diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 04d52cf82e42..f34d5d607940 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -30,7 +30,6 @@ let linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened - linux_5_18_hardened linux_testing; }; diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 5ac4e1cbf4b9..46b1480be382 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/headset/default.nix b/pkgs/applications/audio/headset/default.nix index 9fbf3c08c2b7..336d0d391a31 100644 --- a/pkgs/applications/audio/headset/default.nix +++ b/pkgs/applications/audio/headset/default.nix @@ -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; diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index 0a29b7aad939..e7de55ea0e98 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -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 = '' diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index 73d338ec1493..c3360da37218 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -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 ]; diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 14b6bdf2e375..660a86903555 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -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 + ''; }) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 2af7ffb43943..feb5f9637ba1 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -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; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 41dc020e4ecf..ebf6cc2c53e1 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -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" diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 9569f4ebf647..0742ee42b215 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -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="; } {}; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c602ff209aef..069704f17628 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -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"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8639d8a4af36..be5e80fb9db8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -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/,, diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 80b01962bc9c..a5c6c4aa3aa9 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -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" diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 7975ee16698a..c591c65e92f2 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -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 = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 2257589f950b..0e614e85b9cc 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -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="; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 91a30ec5d57b..8826c2191404 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index 302151ebc0bc..a463f6e3eecb 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -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; }; diff --git a/pkgs/applications/misc/synergy/darwin-no-UserNotifications-includes.patch b/pkgs/applications/misc/synergy/darwin-no-UserNotifications-includes.patch new file mode 100644 index 000000000000..9b37a68b9017 --- /dev/null +++ b/pkgs/applications/misc/synergy/darwin-no-UserNotifications-includes.patch @@ -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 + #import + #import +-#import +-#import +-#import +-#import + + #import + diff --git a/pkgs/applications/misc/synergy/darwin-non-static-openssl.patch b/pkgs/applications/misc/synergy/darwin-non-static-openssl.patch new file mode 100644 index 000000000000..b886f51e725f --- /dev/null +++ b/pkgs/applications/misc/synergy/darwin-non-static-openssl.patch @@ -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) + + # diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 803456dc85f0..60954d567e22 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -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; }; } diff --git a/pkgs/applications/misc/synergy/macos_build_fix.patch b/pkgs/applications/misc/synergy/macos_build_fix.patch deleted file mode 100644 index c304f3bfdd44..000000000000 --- a/pkgs/applications/misc/synergy/macos_build_fix.patch +++ /dev/null @@ -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 - #import - #import --#import --#import --#import --#import - - #import - diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index fd12aa33190d..8764691caf47 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -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" ]; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index bb9d4ba72fff..7a16f9cc2095 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -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"; diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index 61bb2000e136..ebc074d148a9 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -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" ]; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index da2b0ce7727e..e94c981e489f 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 80b733955d77..dc94b0779520 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -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 = [ diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 4e05b9a681c1..a24ac50012d4 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -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 = '' diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index d607823bfeec..29998fb2097a 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -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 = { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 8a9ca156ec1a..01fa40ebcf3c 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -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 = { diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 5334db7619ad..09dc8daa4699 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -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 = '' diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index 20d2513b877e..9ca7cc10c77f 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -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 ]; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 4ccf01d0ec6f..d4f0ac3e5044 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -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"; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index e5aee4d140aa..d7396d5d9a61 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -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"; diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index 4025fd4e6d65..1d7c51e64e9d 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 449634ae6992..27cb954f51fe 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index a834a3357064..5ed726e2bf60 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -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 = [ diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 8cb447445c69..998b1793c187 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -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" diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 777bd86916cc..5cbb4fe1ba9f 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -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 { diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 54c0bea35922..1c648b25ddb0 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -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; }; diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 480fb7b2265c..12a63fa92605 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -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 diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index d1bf1adde1e9..efec5c73ba2e 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -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 = '' diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index 627c4b3f2c3f..4880a9312954 100644 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -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"; +}) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 967612619a73..6c60fc5c490d 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -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") diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix new file mode 100644 index 000000000000..d9309d9ce0b0 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix @@ -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; }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix new file mode 100644 index 000000000000..f162d8d29687 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix @@ -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; }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 80b3d1709cde..7738e4101628 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -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": { diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index 592a204a52d6..41af0d722467 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -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 diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix new file mode 100644 index 000000000000..5da52c69f264 --- /dev/null +++ b/pkgs/development/compilers/openjdk/18.nix @@ -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 < $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 diff --git a/pkgs/development/compilers/openjdk/darwin/18.nix b/pkgs/development/compilers/openjdk/darwin/18.nix new file mode 100644 index 000000000000..4744407e5fd2 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/18.nix @@ -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 <> $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 diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin.patch b/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch similarity index 100% rename from pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin.patch rename to pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch b/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch new file mode 100644 index 000000000000..cda93580efb1 --- /dev/null +++ b/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch @@ -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 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(), diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 5aaa7b178b6e..f6726bc1b111 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -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="; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 56268146c5db..68453c56942b 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -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 = [ diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/development/libraries/coordgenlibs/default.nix index c33779ba5b9d..bd89b18dc756 100644 --- a/pkgs/development/libraries/coordgenlibs/default.nix +++ b/pkgs/development/libraries/coordgenlibs/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index d4d45713de25..683ea7b867ab 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -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}" ''; diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 83cde54f348e..1a8c0921a807 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -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 = [ diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 32e58c9be0b2..ace169a8cce0 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -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 = [ diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index a7d52fe17cf9..a290b9bce9e0 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -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; { diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 548671c852ce..4d0ef8bebd4c 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -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 diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 117de74d9870..87e156a12ff8 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index c54deed737a7..5280f90c75ac 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -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; diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix index 5a57dc0fcc2e..c52079f5ccb6 100644 --- a/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/alcotest/mirage.nix b/pkgs/development/ocaml-modules/alcotest/mirage.nix index b4ba4246b2cd..dcf6533cdab1 100644 --- a/pkgs/development/ocaml-modules/alcotest/mirage.nix +++ b/pkgs/development/ocaml-modules/alcotest/mirage.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "alcotest-mirage"; - inherit (alcotest) version src useDune2; + inherit (alcotest) version src; propagatedBuildInputs = [ alcotest lwt logs mirage-clock duration ]; diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index 2dca1a05a214..a3894f0cbf4f 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix index 3557c22bc144..d321abfe9daa 100644 --- a/pkgs/development/ocaml-modules/crowbar/default.nix +++ b/pkgs/development/ocaml-modules/crowbar/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/crowbar/pprint.patch b/pkgs/development/ocaml-modules/crowbar/pprint.patch deleted file mode 100644 index 77fc073b77fa..000000000000 --- a/pkgs/development/ocaml-modules/crowbar/pprint.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 77b5e54d33a66445f45ddc48577d835207be8cef -Author: Stephen Dolan -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", diff --git a/pkgs/development/ocaml-modules/dedukti/default.nix b/pkgs/development/ocaml-modules/dedukti/default.nix index fafeeb4690ce..8f6305824f4f 100644 --- a/pkgs/development/ocaml-modules/dedukti/default.nix +++ b/pkgs/development/ocaml-modules/dedukti/default.nix @@ -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` diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index 4f1083203997..cf364347fa44 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/functoria/runtime.nix b/pkgs/development/ocaml-modules/functoria/runtime.nix index 2ba13ce87389..1eb2eec48e44 100644 --- a/pkgs/development/ocaml-modules/functoria/runtime.nix +++ b/pkgs/development/ocaml-modules/functoria/runtime.nix @@ -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; diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 319613a73335..91f33d7eeb02 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -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; }; } diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 12934007cf14..63ad03a3a866 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix index 5827c5d4b7a5..42238edcb312 100644 --- a/pkgs/development/ocaml-modules/lambdapi/default.nix +++ b/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index fc1ecb5e0762..50cddce99aff 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -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" ]; diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 6b8bcb1fbe94..410475b6b5c0 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index ce50ffd2c3ae..8182b7b5ef53 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -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; diff --git a/pkgs/development/ocaml-modules/mirage/types-lwt.nix b/pkgs/development/ocaml-modules/mirage/types-lwt.nix deleted file mode 100644 index ac232b0be6e1..000000000000 --- a/pkgs/development/ocaml-modules/mirage/types-lwt.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/ocaml-modules/mirage/types.nix b/pkgs/development/ocaml-modules/mirage/types.nix deleted file mode 100644 index f30a9e263bbc..000000000000 --- a/pkgs/development/ocaml-modules/mirage/types.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 20f38aef3634..25b9e6fd37c1 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -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 diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 30c03decf005..1475e388a6ab 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix new file mode 100644 index 000000000000..1fd2aa6efbbf --- /dev/null +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index aa3610622b63..afe9b98d0745 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -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 diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index ce1a57bc33ab..ba94db33016d 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -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"; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 3638ee3d3e48..87f2eb692620 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -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 ]; }; }; diff --git a/pkgs/development/python-modules/openevsewifi/default.nix b/pkgs/development/python-modules/openevsewifi/default.nix index b42e9c86bbe1..4241927c5156 100644 --- a/pkgs/development/python-modules/openevsewifi/default.nix +++ b/pkgs/development/python-modules/openevsewifi/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index c96955d860c7..102907df46fa 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -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; diff --git a/pkgs/development/python-modules/pycocotools/default.nix b/pkgs/development/python-modules/pycocotools/default.nix index 13757c9f0088..52ce42b13918 100644 --- a/pkgs/development/python-modules/pycocotools/default.nix +++ b/pkgs/development/python-modules/pycocotools/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index 66cd3ac70c8b..9b36a84e4b2b 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index 244af12c5093..18cd8dcec572 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -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 ]; }; diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 74101ad3abf1..837e04fdb0b0 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix index f6693da46be7..529d3fe27d78 100644 --- a/pkgs/development/python-modules/smhi-pkg/default.nix +++ b/pkgs/development/python-modules/smhi-pkg/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix new file mode 100644 index 000000000000..4a540b978392 --- /dev/null +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix index d9e44eea1168..c26f68eae22f 100644 --- a/pkgs/development/python-modules/stanza/default.nix +++ b/pkgs/development/python-modules/stanza/default.nix @@ -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"; diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index 52ae843d4260..c8c92c2f08bf 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -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"; diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index d6374b0163d9..1801b3d4d383 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -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; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index ca6a201b7f33..237f350fa488 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -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"; }; } diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 10d80b4eae95..35168c4805ad 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -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="; diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index 55147e9a16db..ec0f5a367d1c 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/ocaml/crunch/default.nix b/pkgs/development/tools/ocaml/crunch/default.nix index 54f6639fbeba..d7b4d64096ca 100644 --- a/pkgs/development/tools/ocaml/crunch/default.nix +++ b/pkgs/development/tools/ocaml/crunch/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 32ff517178cb..20aec3d171ff 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -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 diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index bf87bc550217..feb787d24d5d 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -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"; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index d7730945c0e6..14c9f00cf240 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "9.3.1"; + version = "9.4.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dVHf6nm7IRMpZ8Tx4VxRfBb8HOEfWc/5LgWZQ5LDbuk="; + sha256 = "sha256-biMqihvGW+rsNhM/kXQb3px5aRtyvAI0cxDQ9KDK7y4="; }; vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E="; diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/development/tools/oras/default.nix index 61ed539c46da..61e7e07b2edf 100644 --- a/pkgs/development/tools/oras/default.nix +++ b/pkgs/development/tools/oras/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "oras"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; rev = "v${version}"; - sha256 = "sha256-mngFLFZG3JPd+GiiMjmU6OhqC3P7Y+Weaw+UgIVO0KQ="; + sha256 = "sha256-SE79SQtQT+HRHjxRXnu2bWNKj56P5Szhdo+CpvQRwlI="; }; - vendorSha256 = "sha256-tJSxickFtPx5T5408wbijpYBRXgR5nHL8hZ/yWV83lc="; + vendorSha256 = "sha256-ufTQlqMRIFgyH+xO+fPKBTQ9blqM9thiYrVlQDmgUqQ="; ldflags = [ "-s" diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index 9425a04bbcb5..80adc6f30a75 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -3,18 +3,21 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.6.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-ZZxLiZ7ptaUAUXa2HA5ICEP5Ym6221Ehfd6ufj78kXM="; + sha256 = "sha256-hWwEaUf+TntRfxI3HjJV+hJ+dV6TRncxSCbaxE1sIjs="; }; nativeBuildInputs = [ cmake ninja ]; doCheck = true; + # Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379 + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + passthru.tests = { version = testers.testVersion { package = quick-lint-js; }; }; diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 52f3ca41f480..3bf2f884ab36 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -1,5 +1,13 @@ -{ lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA, attachPkgs -, tiles ? true, Cocoa +{ lib +, callPackage +, CoreFoundation +, fetchFromGitHub +, fetchpatch +, pkgs +, wrapCDDA +, attachPkgs +, tiles ? true +, Cocoa , debug ? false , useXdgDir ? false }: @@ -22,6 +30,13 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale ./locale-path-stable.patch + + # Fixes compiler errors when compiling against SDL2_ttf >= 1.20.0, https://github.com/CleverRaven/Cataclysm-DDA/pull/59083 + # Remove with next version update. + (fetchpatch { + url = "https://github.com/CleverRaven/Cataclysm-DDA/commit/625fadf3d493c1712d9ade2b849ff6a79765c7a7.patch"; + hash = "sha256-c0NXkd6jSGSruKrwuYUmLbgiL97YQDkUm313fnMJ7GA="; + }) ]; makeFlags = common.makeFlags ++ [ @@ -31,7 +46,7 @@ let meta = common.meta // { maintainers = with lib.maintainers; - common.meta.maintainers ++ [ skeidel ]; + common.meta.maintainers ++ [ skeidel ]; }; }); in diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index ba2050e41b84..29cfa25b8c34 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -22,17 +22,21 @@ , vulkan-loader , glslang , spirv-tools +, Carbon +, Cocoa +, OpenGL +, Security }: stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.3.1"; + version = "16.3.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-0SkTIpCnoEbu1sOagYjHBHj1I3EgLwJ8sYxWqnJGYLc="; + sha256 = "sha256-VvMcb3Im071MZmOvTOu7zRNKcp5dSJGS3kMvTLD/sFQ="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; @@ -56,7 +60,7 @@ stdenv.mkDerivation rec { vulkan-headers glslang spirv-tools - ]; + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -82,5 +86,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ sirseruju lom ]; mainProgram = "DDNet"; + # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/everspace/default.nix b/pkgs/games/everspace/default.nix index 157a3bf45e93..abf568d6acab 100644 --- a/pkgs/games/everspace/default.nix +++ b/pkgs/games/everspace/default.nix @@ -1,6 +1,6 @@ { # Packaging Dependencies - lib, stdenv, requireFile, autoPatchelfHook, unzip, + lib, stdenv, requireFile, autoPatchelfHook, unzip, copyDesktopItems, makeDesktopItem, # Everspace Dependencies cairo, gdk-pixbuf, pango, gtk2-x11, libGL, openal, @@ -11,7 +11,7 @@ # Known issues: # - Video playback (upon starting a new game) does not work (screen is black) -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "everspace"; version = "1.3.5.3655"; @@ -23,6 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook + copyDesktopItems unzip ]; @@ -89,9 +90,24 @@ stdenv.mkDerivation { mkdir -p "$out/bin" ln -s "$out/opt/everspace/game/RSG/Binaries/Linux/RSG-Linux-Shipping" "$out/bin/everspace" + mkdir -p "$out/share/pixmaps" + ln -s "$out/opt/everspace/support/icon.png" "$out/share/pixmaps/everspace-gog.png" + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "everspace-gog"; + desktopName = "EVERSPACE™"; + comment = meta.description; + exec = "everspace"; + icon = "everspace-gog"; + categories = [ "Game" ]; + }) + ]; + meta = with lib; { description = "Action-focused single-player space shooter with roguelike elements"; homepage = "https://classic.everspace-game.com/"; diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index 20058e7bc821..e882ddd69b43 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -1,12 +1,18 @@ -{ stdenvNoCC, fetchzip, lib }: +let + source = import ./source.nix; +in { + stdenvNoCC, + fetchzip, + lib, +}: stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20220815"; + version = source.version; src = fetchzip { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; - sha256 = "sha256-StPlnwn4KOvOf4fRblDzJQqyI8iIz8e9fo/BsTyCKjI="; + hash = source.sourceHash; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -16,7 +22,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-VTRrOOkdWepUCKAkziO/0egb3oaQEOJCtsuDEgs/W78="; + outputHash = source.outputHash; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix new file mode 100644 index 000000000000..a0f049ce1347 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -0,0 +1,6 @@ +# This file is autogenerated! Run ./update.sh to regenerate. +{ + version = "20220913"; + sourceHash = "sha256-qxSgkytJBW9ux95tEOHfz/4pvOp5TII3ICAY7dg5UC8="; + outputHash = "sha256-eVDXNyx9gwa46pBmsoTU9bQ2XBzkjVocIHydieJ9ruU="; +} diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/update.sh b/pkgs/os-specific/linux/firmware/linux-firmware/update.sh new file mode 100755 index 000000000000..cd711db7de40 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/linux-firmware/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$(readlink -f "$0")")" || exit + +# step 1: figure out the latest version from the tags +repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" +latestTag="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)" + +# step 2: prefetch the source tarball +snapshotUrl="$repo/snapshot/linux-firmware-$latestTag.tar.gz" +hash="$(nix-prefetch-url --unpack "$snapshotUrl")" +sriHash="$(nix --experimental-features nix-command hash to-sri "sha256:$hash")" + +# step 3: rebuild as a non-FO derivation to get the right hash +cat > source.nix << EOF +{ + version = "$latestTag"; + sourceHash = "$sriHash"; + outputHash = null; +} +EOF + +outPath="$(nix --experimental-features "nix-command flakes" build ".#linux-firmware" --no-link --print-out-paths)" +outHash="$(nix --experimental-features nix-command hash path "$outPath")" + +# step 4: generate the final file +cat > source.nix << EOF +# This file is autogenerated! Run ./update.sh to regenerate. +{ + version = "$latestTag"; + sourceHash = "$sriHash"; + outputHash = "$outHash"; +} +EOF diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f42c979417a7..a27edf5260ec 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -39,16 +39,6 @@ "sha256": "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys", "version": "5.15.67" }, - "5.18": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-5.18.19-hardened1.patch", - "sha256": "1q61641b8lr87h04kjpd7izgi4kxdvknsn8ssmcs8n6fk6cswv8c", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.19-hardened1/linux-hardened-5.18.19-hardened1.patch" - }, - "sha256": "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z", - "version": "5.18.19" - }, "5.19": { "patch": { "extra": "-hardened1", diff --git a/pkgs/os-specific/linux/kernel/linux-5.18.nix b/pkgs/os-specific/linux/kernel/linux-5.18.nix deleted file mode 100644 index 1e36baf9c4e4..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.18.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.18.19"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5d55d1db6574..5e92e63553d0 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_18 ? pkgs.linuxKernel.packages.linux_5_18 +, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 }: let @@ -217,7 +217,7 @@ in { zfsStable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelOlder "5.19"; - latestCompatibleLinuxPackages = linuxPackages_5_18; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to the latest release. version = "2.1.5"; @@ -228,7 +228,7 @@ in { zfsUnstable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelOlder "5.19"; - latestCompatibleLinuxPackages = linuxPackages_5_18; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index ed51f11ad557..80d55f2b02ca 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.44.1"; + version = "0.44.2"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-TIQrmzdLD/pwMbd1dyLh3d2bauu7Wv6C2CtuuXMNN5E="; + hash = "sha256-I0cShK9/29kIjLtPDGlyysypofFV9Ai4Dbqt4IwTSA8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 71f6fc366333..22035e104581 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-09-07T22-25-02Z"; + version = "2022-09-17T00-09-45Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-zLnYORTCYuinZEeut5fC1XS1Kj7o4c1Y6GMioSvXII4="; + sha256 = "sha256-lkb3mxUICToDQrhVltpxB1c/UB8LV2MRKR1Q+xQtlII="; }; - vendorSha256 = "sha256-DL2hIvwflZf+jH73hhFtqK4yNbMcCXIghSVlBiSzvLk="; + vendorSha256 = "sha256-V6YP9DvtFd44gLESuASoDOLMesnTZLsWfuMHyQ6w6Bc="; doCheck = false; diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index bbeb5d9b9837..4bb6d9dc253e 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "2.10.2400"; + version = "2.11.2000"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "0bqd91m7m4i4lfvz4p1lbrfs01kyh73p0g236q13bv4x1n1lkqr3"; + sha256 = "sha256-PQFckkoNIpeYrPKuhg7K1y1MFYhmF7tCH+Dnh2RIsUI="; }; vendorSha256 = "sha256-hLz36ESf6To6sT/ha/yXyhG0U1gGw8HDfnrPJnws25g="; diff --git a/pkgs/tools/X11/smart-wallpaper/default.nix b/pkgs/tools/X11/smart-wallpaper/default.nix index 20779e6e07b9..2ddece833149 100644 --- a/pkgs/tools/X11/smart-wallpaper/default.nix +++ b/pkgs/tools/X11/smart-wallpaper/default.nix @@ -5,17 +5,18 @@ , xdpyinfo , killall , xwinwrap +, swaybg }: stdenvNoCC.mkDerivation { pname = "smart-wallpaper"; - version = "unstable-2022-09-01"; + version = "unstable-2022-09-15"; src = fetchFromGitHub { owner = "Baitinq"; repo = "smart-wallpaper"; - rev = "d175695d3485fb14144c1908eb3569b20caa6ba5"; - sha256 = "sha256-cFgvuntdKPzdQJ7xE2DIT+aNAazocIhM6BBbcQOlryU="; + rev = "a23e6ed658342a405544ebe055ec1ac2fd464484"; + sha256 = "sha256-IymFjyfqNycTLalZBiqmjJP5U6AFefe9BSWn3Mpoz4c="; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +24,7 @@ stdenvNoCC.mkDerivation { installPhase = '' install -Dm755 -t $out/bin smart-wallpaper wrapProgram $out/bin/smart-wallpaper \ - --prefix PATH : ${lib.makeBinPath [ xdpyinfo killall xwinwrap ]} + --prefix PATH : ${lib.makeBinPath [ xdpyinfo killall xwinwrap swaybg ]} ''; meta = with lib; { diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index caae3f550334..a8623ced3782 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -8,11 +8,11 @@ let py = python3.override { packageOverrides = self: super: { awscrt = super.awscrt.overridePythonAttrs (oldAttrs: rec { - version = "0.13.11"; + version = "0.14.0"; src = self.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-Yx3I3RD57Nx6Cvm4moc5zmMbdsHeYiMghDfbQUor38E="; + sha256 = "sha256-MGLTFcsWVC/gTdgjny6LwyOO6QRc1QcLkVzy677Lqqw="; }; }); }; @@ -21,13 +21,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.7.20"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.7.33"; # N.B: if you change this, check if overrides are still up-to-date src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-o6rs9OMP3154WApboSqUfVn3TRxap0htHczyjAMQe2I="; + sha256 = "sha256-9X056Xc9DPp8BiuAeCvQrswcj7mnZKrkMOad5aP1TI8="; }; propagatedBuildInputs = [ @@ -61,7 +61,7 @@ with py.pkgs; buildPythonApplication rec { --replace "colorama>=0.2.5,<0.4.4" "colorama" \ --replace "cryptography>=3.3.2,<37.0.0" "cryptography" \ --replace "docutils>=0.10,<0.16" "docutils" \ - --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ + --replace "ruamel.yaml>=0.15.0,<=0.17.21" "ruamel.yaml" \ --replace "wcwidth<0.2.0" "wcwidth" \ --replace "prompt-toolkit>=3.0.24,<3.0.29" "prompt-toolkit~=3.0" \ --replace "distro>=1.5.0,<1.6.0" "distro" diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index d1790d73ebed..f7bb28f33669 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -8,8 +8,8 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.622.0) - aws-sdk-core (3.136.0) + aws-partitions (1.631.0) + aws-sdk-core (3.149.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.209.1) + fastlane (2.210.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -106,9 +106,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.25.0) + google-apis-androidpublisher_v3 (0.26.0) google-apis-core (>= 0.7, < 2.a) - google-apis-core (0.7.0) + google-apis-core (0.8.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -128,7 +128,7 @@ GEM google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.2.0) + google-cloud-errors (1.3.0) google-cloud-storage (1.37.0) addressable (~> 2.8) digest-crc (~> 0.4) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 5689274270e6..3ed09fe7512b 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1py4q91ll3v7ylcqflgd190y40d3ixgrhpln011gr5adgbzg9hr6"; + sha256 = "1xp068c7sn3n1w1ffvmc7bgjvp1bwkwcfr2gmik7h6mckdq6fl0q"; type = "gem"; }; - version = "1.622.0"; + version = "1.631.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "111zdfl6p1n949rvsfr0c88k9yzpibrcd8fihyshbibc2w06qj2b"; + sha256 = "10zhnnsvp8pdc97jqgs3l98l4j6rm2y97f60kyx6d8kkpvz7rjc8"; type = "gem"; }; - version = "3.136.0"; + version = "3.149.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -368,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17m4nrpsjx2kadgy3qasis9d8rzajxgi9gzwkvdj7c0jjs6a768d"; + sha256 = "0wam1ddxjmwdhygg54w69k7xqbc94xba25cx5bmz839pa3ail58b"; type = "gem"; }; - version = "2.209.1"; + version = "2.210.0"; }; gh_inspector = { groups = ["default"]; @@ -389,10 +389,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0psz3w8c95ashk5hlfvn5l32mg111z7fv07ngvvgm5mkw6wksh4d"; + sha256 = "0hrs7mm4fp3cd3w1zn2cf6k6ns20q6i4ywz3h0zmaxjfkxik90fy"; type = "gem"; }; - version = "0.25.0"; + version = "0.26.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -400,10 +400,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07jhk74awjc1npf2rim4kmwz4v0n3ny6y5g31saq7aqxkjmlp3hd"; + sha256 = "0ykzjp7lz28mz9zah6jbkkyicv9r4p53gq6zdh0iy1v08hpi4f4d"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; google-apis-iamcredentials_v1 = { dependencies = ["google-apis-core"]; @@ -465,10 +465,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nakfswnck6grjpyhckzl40qccyys3sy999h5axk0rldx96fnivd"; + sha256 = "0jynh1s93nl8njm5l5wcy86pnjmv112cq6m0443s52f04hg6h2s5"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; google-cloud-storage = { dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"]; diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index 8983741b38a2..d3dbd4b0e52b 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "9.46.4"; + version = "9.46.5"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-3QcrJN7ahyPGZsY6EM6K5sgr0eLZQazlh+G0TdN0uQc="; + sha256 = "sha256-1Snj4rY3elEil7m1n/HFigZWlE2+TJtEiAMjWy0J0xU="; stripRoot = false; }; diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index b5f45e5c860b..99619fe86da8 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "6.1.2"; + version = "6.1.4"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zJr5RG1bbcKhPGygERSROC9JVfVigHauFzaqfY4KXC4="; + sha256 = "sha256-v6Bro5uJBF2/EaXOjVFVi+XaSYJLn/SKY3cXBJJ3xMk="; }; - cargoSha256 = "sha256-QwZWm50D3N4OES9ypnIQOxEPYcUXVUcwKQ0/SUy7jyI="; + cargoSha256 = "sha256-xmy/lymDJNeIHIPrja8LXtM9UxMRILajtEWFAof5euE="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index e09ca61025b2..03150254a9b8 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-snkrgitPtrdX5LuMscmeeY9KQeBGsPApaDc2LRfRKJ0="; + sha256 = "sha256-dHxcV98z4LPI40qobNpcUTFFB4lf2FEf+f5N/50LtE4="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-u0JC/4Pav0ZZIvOzE22kdUWR5wgYAUN8/fKfjsDev0g="; + vendorSha256 = "sha256-p1jyycI9dRXVwLjXON13GT64SsPVhBIRPa14O6q+klk="; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 1ad88a4403b9..dcbfd58e2f57 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-eNndY3BPdeFO9cihfkPWlDVwWfNZWnjL5gJCxlgJn9c="; + sha256 = "sha256-zES2795gyMQ/VoRR4/dpUsqJlGnxl0Ac9Gb05lboWlI="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-+i8uKR5EZXTmOnuwoeM6Vpt934v0egSjC951ryXaZS0="; + vendorSha256 = "sha256-9YKeHCFrN7drHJpk2k9M0VGvZ54kSSb9bAiyDFEiX+g="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 4684a024359d..6ab2369a822a 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "profile-sync-daemon"; - version = "6.45"; + version = "6.47"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-sync-daemon"; rev = "v${version}"; - hash = "sha256-gUGtoa0NUCzhghEMPgb020UdXjFQMZkx4ZmPJDXNGJc="; + hash = "sha256-BAr+EvSjSPBKdSX49tEgXOpMK3NB5JZ+cmfuKkyDbGs="; }; installPhase = '' diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index c199473179e9..ec2362b27009 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-nci2VXto9LptfNHBmLGxfMXQnzbVP1+GlvllOqWFGKU="; + hash = "sha256-P5cEdcbL9f9tJbcfiOLA0lSPW6m2x39Cz4tL1yFFbCg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "A posix script to find and watch youtube videos from the terminal"; homepage = "https://github.com/pystardust/ytfzf"; license = licenses.gpl3Only; + platforms = platforms.all; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index bb70c66b320f..da55481cc439 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://aria2.github.io"; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; + mainProgram = "aria2c"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ Br1ght0ne koral ]; diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix new file mode 100644 index 000000000000..e00b1a77ef2b --- /dev/null +++ b/pkgs/tools/networking/curl-impersonate/default.nix @@ -0,0 +1,27 @@ +#TODO: It should be possible to build this from source, but it's currently a lot faster to just package the binaries. +{ lib, stdenv, fetchzip, zlib, autoPatchelfHook }: +stdenv.mkDerivation rec { + pname = "curl-impersonate-bin"; + version = "v0.5.3"; + + src = fetchzip { + url = "https://github.com/lwthiker/curl-impersonate/releases/download/${version}/curl-impersonate-${version}.x86_64-linux-gnu.tar.gz"; + sha256 = "sha256-+cH1swAIadIrWG9anzf0dcW6qyBjcKsUHFWdv75F49g="; + stripRoot = false; + }; + + nativeBuildInputs = [ autoPatchelfHook zlib ]; + + installPhase = '' + mkdir -p $out/bin + cp * $out/bin + ''; + + meta = with lib; { + description = "curl-impersonate: A special build of curl that can impersonate Chrome & Firefox "; + homepage = "https://github.com/lwthiker/curl-impersonate"; + license = with licenses; [ curl mit ]; + maintainers = with maintainers; [ deliciouslytyped ]; + platforms = platforms.linux; #TODO I'm unsure about the restrictions here, feel free to expand the platforms it if it works elsewhere. + }; +} diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index 3e1ef2be501c..7454155c7841 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/tools/networking/hurl/default.nix @@ -3,7 +3,6 @@ , rustPlatform , fetchFromGitHub , pkg-config -, python3 , installShellFiles , libxml2 , openssl @@ -12,18 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "sha256-ud4ARpiyMcYwPKsLbeK4MMBLzkD/tecF1L1vWyYpKmY="; + sha256 = "sha256-bv51OOOQFHkFjtv/VXeemMybohtzrhyGfXQkVPDjcps="; }; nativeBuildInputs = [ pkg-config - python3 installShellFiles ]; @@ -37,12 +35,10 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "sha256-tmHP7xwVce/hh8nX1LO/zwPIlDZkICPMlBjZjuv37xU="; + cargoSha256 = "sha256-BIt8xZveOeDUktLldtymYQqlkgqa7MJjKeSPby70Czg="; postInstall = '' - python ci/gen_manpage.py docs/hurl.md > hurl.1 - python ci/gen_manpage.py docs/hurlfmt.md > hurlfmt.1 - installManPage hurl.1 hurlfmt.1 + installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1 ''; meta = with lib; { diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index aff04299953b..44bca62e8f09 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals withDebug [ "--enable-debug" ]; # Enable debugging support code and methods. meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://tinyproxy.github.io/"; description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems"; license = licenses.gpl2Only; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 9d9a46164702..d589aaed25f2 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.17.1"; + version = "5.18.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IKD28berto3OAuzFnk9oGByOLfNPBgF7hzOfjFKBes0="; + sha256 = "sha256-JmxnpMKzQorStGJqwQoblmdsGZxd7/XTPDcfje/IkCQ="; }; vendorSha256 = "sha256-rppVLeX1VDOW+eUHSM77DgY2KjOrUHdyqGWRAYRIbUE="; diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index d22612e0bc76..305a9c20dde7 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.35.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-gf8Q/x9JXQcYEPa7fHoxwEvLFjpXVraY5aEcA89xJsc="; + sha256 = "sha256-rBqw79+d14XFrInl++Z5+9jhh95OpYU2TgSQv0y/SU0="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-CUbiEqFNEQCe9CKhpa8m8+/XVOOTv1ltmx0sXssx+e8="; + cargoSha256 = "sha256-soiYqdsBLirJQlVygKgEWGrS+k4NJ7aeIjzgwIbVlew="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cf371ecbd39..ff8399e0b9a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2554,7 +2554,9 @@ with pkgs; github-commenter = callPackage ../development/tools/github-commenter { }; - github-desktop = callPackage ../applications/version-management/github-desktop { }; + github-desktop = callPackage ../applications/version-management/github-desktop { + curl = curl.override { openssl = openssl_1_1; }; + }; github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; @@ -5509,6 +5511,8 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; + curl-impersonate-bin = callPackage ../tools/networking/curl-impersonate { }; + curlie = callPackage ../tools/networking/curlie { }; cunit = callPackage ../tools/misc/cunit { }; @@ -12968,6 +12972,16 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit lib; }; + adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; + + adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-17-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-17-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-17 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-17-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-17-packages-darwin.jre-hotspot {}; + adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; }; adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; }; @@ -14038,6 +14052,12 @@ with pkgs; openjdk16-bootstrap = javaPackages.compiler.openjdk16-bootstrap; + openjdk18-bootstrap = javaPackages.compiler.openjdk18-bootstrap; + openjdk18 = javaPackages.compiler.openjdk18; + openjdk18_headless = javaPackages.compiler.openjdk18.headless; + jdk18 = openjdk18; + jdk18_headless = openjdk18_headless; + /* default JDK */ jdk = jdk17; @@ -14393,7 +14413,7 @@ with pkgs; muonlang = callPackage ../development/compilers/muonlang { }; - inherit (callPackages ../development/compilers/nim { }) + inherit (callPackages ../development/compilers/nim { openssl = openssl_1_1; }) nim-unwrapped nimble-unwrapped nim; nimPackages = recurseIntoAttrs nim.pkgs; @@ -24555,8 +24575,6 @@ with pkgs; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; - linuxPackages_5_18_hardened = linuxKernel.packages.linux_5_18_hardened; - linux_5_18_hardened = linuxKernel.kernels.linux_5_18_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; @@ -33230,7 +33248,9 @@ with pkgs; stdenv = gcc10StdenvCompat; }; - ddnet = callPackage ../games/ddnet { }; + ddnet = callPackage ../games/ddnet { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security; + }; devilutionx = callPackage ../games/devilutionx { SDL2 = SDL2.override { diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 160f51cf43c5..f9391267fac8 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -90,6 +90,10 @@ in { ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; + adoptopenjdk-17 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix; + openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; @@ -129,6 +133,12 @@ in { inherit openjdk16-bootstrap; }); + openjdk18-bootstrap = mkBootstrap adoptopenjdk-17 + ../development/compilers/openjdk/17.nix + (bootstrapArgs // { + inherit openjdk17-bootstrap; + }); + openjdk8 = mkOpenjdk ../development/compilers/openjdk/8.nix ../development/compilers/openjdk/darwin/8.nix @@ -175,6 +185,14 @@ in { inherit openjdk17-bootstrap; openjfx = openjfx17; }; + + openjdk18 = mkOpenjdk + ../development/compilers/openjdk/18.nix + ../development/compilers/openjdk/darwin/18.nix + { + inherit openjdk18-bootstrap; + openjfx = openjfx17; + }; }; mavenPlugins = recurseIntoAttrs (callPackage ../development/java-modules/mavenPlugins.nix { }); diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 596beb4f198c..d27bda851cbd 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -168,12 +168,7 @@ in { linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream"; - linux_5_18 = callPackage ../os-specific/linux/kernel/linux-5.18.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix { kernelPatches = [ @@ -195,7 +190,7 @@ in { else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_18; + kernel = linux_5_19; kernelPatches = kernel.kernelPatches; }; @@ -248,7 +243,7 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; - linux_5_18_hardened = hardenedKernelFor kernels.linux_5_18 { }; + linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; })); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -533,7 +528,7 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 - linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18); + linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19); }; @@ -573,7 +568,7 @@ in { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); - linux_5_18_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_18 { }); + linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a8b5742aaeb7..a7c3386d4972 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -193,7 +193,10 @@ let # The 1.1.0 release broke a lot of packages and is not compatible with # OCaml < 4.08. - cmdliner = cmdliner_1_0; + cmdliner = + if lib.versionAtLeast ocaml.version "4.08" + then cmdliner_1_1 + else cmdliner_1_0; cohttp = callPackage ../development/ocaml-modules/cohttp { }; @@ -531,9 +534,7 @@ let hpack = callPackage ../development/ocaml-modules/hpack { }; - hxd = callPackage ../development/ocaml-modules/hxd { - cmdliner = cmdliner_1_1; - }; + hxd = callPackage ../development/ocaml-modules/hxd { }; imagelib = callPackage ../development/ocaml-modules/imagelib { }; @@ -907,10 +908,6 @@ let mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; - mirage-types = callPackage ../development/ocaml-modules/mirage/types.nix { }; - - mirage-types-lwt = callPackage ../development/ocaml-modules/mirage/types-lwt.nix { }; - mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { }; mirage-xen = callPackage ../development/ocaml-modules/mirage-xen { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 573c9e3bc440..056263b2f6f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -782,6 +782,8 @@ in { astunparse = callPackage ../development/python-modules/astunparse { }; + asyauth = callPackage ../development/python-modules/asyauth { }; + async_generator = callPackage ../development/python-modules/async_generator { }; async-dns = callPackage ../development/python-modules/async-dns { }; @@ -10478,6 +10480,8 @@ in { sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + sqlglot = callPackage ../development/python-modules/sqlglot { }; + sqlitedict = callPackage ../development/python-modules/sqlitedict { }; sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { };