diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 34addb88c9fb..84657b594f7a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5184,6 +5184,16 @@ githubId = 37185887; name = "Calvin Kim"; }; + kennyballou = { + email = "kb@devnulllabs.io"; + github = "kennyballou"; + githubId = 2186188; + name = "Kenny Ballou"; + keys = [{ + longkeyid = "rsa4096/0xB0CAA28A02958308"; + fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308"; + }]; + }; kentjames = { email = "jameschristopherkent@gmail.com"; github = "kentjames"; diff --git a/pkgs/applications/kde/akonadi-calendar-tools.nix b/pkgs/applications/kde/akonadi-calendar-tools.nix new file mode 100644 index 000000000000..64fe3e1f4388 --- /dev/null +++ b/pkgs/applications/kde/akonadi-calendar-tools.nix @@ -0,0 +1,24 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, akonadi +, calendarsupport +}: + +mkDerivation { + pname = "akonadi-calendar-tools"; + meta = { + homepage = "https://github.com/KDE/akonadi-calendar-tools"; + description = "Console applications and utilities for managing calendars in Akonadi"; + license = with lib.licenses; [ gpl2Plus cc0 ]; + maintainers = with lib.maintainers; [ kennyballou ]; + platforms = lib.platforms.linux; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + akonadi + calendarsupport + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 18e857a24713..686007588410 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -68,6 +68,7 @@ let in { akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar.nix {}; + akonadi-calendar-tools = callPackage ./akonadi-calendar-tools.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; @@ -93,6 +94,7 @@ let incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; kaccounts-integration = callPackage ./kaccounts-integration.nix {}; + kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; @@ -137,6 +139,7 @@ let kipi-plugins = callPackage ./kipi-plugins.nix {}; kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; + kio-gdrive = callPackage ./kio-gdrive.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; klettres = callPackage ./klettres.nix {}; diff --git a/pkgs/applications/kde/kaccounts-providers.nix b/pkgs/applications/kde/kaccounts-providers.nix new file mode 100644 index 000000000000..e0e5ee3cd326 --- /dev/null +++ b/pkgs/applications/kde/kaccounts-providers.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, lib +, accounts-qt +, extra-cmake-modules +, intltool +, kaccounts-integration +, kcmutils +, kcoreaddons +, kdeclarative +, kdoctools +, kio +, kpackage +, kwallet +, qtwebengine +, signond +}: + +mkDerivation { + pname = "kaccounts-providers"; + meta = with lib; { + homepage = "https://community.kde.org/KTp/Setting_up_KAccounts"; + description = "Online account providers"; + maintainers = with maintainers; [ kennyballou ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + intltool + kdoctools + ]; + buildInputs = [ + accounts-qt + kaccounts-integration + kcmutils + kcoreaddons + kdeclarative + kio + kpackage + kwallet + qtwebengine + signond + ]; +} diff --git a/pkgs/applications/kde/kio-gdrive.nix b/pkgs/applications/kde/kio-gdrive.nix new file mode 100644 index 000000000000..0be35469d406 --- /dev/null +++ b/pkgs/applications/kde/kio-gdrive.nix @@ -0,0 +1,36 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kio +, libkgapi +, kcalendarcore +, kcontacts +, qtkeychain +, libsecret +, kaccounts-integration +}: + +mkDerivation { + pname = "kio-gdrive"; + meta = with lib; { + homepage = "https://github.com/KDE/kio-gdrive"; + description = "KIO slave for Google APIs"; + maintainers = with maintainers; [ kennyballou ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kcalendarcore + kcontacts + kaccounts-integration + libkgapi + libsecret + kio + qtkeychain + ]; +} diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index ccbe9d9a7ac0..d717bd42652b 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.10"; + version = "0.20.5"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SvvvHGR3UPyV61MaoFB68SaZKUT3ItYOPT1a7AddxlY="; + sha256 = "sha256-pUKKHrShED7yp5WSmHSbS+eiYs22Nm2/ouc2a8WYc38="; }; vendorSha256 = null; diff --git a/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch new file mode 100644 index 000000000000..25345bef90c4 --- /dev/null +++ b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch @@ -0,0 +1,13 @@ +diff --color -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-05-30 13:46:22.256040282 +0200 ++++ b/CMakeLists.txt 2021-05-30 14:15:42.530181216 +0200 +@@ -333,7 +333,7 @@ + # So, try first to find the CMake module provided by libxml2 package, then fallback + # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially + # in static build case). +-find_package(LibXml2 QUIET NO_MODULE) ++find_package(LibXml2 QUIET MODULE) + if(DEFINED LIBXML2_VERSION_STRING) + set(LIBXML2_FOUND ON) + set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) +Seulement dans b: good.patch diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 043e27fb4b2a..e704076ab57a 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7"; }; + # Revert after https://github.com/NixOS/nixpkgs/issues/125008 is + # fixed properly + patches = [ ./cmake-fix-libxml2-find-package.patch ]; + nativeBuildInputs = [ cmake flex diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index bca6f50bde8c..cfbe2583611e 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=${if enableShared then "1" else "0"}" ] ++ lib.optionals enableJava [ "-DWITH_JAVA=1" + ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428 + # https://github.com/libjpeg-turbo/libjpeg-turbo/commit/88bf1d16786c74f76f2e4f6ec2873d092f577c75 + "-DFLOATTEST=fp-contract" ]; doInstallCheck = true; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 2dfb58013dd7..f0f8c156dbdf 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.1"; + version = "0.12.5"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-X+mWuGm6hpTofoZSpM9U2GmYlETMH7MuYwk4ahFSyVE="; + sha256 = "sha256-9EVlmdolr189vdnuA01UUrcrmZ9W0FtvCcJuuSX1nLs="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index b857b910f0a5..3ebbc9b03396 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,13 +1,13 @@ -{ mkDerivation, base, containers, fetchgit, hedgehog -, optparse-applicative, parsec, lib, template-haskell, text +{ mkDerivation, base, containers, fetchgit, hedgehog, lib +, optparse-applicative, parsec, template-haskell, text }: mkDerivation { pname = "dconf2nix"; - version = "0.0.7"; + version = "0.0.8"; src = fetchgit { url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "04p8di1ckv5fkfa61pjg5xp8vcw091lz1kw39lh4w8ks2zjwaha1"; - rev = "34c523e920b79208c3b4c0ad371900b0948799f7"; + sha256 = "19jk3p0ys3lbqk21lm37a7alkg2vhnmkvcffjqfxrw8p4737hxid"; + rev = "6bf3d7d4ca9f553a9e1ba4a70a65640114d230b2"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix index 0b0af79301ef..f3c0b6c7b1b8 100644 --- a/pkgs/development/tools/ijq/default.nix +++ b/pkgs/development/tools/ijq/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ijq"; - version = "0.2.3"; + version = "0.3.4"; src = fetchgit { url = "https://git.sr.ht/~gpanders/ijq"; rev = "v${version}"; - sha256 = "14n54jh5387jf97zhc7aidn7w60zp5624xbvq4jdbsh96apg3bk1"; + sha256 = "ZKxEK6SPxEC0S5yXSzITPn0HhpJa4Bcf9X8/N+ZZAeA="; }; - vendorSha256 = "0xbni6lk6y3ig7pj2234fv7ra6b8qv0k8m3bvh59wwans8xpihzb"; + vendorSha256 = "04KlXE2I8ZVDbyo9tBnFskLB6fo5W5/lPzSpo8KGqUU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 549b2785382a..09365d188698 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -36,6 +36,18 @@ let }; }; + alefragnani.project-manager = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "project-manager"; + publisher = "alefragnani"; + version = "12.1.0"; + sha256 = "sha256-fYBKmWn9pJh2V0fGdqVrXj9zIl8oTrZcBycDaMOXL/8="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + alexdima.copy-relative-path = buildVscodeMarketplaceExtension { mktplcRef = { name = "copy-relative-path"; @@ -123,6 +135,18 @@ let }; }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-tailwindcss"; + publisher = "bradlc"; + version = "0.6.6"; + sha256 = "sha256-CRd+caKHFOXBnePr/LqNkzw0kRGYvNSkf4ecNgedpdA="; + }; + meta = with lib; { + license = licenses.mpl20; + }; + }; + brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "nixfmt-vscode"; @@ -968,6 +992,18 @@ let }; }; + svelte.svelte-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "svelte-vscode"; + publisher = "svelte"; + version = "105.0.0"; + sha256 = "sha256-my3RzwUW5MnajAbEnqxtrIR701XH+AKYLbnKD7ivASE="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index d53676f91d6f..a7de0183b673 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.12.0"; + version = "2.12.1"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-YCpWi5+p+d9YG8YEKRbppcX5/IizI1FnUfcnaoCGZNM="; + sha256 = "sha256-ZJCixDh2+H+G+lVgxw9H61Xy4hMg+3MbhI+e7sU4GQU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-WFxDY4K257QE/tH4B2c3qOzVG3t1RUh4lWRMzqyBC14="; + cargoSha256 = "sha256-rwgvyfjCBPe20xN6gNXBexjN/BwNhZjT1RtabKhCkJs="; doCheck = false; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index b9b5e806a4ec..e45eda3326a1 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + echo 'HAVE_SANDBOX_INIT=0' > configure.local + ''; + configurePhase = '' runHook preConfigure ./configure PREFIX=''${!outputDev} \ @@ -30,6 +34,14 @@ stdenv.mkDerivation rec { patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch; + doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + installCheckPhase = '' + runHook preInstallCheck + echo '# TEST' > test.md + $out/bin/lowdown test.md + runHook postInstallCheck + ''; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "regress"; @@ -41,4 +53,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } -