diff --git a/doc/builders/special/fhs-environments.section.md b/doc/builders/special/fhs-environments.section.md index 146ded532404..43dc99b7c18f 100644 --- a/doc/builders/special/fhs-environments.section.md +++ b/doc/builders/special/fhs-environments.section.md @@ -18,6 +18,8 @@ Additional commands to be executed for finalizing the derivation with runner script. - `runScript` A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to `bash`. +- `profile` + Optional script for `/etc/profile` within the sandbox. One can create a simple environment using a `shell.nix` like that: diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix new file mode 100644 index 000000000000..b6dea53012d8 --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype +, gdk-pixbuf, glib, gtk3, lib, xorg +, libglvnd, libjack2, ffmpeg +, libxkbcommon, xdg-utils, zlib, pulseaudio +, wrapGAppsHook, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "bitwig-studio"; + version = "4.0"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; + sha256 = "38381c1a382abd9543931f34d5ae1789c31ec1217a1c852b5c5c442ccaf97063"; + }; + + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + + unpackCmd = '' + mkdir -p root + dpkg-deb -x $curSrc root + ''; + + dontBuild = true; + dontWrapGApps = true; # we only want $gappsWrapperArgs here + + buildInputs = with xorg; [ + alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt/bitwig-studio $out/libexec + ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio + cp -r usr/share $out/share + substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \ + $out/share/applications/com.bitwig.BitwigStudio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio + + runHook postInstall + ''; + + postFixup = '' + # patchelf fails to set rpath on BitwigStudioEngine, so we use + # the LD_LIBRARY_PATH way + + find $out -type f -executable \ + -not -name '*.so.*' \ + -not -name '*.so' \ + -not -name '*.jar' \ + -not -path '*/resources/*' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + wrapProgram $f \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : "${lib.makeBinPath [ xdg-utils ffmpeg ]}" \ + --suffix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath buildInputs}" + done + + ''; + + meta = with lib; { + description = "A digital audio workstation"; + longDescription = '' + Bitwig Studio is a multi-platform music-creation system for + production, performance and DJing, with a focus on flexible + editing tools and a super-fast workflow. + ''; + homepage = "https://www.bitwig.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ bfortz michalrus mrVanDalo ]; + }; +} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index db0f69c80abe..d81ab4b3ac72 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, openssl, freetype +{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon @@ -82,7 +82,7 @@ stdenv.mkDerivation { sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149"; }; - nativeBuildInputs = [ makeWrapper squashfsTools ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; dontStrip = true; dontPatchELF = true; @@ -109,6 +109,9 @@ stdenv.mkDerivation { runHook postUnpack ''; + # Prevent double wrapping + dontWrapGApps = true; + installPhase = '' runHook preInstall @@ -138,6 +141,7 @@ stdenv.mkDerivation { librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ + ''${gappsWrapperArgs[@]} \ --prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix PATH : "${gnome.zenity}/bin" diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 59e09939e800..d7a27dd4bccc 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -9,14 +9,9 @@ , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror , hidapi, rapidjson, quirc -, trezorSupport ? true -, libusb1 -, protobuf -, python3 +, trezorSupport ? true, libusb1, protobuf, python3 }: -with lib; - stdenv.mkDerivation rec { pname = "monero-gui"; version = "0.17.2.2"; @@ -30,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook - (getDev qttools) + (lib.getDev qttools) ]; buildInputs = [ @@ -41,8 +36,8 @@ stdenv.mkDerivation rec { randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq hidapi rapidjson quirc - ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] - ++ optionals stdenv.isDarwin [ qtmacextras ]; + ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ] + ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; postUnpack = '' # copy monero sources here @@ -98,7 +93,7 @@ stdenv.mkDerivation rec { done; ''; - meta = { + meta = with lib; { description = "Private, secure, untraceable currency"; homepage = "https://getmonero.org/"; license = licenses.bsd3; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 2a12bfe872b6..7dd2e569021a 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -4,17 +4,9 @@ , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson , CoreData, IOKit, PCSC -, trezorSupport ? true -, libusb1 ? null -, protobuf ? null -, python3 ? null +, trezorSupport ? true, libusb1, protobuf, python3 }: -with lib; - -assert stdenv.isDarwin -> IOKit != null; -assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; - stdenv.mkDerivation rec { pname = "monero"; version = "0.17.2.0"; @@ -45,8 +37,8 @@ stdenv.mkDerivation rec { zeromq pcsclite readline libsodium hidapi randomx rapidjson protobuf - ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ] - ++ optionals trezorSupport [ libusb1 protobuf python3 ]; + ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ] + ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -54,7 +46,7 @@ stdenv.mkDerivation rec { "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" "-DRandomX_ROOT_DIR=${randomx}" - ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; outputs = [ "out" "source" ]; diff --git a/pkgs/applications/blockchains/oxen/default.nix b/pkgs/applications/blockchains/oxen/default.nix new file mode 100644 index 000000000000..6fd91495b47d --- /dev/null +++ b/pkgs/applications/blockchains/oxen/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch +, cmake, pkg-config +, boost, openssl, unbound +, pcsclite, readline, libsodium, hidapi +, rapidjson +, curl, sqlite +, trezorSupport ? true +, libusb1 +, protobuf +, python3 +}: + +stdenv.mkDerivation rec { + pname = "oxen"; + version = "9.1.3"; + + src = fetchFromGitHub { + owner = "oxen-io"; + repo = "oxen-core"; + rev = "v${version}"; + sha256 = "11g3wqn0syk47yfcsdql5737kpad8skwdxhifn2yaz9zy8n3xqqb"; + fetchSubmodules = true; + }; + + # Required for static linking, the only supported install path + lbzmqsrc = fetchurl { + url = "https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz"; + sha512 = "4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1"; + }; + + postPatch = '' + # remove vendored libraries + rm -r external/rapidjson + sed -i s,/lib/,/lib64/, external/loki-mq/cmake/local-libzmq//LocalLibzmq.cmake + ''; + + postInstall = '' + rm -R $out/lib $out/include + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + boost openssl unbound + pcsclite readline + libsodium hidapi rapidjson + protobuf curl sqlite + ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + # "-DUSE_DEVICE_TREZOR=ON" + # "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + # It build with shared libs but doesn't install them. Fail. + # "-DBUILD_SHARED_LIBS=ON" + "-DLIBZMQ_TARBALL_URL=${lbzmqsrc}" + ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + + meta = with lib; { + description = "Private cryptocurrency based on Monero"; + homepage = "https://oxen.io/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.viric ]; + }; +} diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index b19b1ac2b68d..0b550c5f11d2 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv"; }; - phases = [ "installPhase" ]; + dontConfigure = true; installPhase = '' tar xf ${src} diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index e9507129a2c0..c9d119a7d605 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; + dontConfigure = true; installPhase = let diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index c6861b218deb..587877ad7a72 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -1,24 +1,26 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - ki18n, xcb-util-cursor, - kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, - knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras, knewstuff, kwayland, qttools +{ mkDerivation, lib +, extra-cmake-modules, kdoctools +, ki18n, xcb-util-cursor +, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins +, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi +, qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator }: mkDerivation { pname = "spectacle"; - meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor - knewstuff kwayland + knewstuff kwayland kcolorpicker kimageannotator ]; postPatch = '' substituteInPlace desktop/org.kde.spectacle.desktop.cmake \ --replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" ''; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; + meta = with lib; { + maintainers = with maintainers; [ ttuegel ]; + broken = versionOlder qtbase.version "5.15"; + }; } diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 08d5524fc3a5..0a89e4f47658 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -21,11 +21,11 @@ buildPythonApplication rec { pname = "archivy"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM="; + sha256 = "sha256-wQuR7cltDLr2u8BQ851MSjKmeLW8mQ/3bdEF5c9nxL0="; }; # Relax some dependencies @@ -38,7 +38,10 @@ buildPythonApplication rec { --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ --replace 'requests ==' 'requests >=' \ --replace 'validators ==' 'validators >=' \ - --replace 'tinydb ==' 'tinydb >=' + --replace 'tinydb ==' 'tinydb >=' \ + --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \ + --replace 'Werkzeug ==' 'Werkzeug >=' \ + --replace 'Flask ==' 'Flask >=' ''; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix new file mode 100644 index 000000000000..9567b051f591 --- /dev/null +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -0,0 +1,41 @@ +{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook, wlr-randr }: + +python3Packages.buildPythonPackage rec { + pname = "nwg-wrapper"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "1rpkcjr0chmgsfkan88lsi476bamg9a6y7h0x9zsh60a9rdf7dl8"; + }; + + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + + buildInputs = [ gtk3 gtk-layer-shell ]; + + propagatedBuildInputs = with python3Packages; [ i3ipc pygobject3 ]; + + # ValueError: Namespace GtkLayerShell not available + strictDeps = false; + + # No tests + doCheck = false; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : "${lib.makeBinPath [ wlr-randr ]}" + ) + ''; + + pythonImportsCheck = [ "nwg_wrapper" ]; + + meta = with lib; { + description = "Wrapper to display a script output or a text file content on the desktop in sway or other wlroots-based compositors"; + homepage = "https://github.com/nwg-piotr/nwg-wrapper/"; + license = licenses.mit; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index dcdf134b26a9..dbbf65248713 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.21.0"; + version = "0.22.0"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-Ben2wAquHADWBv1MEfPWxs96pLz1bK2F6bLoYVTSkng="; - aarch64-linux = "sha256-1kK0Gu4cQYk+QDJJJiiDan4SnP3Xjr8nLOBtv26UDV4="; - x86_64-darwin = "sha256-gOkHpUTWKrikKYZmkfgck3Lf3g5Pakcn0i2A9Hd07UE="; - aarch64-darwin = "sha256-Xpl8odVXw4WzF7CEZ+Bbxa6oQDBv9VMzHCNOjIcFGzE="; + x86_64-linux = "sha256-1/vyV6pUqovVpovTYFF4d75wJvtTNdrbLZyjw1lLacA="; + aarch64-linux = "sha256-1duNW0Edj0jrpv/RMrebtZF4ph6j3PXCJ2RFejOopGQ="; + x86_64-darwin = "sha256-Ur5jBPk5hA6cGg+pPf36Ijh94gWEdaWlJK3yCMBYyEU="; + aarch64-darwin = "sha256-RaiXW+MUihk291UWmrf6gLpyrd5stIkhyWNFEQ0daCk="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix index 4095a7907ebf..e793df71a585 100644 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/pkgs/applications/networking/cluster/octant/desktop.nix @@ -2,7 +2,7 @@ let pname = "octant-desktop"; - version = "0.21.0"; + version = "0.22.0"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-Woridi8uGsxvccdeaDzVLs+2YrRKUnm3WbX5LhorM1Y="; - x86_64-darwin = "sha256-NF3bm8WFEs4kgrUp+7qCbj6Z6pUMRUp7h4nhJQDJnoY="; + x86_64-linux = "sha256-xMdNoH0UE/KLIQ0DjJfb+ZB/q2F+kyFEncrQ9YYJgE0="; + x86_64-darwin = "sha256-y3fmxrsQ0hCa1wuMiRGHf79kpi25qXv/idKrVT87oc0="; }.${system}; }; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index a7778af231d6..0db134bdb215 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,20 +2,18 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-duJSTk5LmJWbaVYybZZHWDe8E/ZqZLCCsdPIiH5d/G4="; + sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg="; }; vendorSha256 = null; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}") - ''; + ldflags = [ "-s" "-w" "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +25,7 @@ buildGoModule rec { # Some tests try to write to the home dir export HOME="$TMPDIR" # Change the golden files to match our desired version - sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden + sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden ''; postInstall = '' @@ -43,8 +41,7 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/tkn --help - # New tkn version functionality outputs empty https://github.com/tektoncd/cli/issues/1389 - # $out/bin/tkn version | grep "Client version: ${version}" + $out/bin/tkn version | grep "Client version: ${version}" runHook postInstallCheck ''; diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index a8b2b02f0bfd..2d67236c90eb 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -5,6 +5,7 @@ , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence , mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu +, writeScript, common-updater-scripts }: let @@ -71,7 +72,15 @@ in stdenv.mkDerivation rec { mimeType = "x-scheme-handler/discord"; }; - passthru.updateScript = ./update-discord.sh; + passthru.updateScript = writeScript "discord-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -eou pipefail; + url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') + version=''${url##https://dl*.discordapp.net/apps/linux/} + version=''${version%%/*.tar.gz} + update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix + ''; meta = with lib; { description = "All-in-one cross-platform voice and text chat for gamers"; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f7435aa3ae3b..d2d8c9a3ec5d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.125"; + version = "0.0.126"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g"; + sha256 = "EraTDRKd6t0c9U68tSRdGkeB1hfqNS4KUewEXwkL8io="; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/discord/update-discord.sh b/pkgs/applications/networking/instant-messengers/discord/update-discord.sh deleted file mode 100755 index 34c1574c65aa..000000000000 --- a/pkgs/applications/networking/instant-messengers/discord/update-discord.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# script to generate ./default.nix - -set -e -exec >"${BASH_SOURCE%/*}/default.nix" - -cat < Local/Makefile diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 362a86fff37c..5974b2bd3d56 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake -, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk +, libGL, libGLU, libXv, libXtst, libXi, libjpeg_turbo, fltk , xorg , opencl-headers, opencl-clhpp, ocl-icd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjpeg_turbo libGL libGLU fltk - libX11 libXv libXtst xorg.xcbutilkeysyms + libXv libXtst libXi xorg.xcbutilkeysyms opencl-headers opencl-clhpp ocl-icd ]; diff --git a/pkgs/tools/misc/afetch/default.nix b/pkgs/tools/misc/afetch/default.nix new file mode 100644 index 000000000000..aea2ff1ff2b9 --- /dev/null +++ b/pkgs/tools/misc/afetch/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "afetch"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "13-CF"; + repo = "afetch"; + rev = "V${version}"; + sha256 = "sha256-bHP3DJpgh89AaCX4c1tQGaZ/PiWjArED1rMdszFUq+U="; + }; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A fetch program written in C"; + homepage = "https://github.com/13-CF/afetch"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 jk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index fcf29beb1882..d9c4ceeca2c0 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -39,7 +39,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.06-rc1"; + version = "2.06"; in ( @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; rev = "${pname}-${version}"; - sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa"; + sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f"; }; patches = [ diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 0345830fb9dd..f56222f403a2 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -1,17 +1,33 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub +, makeWrapper +, nix +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "nix-template"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "jonringer"; repo = pname; rev = "v${version}"; - sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig"; + sha256 = "sha256-A1b/fgSr27sfMDnTi4R3PUZfhAdLA5wUOd4yh9/4Bnk="; }; - cargoSha256 = "0hp31b5q4s6grkha2jz55945cbjkqdpvx1l8m49zv5prczhd7mz5"; + cargoSha256 = "sha256-resyY/moqLo4KWOKUvFJiOWealCmcEsLFgkN12slKN0="; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin Security; + + # needed for nix-prefetch-url + postInstall = '' + wrapProgram $out/bin/nix-template \ + --prefix PATH : ${lib.makeBinPath [ nix ]} + ''; meta = with lib; { description = "Make creating nix expressions easy"; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 550f965b07d1..bdc32570dfa7 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC, pivKeySupport ? true }: buildGoModule rec { pname = "cosign"; @@ -12,8 +12,8 @@ buildGoModule rec { }; buildInputs = - lib.optional stdenv.isLinux (lib.getDev pcsclite) - ++ lib.optionals stdenv.isDarwin [ PCSC ]; + lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) + ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ]; nativeBuildInputs = [ pkg-config ]; @@ -21,6 +21,9 @@ buildGoModule rec { subPackages = [ "cmd/cosign" ]; + preBuild = '' + buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"}) + ''; ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}"]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e50163095574..dd53d9ae6b95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -808,6 +808,8 @@ in afew = callPackage ../applications/networking/mailreaders/afew { }; + afetch = callPackage ../tools/misc/afetch { }; + afio = callPackage ../tools/archivers/afio { }; afl = callPackage ../tools/security/afl { @@ -1237,6 +1239,8 @@ in azure-cli = callPackage ../tools/admin/azure-cli { }; + azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { }; + azure-storage-azcopy = callPackage ../development/tools/azcopy { }; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; @@ -1323,6 +1327,8 @@ in inherit (nodePackages) bitwarden-cli; + inherit (nodePackages) hyperspace-cli; + bkyml = callPackage ../tools/misc/bkyml { }; blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; @@ -3091,7 +3097,9 @@ in nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor); - nix-template = callPackage ../tools/package-management/nix-template { }; + nix-template = callPackage ../tools/package-management/nix-template { + inherit (darwin.apple_sdk.frameworks) Security; + }; nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; @@ -15102,12 +15110,27 @@ in flite = callPackage ../development/libraries/flite { }; fltk13 = callPackage ../development/libraries/fltk { - inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; fltk14 = callPackage ../development/libraries/fltk/1.4.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; - fltk = res.fltk13; + fltk13-minimal = fltk13.override { + withGL = false; + withCairo = false; + withPango = false; + withExamples = false; + withDocs = false; + }; + fltk14-minimal = fltk14.override { + withGL = false; + withCairo = false; + withPango = false; + withExamples = false; + withDocs = false; + }; + fltk = fltk13; + fltk-minimal = fltk13-minimal; flyway = callPackage ../development/tools/flyway { }; @@ -23162,8 +23185,9 @@ in inherit (pkgs) bitwig-studio1; }; bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; + bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { }; - bitwig-studio = bitwig-studio3; + bitwig-studio = bitwig-studio4; bgpdump = callPackage ../tools/networking/bgpdump { }; @@ -25851,6 +25875,8 @@ in nwg-panel = callPackage ../applications/misc/nwg-panel { }; + nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { }; + ocenaudio = callPackage ../applications/audio/ocenaudio { }; onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; @@ -28509,6 +28535,10 @@ in boost = boost17x; }; + oxen = callPackage ../applications/blockchains/oxen { + boost = boost17x; + }; + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost17x; }; @@ -28803,7 +28833,9 @@ in exult = callPackage ../games/exult { }; - fltrator = callPackage ../games/fltrator { }; + fltrator = callPackage ../games/fltrator { + fltk = fltk-minimal; + }; factorio = callPackage ../games/factorio { releaseType = "alpha"; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 53dc64729e1c..e5a792caf0f1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -630,6 +630,8 @@ let lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { }; + lwt-watcher = callPackage ../development/ocaml-modules/lwt-watcher { }; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { }; lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 60b4609479df..4c3518436de8 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -80,12 +80,16 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { kde2-decoration = callPackage ../data/themes/kde2 { }; + kcolorpicker = callPackage ../development/libraries/kcolorpicker { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; kdsoap = callPackage ../development/libraries/kdsoap { }; kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; + kimageannotator = callPackage ../development/libraries/kimageannotator { }; + kproperty = callPackage ../development/libraries/kproperty { }; kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };