diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index f4d8ed2919dd..46114dacb458 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -11,58 +11,12 @@ meta = with lib; { ''; homepage = "https://www.gnu.org/software/hello/manual/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ eelco ]; platforms = platforms.all; }; ``` -Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string. - -The meta-attributes of a package can be queried from the command-line using `nix-env`: - -```ShellSession -$ nix-env -qa hello --json -{ - "hello": { - "meta": { - "description": "A program that produces a familiar, friendly greeting", - "homepage": "https://www.gnu.org/software/hello/manual/", - "license": { - "fullName": "GNU General Public License version 3 or later", - "shortName": "GPLv3+", - "url": "http://www.fsf.org/licensing/licenses/gpl.html" - }, - "longDescription": "GNU Hello is a program that prints \"Hello, world!\" when you run it.\nIt is fully customizable.\n", - "maintainers": [ - "Ludovic Court\u00e8s " - ], - "platforms": [ - "i686-linux", - "x86_64-linux", - "armv5tel-linux", - "armv7l-linux", - "mips32-linux", - "x86_64-darwin", - "i686-cygwin", - "i686-freebsd13", - "x86_64-freebsd13", - "i686-openbsd", - "x86_64-openbsd" - ], - "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14" - }, - "name": "hello-2.9", - "system": "x86_64-linux" - } -} -``` - -`nix-env` knows about the `description` field specifically: - -```ShellSession -$ nix-env -qa hello --description -hello-2.3 A program that produces a familiar, friendly greeting -``` +Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. ## Standard meta-attributes {#sec-standard-meta-attributes} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b4a9d3db3ac8..54a3a16e6d10 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -616,11 +616,11 @@ "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" }, "keycloak": { - "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=", + "hash": "sha256-DW80CkmeQKJ4tEBrLsdks+mXweL8K1pVu3yQKGAvZOs=", "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak", "owner": "mrparkers", "repo": "terraform-provider-keycloak", - "rev": "v4.0.1", + "rev": "v4.1.0", "spdx": "MIT", "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=" }, diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 0102476954ec..740e793d6520 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -61,13 +61,13 @@ }: stdenv.mkDerivation rec { - version = "5.14.14"; + version = "5.18.11"; pname = "feishu"; - packageHash = "2844ab12b34f"; # A hash value used in the download url + packageHash = "9d89b152d581"; # A hash value used in the download url src = fetchurl { url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb"; - sha256 = "c0ca999edc10d8ada08c46b33b15d7db0ced264248abd3ebfdb895d8457e1bec"; + hash = "sha256-93LEybYePIEbmE8mjRL95haMuBuY0xH6/8fhwF7/ctM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a258c4f5cea7..82c2b0b61419 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -52,6 +52,7 @@ let "8.15.1".sha256 = "sha256:1janvmnk3czimp0j5qmnfwx6509vhpjc2q7lcza1bc6dm6kn8n42"; "8.15.2".sha256 = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd"; "8.16.0".sha256 = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is="; + "8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 8ce4322a12e9..43dc18244a91 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -34,7 +34,7 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202205"; + version = "202211"; patches = [ # pass targetPrefix as an env var @@ -50,7 +50,7 @@ edk2 = buildStdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - sha256 = "sha256-5V3gXZoePxRVL0miV/ku/HILT7d06E8UI28XRx8vZjA="; + sha256 = "sha256-0jE73xPyenAcgJ1mS35oTc5cYw7jJvVYxhPdhTWpKA0="; }; nativeBuildInputs = [ pythonEnv ]; diff --git a/pkgs/development/compilers/rml/default.nix b/pkgs/development/compilers/rml/default.nix new file mode 100644 index 000000000000..7eebf8a622b4 --- /dev/null +++ b/pkgs/development/compilers/rml/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, ocamlPackages +}: + +stdenv.mkDerivation rec { + pname = "rml"; + version = "1.09.07"; + + src = fetchFromGitHub { + owner = "reactiveml"; + repo = pname; + rev = "${pname}-${version}-2021-07-26"; + hash = "sha256-UFqXQBeIQMSV4O439j9s06p1hh7xA98Tu79FsjK9PIY="; + }; + + nativeBuildInputs = with ocamlPackages; [ + ocaml + ]; + + buildInputs = with ocamlPackages; [ + num + ]; + + configureFlags = [ "--prefix" "${placeholder "out"}" ]; + + dontAddPrefix = true; + + meta = with lib; { + description = "ReactiveML: a programming language for implementing interactive systems"; + homepage = "https://rml.lri.fr"; + license = with licenses; [ qpl lgpl21Plus ]; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 8ffa99d29b4b..b726a81c24c9 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -39,7 +39,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ - --replace 'COQVERSION= ' 'COQVERSION= 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ + --replace 'COQVERSION= ' 'COQVERSION= 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index c8c66395c428..fb6527989d8e 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -145,6 +145,11 @@ compcert.overrideAttrs (o: url = "https://github.com/AbsInt/CompCert/commit/34be08a23d18d56f2dde24fd24b6dbe3bcb01ec3.patch"; sha256 = "sha256-a5YnftGVadVypEqrOYRRxI7YtGOEWyKnO4GqakFhvzI="; }) + # Support for Coq 8.16.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/35531503b3493cb9b0ec8a8585e84928c85b4af9.patch"; + hash = "sha256-DvtYi/eiPUe8tA0EFTcCjJA0JjtVKceUsX4ZDM0pWkE="; + }) ]; } ] []; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index b2409b1398f0..54c9f4863637 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -23,6 +23,7 @@ , gtk3 , dconf , libglvnd +, darwin , buildPackages # options @@ -43,7 +44,7 @@ let addPackages = self: with self; let - callPackage = self.newScope { inherit qtModule srcs; }; + callPackage = self.newScope ({ inherit qtModule stdenv srcs; }); in { @@ -53,9 +54,16 @@ let withGtk3 = true; inherit (srcs.qtbase) src version; inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake; + inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit GSS MetalKit; patches = [ ./patches/qtbase-qmake-pkg-config.patch ./patches/qtbase-tzdir.patch + # Remove symlink check causing build to bail out and fail. + # https://gitlab.kitware.com/cmake/cmake/-/issues/23251 + (fetchpatch { + url = "https://github.com/Homebrew/formula-patches/raw/c363f0edf9e90598d54bc3f4f1bacf95abbda282/qt/qt_internal_check_if_path_has_symlinks.patch"; + sha256 = "sha256-Gv2L8ymZSbJxcmUijKlT2NnkIB3bVH9D7YSsDX2noTU="; + }) ]; }; env = callPackage ./qt-env.nix {}; @@ -90,7 +98,9 @@ let qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; qtcharts = callPackage ./modules/qtcharts.nix { }; - qtconnectivity = callPackage ./modules/qtconnectivity.nix { }; + qtconnectivity = callPackage ./modules/qtconnectivity.nix { + inherit (darwin.apple_sdk_11_0.frameworks) PCSC; + }; qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; qtdoc = callPackage ./modules/qtdoc.nix { }; @@ -100,6 +110,7 @@ let qtlottie = callPackage ./modules/qtlottie.nix { }; qtmultimedia = callPackage ./modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; + inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox; }; qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { }; qtpositioning = callPackage ./modules/qtpositioning.nix { }; @@ -107,7 +118,9 @@ let qtserialbus = callPackage ./modules/qtserialbus.nix { }; qtserialport = callPackage ./modules/qtserialport.nix { }; qtshadertools = callPackage ./modules/qtshadertools.nix { }; - qtspeech = callPackage ./modules/qtspeech.nix { }; + qtspeech = callPackage ./modules/qtspeech.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; + }; qtquick3d = callPackage ./modules/qtquick3d.nix { }; qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { }; qtquicktimeline = callPackage ./modules/qtquicktimeline.nix { }; @@ -121,7 +134,9 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { }; qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; - qtwebview = callPackage ./modules/qtwebview.nix { }; + qtwebview = callPackage ./modules/qtwebview.nix { + inherit (darwin.apple_sdk_11_0.frameworks) WebKit; + }; wrapQtAppsHook = makeSetupHook { deps = [ buildPackages.makeWrapper ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 436fe4633075..e1675e029fc3 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -71,6 +71,13 @@ , at-spi2-core , unixODBC , unixODBCDrivers + # darwin +, xcbuild +, AGL +, AVFoundation +, AppKit +, GSS +, MetalKit # optional dependencies , cups , libmysqlclient @@ -79,7 +86,7 @@ , dconf , gtk3 # options -, libGLSupported ? true +, libGLSupported ? stdenv.isLinux , libGL , debug ? false , developerBuild ? false @@ -111,13 +118,20 @@ stdenv.mkDerivation rec { pcre2 pcre libproxy - xlibsWrapper zstd double-conversion - util-linux - systemd libb2 md4c + dbus + glib + # unixODBC drivers + unixODBCDrivers.psql + unixODBCDrivers.sqlite + unixODBCDrivers.mariadb + ] ++ lib.optionals stdenv.isLinux [ + xlibsWrapper + util-linux + systemd mtdev lksctp-tools libselinux @@ -129,8 +143,6 @@ stdenv.mkDerivation rec { libdrm libdatrie valgrind - dbus - glib udev # Text rendering fontconfig @@ -152,16 +164,21 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.xcbutilcursor libepoxy - ] ++ (with unixODBCDrivers; [ - psql - sqlite - mariadb - ]) ++ lib.optional libGLSupported libGL; + ] ++ lib.optionals stdenv.isDarwin [ + AGL + AVFoundation + AppKit + GSS + MetalKit + ] ++ lib.optional libGLSupported libGL; buildInputs = [ python3 at-spi2-core + ] ++ lib.optionals (!stdenv.isDarwin) [ libinput + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + AppKit ] ++ lib.optional withGtk3 gtk3 ++ lib.optional developerBuild gdb @@ -180,6 +197,8 @@ stdenv.mkDerivation rec { # https://bugreports.qt.io/browse/QTBUG-97568 postPatch = '' substituteInPlace src/corelib/CMakeLists.txt --replace /bin/ls ${coreutils}/bin/ls + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/QtAutoDetect.cmake --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" ''; fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; @@ -197,14 +216,23 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_PLUGINSDIR=${qtPluginPrefix}" "-DINSTALL_QMLDIR=${qtQmlPrefix}" - "-DQT_FEATURE_journald=ON" - "-DQT_FEATURE_sctp=ON" "-DQT_FEATURE_libproxy=ON" "-DQT_FEATURE_system_sqlite=ON" - "-DQT_FEATURE_vulkan=ON" "-DQT_FEATURE_openssl_linked=ON" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DQT_FEATURE_sctp=ON" + "-DQT_FEATURE_journald=ON" + "-DQT_FEATURE_vulkan=ON" + ] ++ lib.optionals stdenv.isDarwin [ + # build as a set of dynamic libraries + "-DFEATURE_framework=OFF" ]; + NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" + "-framework GSS" + ]); + outputs = [ "out" "dev" ]; postInstall = '' @@ -259,6 +287,6 @@ stdenv.mkDerivation rec { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao LunNova ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix index 33fbd7231548..c62f13167fb1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix @@ -5,11 +5,13 @@ , qtdeclarative , bluez , pkg-config +, PCSC }: qtModule { pname = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ bluez ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals stdenv.isLinux [ bluez ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ PCSC ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index bfd33cadf395..96ea3d18bab6 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -17,12 +17,21 @@ , elfutils , libunwind , orc +, VideoToolbox }: qtModule { pname = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpulseaudio elfutils libunwind alsa-lib wayland orc ]; - propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]; + buildInputs = [ libunwind orc ] + ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ]; + propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav ] + ++ lib.optionals stdenv.isLinux [ gst-vaapi ] + ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + "-include AudioToolbox/AudioToolbox.h"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin + "-framework AudioToolbox"; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix index 5ace804fe4c5..94e6cb9920c5 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix @@ -1,4 +1,6 @@ { qtModule +, lib +, stdenv , qtbase , qtquick3d }: @@ -6,4 +8,6 @@ qtModule { pname = "qtquick3dphysics"; qtInputs = [ qtbase qtquick3d ]; + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) + "-faligned-allocation"; } diff --git a/pkgs/development/libraries/qt-6/modules/qtserialport.nix b/pkgs/development/libraries/qt-6/modules/qtserialport.nix index 96b7a25bb3b4..2d23ae17cc5f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-6/modules/qtserialport.nix @@ -10,5 +10,5 @@ qtModule { pname = "qtserialport"; qtInputs = [ qtbase ]; nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ udev ]; + propagatedBuildInputs = lib.optionals stdenv.isLinux [ udev ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix index 64f1e2c14a8e..ec713bc98c68 100644 --- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix @@ -1,15 +1,19 @@ { qtModule +, lib +, stdenv , qtbase , qtmultimedia , pkg-config , flite , alsa-lib , speechd +, Cocoa }: qtModule { pname = "qtspeech"; qtInputs = [ qtbase qtmultimedia ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ flite alsa-lib speechd ]; + buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index 06ce64424d55..df4b043eb78a 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -3,12 +3,14 @@ , lib , qtbase , qtdeclarative +, cups , substituteAll }: qtModule { pname = "qttools"; qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ cups ]; patches = [ ../patches/qttools-paths.patch ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/pkgs/development/libraries/qt-6/modules/qtwebview.nix index ba784f73ad45..1e7c42397792 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebview.nix @@ -3,9 +3,12 @@ , qtModule , qtdeclarative , qtwebengine +, WebKit }: qtModule { pname = "qtwebview"; - qtInputs = [ qtdeclarative qtwebengine ]; + qtInputs = [ qtdeclarative ] + ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ WebKit ]; } diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 5f6d429edf58..06e1f4d179b2 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation (args // { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao ]; - platforms = platforms.linux; + platforms = platforms.unix; } // (args.meta or { }); }) diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 9dbc2491ad95..69a492180dbc 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -23,9 +23,16 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' # Fix darwin build substituteInPlace pbfplugin.pro \ + --replace '$$PROTOBUF/include' '${protobuf}/include' \ --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' ''; + # error: 'path' is unavailable: introduced in macOS 10.15 + qmakeFlags = lib.optionals stdenv.isDarwin [ + "CONFIG+=c++17" + "QMAKE_MACOSX_DEPLOYMENT_TARGET=10.15" + ]; + meta = with lib; { description = "Qt image plugin for displaying Mapbox vector tiles"; longDescription = '' diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 1e5149683d4c..16b7c1aa0242 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -20,11 +20,10 @@ }; meta = with lib; { - broken = stdenv.isDarwin; description = "Official PostgreSQL ODBC Driver"; homepage = "https://odbc.postgresql.org/"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; }; @@ -47,7 +46,9 @@ preConfigure = '' # we don't want to build a .pkg - sed -i 's/ADD_SUBDIRECTORY(osxinstall)//g' CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace "IF(APPLE)" "IF(0)" \ + --replace "CMAKE_SYSTEM_NAME MATCHES AIX" "APPLE" ''; cmakeFlags = [ @@ -62,7 +63,6 @@ }; meta = with lib; { - broken = stdenv.isDarwin; description = "MariaDB ODBC database driver"; homepage = "https://downloads.mariadb.org/connector-odbc/"; license = licenses.gpl2; @@ -126,11 +126,10 @@ }; meta = with lib; { - broken = stdenv.isDarwin; description = "ODBC driver for SQLite"; homepage = "http://www.ch-werner.de/sqliteodbc"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ vlstill ]; }; }; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 1c12f3ac5f87..ee932bffd5e6 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,31 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, ocaml +, dune-configurator +, seq +, qcheck, ounit2 +}: -stdenv.mkDerivation rec { - version = "0.5"; - pname = "ocaml${ocaml.version}-gen"; +buildDunePackage rec { + version = "1.0"; + pname = "gen"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "c-cube"; repo = "gen"; - rev = version; - sha256 = "14b8vg914nb0yp1hgxzm29bg692m0gqncjj43b599s98s1cwl92h"; + rev = "v${version}"; + hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = lib.optionals doCheck [ qtest ounit ]; - strictDeps = true; - - configureFlags = lib.optional doCheck "--enable-tests"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ seq ]; + checkInputs = [ qcheck ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkTarget = "test"; - - createFindlibDestdir = true; meta = { homepage = "https://github.com/c-cube/gen"; description = "Simple, efficient iterators for OCaml"; license = lib.licenses.bsd3; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index c2ef82a158c6..00933da8471a 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , isPy27 , fetchPypi @@ -134,5 +135,7 @@ buildPythonPackage rec { license = licenses.gpl3Only; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ LunNova ]; + # python3Packages.pyqt-builder needs to be patched + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/roundcube/plugins/custom_from/default.nix b/pkgs/servers/roundcube/plugins/custom_from/default.nix new file mode 100644 index 000000000000..d7b87a795e8a --- /dev/null +++ b/pkgs/servers/roundcube/plugins/custom_from/default.nix @@ -0,0 +1,11 @@ +{ roundcubePlugin, fetchzip }: + +roundcubePlugin rec { + pname = "custom_from"; + version = "1.6.6"; + + src = fetchzip { + url = "https://github.com/r3c/custom_from/archive/refs/tags/${version}.zip"; + hash = "sha256-QvMYwFWY0BZOkzhDtW7XJ77i5mVkDNAiN4JBdsCuUy0="; + }; +} diff --git a/pkgs/servers/roundcube/plugins/plugins.nix b/pkgs/servers/roundcube/plugins/plugins.nix index 2de2ff736496..8e986f056f25 100644 --- a/pkgs/servers/roundcube/plugins/plugins.nix +++ b/pkgs/servers/roundcube/plugins/plugins.nix @@ -7,6 +7,7 @@ carddav = callPackage ./carddav { }; contextmenu = callPackage ./contextmenu { }; + custom_from = callPackage ./custom_from { }; persistent_login = callPackage ./persistent_login { }; thunderbird_labels = callPackage ./thunderbird_labels { }; } diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index 5118186c4de2..b88eea42e83c 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -1,20 +1,24 @@ -{ lib, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchFromGitLab }: buildGoModule rec { pname = "snowflake"; - version = "2.3.1"; + version = "2.4.1"; - src = fetchgit { - url = "https://git.torproject.org/pluggable-transports/${pname}"; + src = fetchFromGitLab { + domain = "gitlab.torproject.org"; + group = "tpo"; + owner = "anti-censorship/pluggable-transports"; + repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-4/ZTLyST73krOL87am28TM+1mktchpoCSaASMqQl5e8="; + sha256 = "sha256-DR1H5ncFPHZWQAwOZKkfRrjwfzhirSzwtvKesaRmqcA="; }; - vendorSha256 = "sha256-a2Ng+D1I0v5odChM6XVVnNwea/0SOTOmdm2dqKaSU3s="; + vendorHash = "sha256-66GqvwHPkMii5oXZV36ayYYkW1oaq5qTjkEA5BeS/5U="; meta = with lib; { description = "System to defeat internet censorship"; homepage = "https://snowflake.torproject.org/"; + changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/raw/v${version}/ChangeLog"; maintainers = with maintainers; [ lourkeur ]; license = licenses.bsd3; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6637b49e65e3..eb8d4c24d5b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15074,6 +15074,8 @@ with pkgs; rgbds = callPackage ../development/compilers/rgbds { }; + rml = callPackage ../development/compilers/rml { }; + composable_kernel = callPackage ../development/libraries/composable_kernel { inherit (llvmPackages) openmp; }; @@ -22204,11 +22206,11 @@ with pkgs; qt6 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-6) { inherit newScope; - inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; + inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; inherit bison cups dconf harfbuzz libGL perl gtk3 ninja; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; - inherit buildPackages; - inherit libglvnd; + inherit darwin buildPackages libglvnd; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; cmake = cmake.overrideAttrs (attrs: { patches = attrs.patches ++ [ ../development/libraries/qt-6/patches/cmake.patch