diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3018ebf68746..7dc14a61cbae 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -97,9 +97,9 @@ /pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 # Perl -/pkgs/development/interpreters/perl @volth @stigtsp -/pkgs/top-level/perl-packages.nix @volth @stigtsp -/pkgs/development/perl-modules @volth @stigtsp +/pkgs/development/interpreters/perl @volth @stigtsp @zakame +/pkgs/top-level/perl-packages.nix @volth @stigtsp @zakame +/pkgs/development/perl-modules @volth @stigtsp @zakame # R /pkgs/applications/science/math/R @jbedo @bcdarwin diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 15de9bc00b44..6093288ec03d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8709,6 +8709,12 @@ githubId = 13225611; name = "Nicolas Martin"; }; + pennae = { + name = "pennae"; + email = "github@quasiparticle.net"; + github = "pennae"; + githubId = 82953136; + }; p3psi = { name = "Elliot Boo"; email = "p3psi.boo@gmail.com"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 700ad741c003..73baf71f5ef5 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -55,6 +55,11 @@ actions. + + + KDE Plasma now finally works on Wayland. + + bash now defaults to major version 5. @@ -1106,6 +1111,23 @@ Superuser created successfully. functionality. + + + services.xserver.displayManager.defaultSession = "plasma5" + does not work anymore, instead use either + "plasma" for the Plasma X11 + session or "plasmawayland" for + the Plasma Wayland sesison. + + + + + boot.kernelParams now only accepts one + command line parameter per string. This change is aimed to + reduce common mistakes like param = 12, which + would be parsed as 3 parameters. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index f92721e2fc76..b7fa2cf0f254 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -346,6 +346,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `opencv2` no longer includes the non-free libraries by default, and consequently `pfstools` no longer includes OpenCV support by default. Both packages now support an `enableUnfree` option to re-enable this functionality. - `services.xserver.displayManager.defaultSession = "plasma5"` does not work anymore, instead use either `"plasma"` for the Plasma X11 session or `"plasmawayland"` for the Plasma Wayland sesison. +- `boot.kernelParams` now only accepts one command line parameter per string. This change is aimed to reduce common mistakes like "param = 12", which would be parsed as 3 parameters. + ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 530614ad9374..caf89c84397f 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -221,5 +221,5 @@ in }; - meta.maintainers = with lib.maintainers; [ erictapen ]; + meta.maintainers = with lib.maintainers; [ erictapen pennae ]; } diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 4f57f9abd06e..e036c684c886 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -26,7 +26,6 @@ let load-module module-udev-detect load-module module-native-protocol-unix load-module module-default-device-restore - load-module module-rescue-streams load-module module-always-sink load-module module-intended-roles load-module module-suspend-on-idle diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 46f2e3fec04c..4a9da9394519 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -83,7 +83,10 @@ in }; boot.kernelParams = mkOption { - type = types.listOf types.str; + type = types.listOf (types.strMatching ''([^"[:space:]]|"[^"]*")+'' // { + name = "kernelParam"; + description = "string, with spaces inside double quotes"; + }); default = [ ]; description = "Parameters added to the kernel command line."; }; diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 9044d201c457..f61b7c5b7b94 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, substituteAll , appstream-glib , desktop-file-utils , gettext @@ -13,12 +14,13 @@ , meson , ninja , pkg-config +, pulseaudio , wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "mousai"; - version = "0.4.2"; + version = "0.6.6"; format = "other"; @@ -26,9 +28,16 @@ python3.pkgs.buildPythonApplication rec { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - sha256 = "sha256-zH++GGFIz3oxkKOYB4zhY6yL3vENEXxtrv8mZZ+41kU="; + sha256 = "sha256-nCbFVFg+nVF8BOBfdzQVgdTRXR5UF18PJFC266yTFwg="; }; + patches = [ + (substituteAll { + src = ./paths.patch; + pactl = "${lib.getBin pulseaudio}/bin/pactl"; + }) + ]; + postPatch = '' patchShebangs build-aux/meson ''; @@ -53,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { gtk4 libadwaita librsvg + pulseaudio ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/mousai/paths.patch b/pkgs/applications/audio/mousai/paths.patch new file mode 100644 index 000000000000..35b328ad0ea3 --- /dev/null +++ b/pkgs/applications/audio/mousai/paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/backend/utils.py b/src/backend/utils.py +index cebc009..0087c09 100644 +--- a/src/backend/utils.py ++++ b/src/backend/utils.py +@@ -79,7 +79,7 @@ class Utils: + @staticmethod + def get_default_audio_sources(): + pactl_output = subprocess.run( +- ['/usr/bin/pactl', 'info'], ++ ['@pactl@', 'info'], + stdout=subprocess.PIPE, + text=True + ).stdout.splitlines() diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 5a3cd7b13f65..9cee6485500a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,12 +13,12 @@ let sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l"; }; betaVersion = { - version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" - sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; + version = "2021.1.1.14"; # "Android Studio Bumblebee (2021.1.1) Beta 1" + sha256Hash = "1j1fxl4vzq3bln2z9ycxn9imjgy55yd1nbl7ycmsi90bdp96pzj0"; }; latestVersion = { # canary & dev - version = "2021.1.1.13"; # "Android Studio Bumblebee (2021.1.1) Canary 13" - sha256Hash = "04w5jw79fkxk4gy1n9iy8kjxg6k3zcl59z76f04rh556n12f01gm"; + version = "2021.2.1.1"; # "Android Studio Chipmunk (2021.2.1) Canary 1" + sha256Hash = "1fn0jv6ybgdhgpwhamw16fjqbg2961ir9jhbjzanysi7y3935nbv"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 998341d6bb52..38f38ae3a51b 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv +{ stdenv +, lib , ctags +, cmark , appstream-glib , desktop-file-utils -, docbook_xsl -, docbook_xml_dtd_43 , fetchurl , flatpak , gnome , libgit2-glib +, gi-docgen , gobject-introspection , glade , gspell -, gtk-doc , gtk3 , gtksourceview4 , json-glib @@ -39,20 +39,20 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.40.2"; + version = "41.1"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "XVXkqqKkdYpGJj0cf9AJyz20RV4O1/nkTDoWNIYfo4o="; }; nativeBuildInputs = [ appstream-glib desktop-file-utils - docbook_xsl - docbook_xml_dtd_43 + gi-docgen gobject-introspection - gtk-doc meson ninja pkg-config @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags + cmark flatpak gnome.devhelp glade @@ -92,8 +93,6 @@ stdenv.mkDerivation rec { xvfb-run ]; - outputs = [ "out" "devdoc" ]; - prePatch = '' patchShebangs build-aux/meson/post_install.py ''; @@ -134,9 +133,13 @@ stdenv.mkDerivation rec { done ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libide "$devdoc" + ''; + passthru.updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; }; meta = with lib; { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 8ca19d95a7a5..7f8a0aba0ab8 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "072wdzl8gp4ygprgza4cfg46fvrd13zx9za5fa8s6vsd9w1l95l7"; - x86_64-darwin = "083sipxp9r7g6p6la15jjlib52l8xjbfxn2cb05scigq3zsyffy7"; - aarch64-linux = "1s82f6ba57r7bnjhbanmih5g7wa001sf6php1402w06cxxy7dz00"; - armv7l-linux = "113nk1rqw07giqq8pnc11dymzxdhj3nn3q2p0fppnm3lpccaq9hs"; + x86_64-linux = "0ic7h5aq1lyplk01bydqwrvz40h59sf0n0q4gxj844k4qidy14md"; + x86_64-darwin = "15s3vj7740ksb82gdjqpxw6cyd45ymdpacamkqk800929cv715qs"; + aarch64-linux = "0n3bxggfzlr1cqarq861yfqka3qfgpwvk8j22l7dv4vki06f8jzy"; + armv7l-linux = "0jksfdals8xf3vh5hqrd40pj5qn8byjrakjnrv926qznxjj152bn"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.61.0"; + version = "1.61.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 50e1babda2ac..d412c6fded87 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.11.4"; + version = "3.12.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3ZsPiUXX34Ev/a3OyMO94dyXZyMy4AVt5Cp/ELZLIGw="; + sha256 = "sha256-Pe/8AwOE5ktXNhxDfHm0ga4Uie9EyHroVugbsQ2OOD8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 4c2e262c9ae1..93886b3a2c21 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-gzU5AqjCIZlhLbnj/xuSGJ69ZhLv9zQxlM0Nn+MIX/U="; + sha256 = "sha256-+x3uN7Uj0fqO0kpHlOVnsshgEJA1z/6ZElKSTyLzfG4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 38513937d01f..bd35d44b7ccc 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -121,4 +121,16 @@ in buildFHSUserEnv { ln -sf ${lutris-unwrapped}/share/applications $out/share ln -sf ${lutris-unwrapped}/share/icons $out/share ''; + + meta = { + inherit (lutris-unwrapped.meta) + homepage + description + platforms + license + maintainers + broken; + + mainProgram = "lutris"; + }; } diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index fe739cb581a3..688d5acdd127 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -8,7 +8,6 @@ , gettext , yelp-tools , itstool -, libxmlxx3 , python , pygobject3 , gtk3 @@ -35,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000"; + sha256 = "dpflFEXhn9d05osWCtr2aHuAgXLeBBdgLhaXZra21L0="; }; patches = [ @@ -58,7 +57,6 @@ buildPythonApplication rec { autoreconfHook wrapGAppsHook pkg-config - libxmlxx3 gettext yelp-tools itstool diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e269d6313ae1..ec4d9da93bc1 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -6,7 +6,7 @@ # Native build inputs: , ninja, pkg-config -, python2, python3, perl +, python3, perl , gnutar, which , llvmPackages # postPatch: @@ -56,6 +56,10 @@ let python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools ]); + clangFormatPython3 = fetchurl { + url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; + sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l"; + }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -122,7 +126,7 @@ let nativeBuildInputs = [ ninja pkg-config - python2 python3WithPackages perl + python3WithPackages perl gnutar which llvmPackages.bintools ]; @@ -209,6 +213,9 @@ let # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc + # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: + base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format + patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a7ef9e495b1b..8cc2725e7972 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.40", - "sha256": "1v1n113rh5nzfbk5xaq4kp7fdg5n9rca978a9700nmrd0gqpd2hn", - "sha256bin64": "0xadlal8fb7hqjcq6d931if555spw72wa4d23m0fqcan31sky3i0", + "version": "95.0.4638.49", + "sha256": "11fiq6p2d99hl166pf39g83pk7m7ibi1zz19wj7qmcc7ql7006jz", + "sha256bin64": "04s81fnr01jq74fpl5n6jg8iw5iw6sdwyz40zja68h1crxh5d6d6", "deps": { "gn": { "version": "2021-08-11", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "96.0.4662.6", - "sha256": "14vr0nlp195h0hwfsd43fifl9r3qr875fw2da3gi9l5yi0pxns2q", - "sha256bin64": "1lq114rsgxqrdh18f2x3i0iwdn5ijxw3jb6nrxjxx0c3bvlzhsw8", + "version": "96.0.4664.9", + "sha256": "0hlniaglnd19cb3k2wi9mmf56ws8i89lm5y2dbjpr7vqnmj6qc39", + "sha256bin64": "1crl8gbhjyaa0yhkvm4va0g9dyljra8n5zg9bd1znmjlk0c124x3", "deps": { "gn": { "version": "2021-09-24", diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 092a620b98f4..53430cdf94ed 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.11"; - sha256 = "15h7w020p576zl91s5mr4npcmngrqqfj9xzlx6bk9i1cp6h4w0jy"; + version = "1.0.12"; + sha256 = "04fqliz7y4zzs4xraid54mqxwgrzh138nmfcs876vp534slvikpi"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix index 6363852068e5..b8c58e9c347c 100644 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -6,7 +6,7 @@ callPackage ./genericModule.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.1.5"; - sha256 = "03gxh12bd5mj1l4q3xilil806dsqaqmz93ff7ysf441frgkx3iy3"; + version = "1.1.6"; + sha256 = "1q6fqay1s9qwimjwlldc8hr6009cgx3ghz142mdx36jjv9isj9ln"; vendorSha256 = "0rfd22rf76mwj489zhswah4g3dhhz6davm336xgm9dbnyaz9d8r0"; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 15ce26b6db54..7be9c9cc742b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1095,12 +1095,13 @@ "version": "0.1.0" }, "vault": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v2.11.0", - "sha256": "1yzakc7jp0rs9axnfdqw409asrbjhq0qa7xn4xzpi7m94g1ii12d", - "version": "2.11.0" + "rev": "v2.24.1", + "sha256": "1xk14q06js774lqyylkbp53dnlsbgh3vi38mqqmndh80xigs6d99", + "version": "2.24.1", + "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48" }, "vcd": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 5b14fba5b420..874fbd6375d0 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -2,7 +2,7 @@ freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, -hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }: +hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk, libappindicator-gtk3 }: let rpath = lib.makeLibraryPath [ @@ -21,6 +21,7 @@ let gnome2.GConf gtk3 pango + libappindicator-gtk3 libuuid libX11 libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 9d8a0d68e756..9b15e12d66fc 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,33 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, openssl -, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive - -, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null -, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null -, traySupport ? true, gtk2 ? null -, pgpSupport ? true, gpgme ? null -, pythonPluginSupport ? true, python ? null -, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null +{ lib +, stdenv +, fetchFromGitHub +, autoconf-archive +, autoreconfHook +, cmocka +, curl +, expat +, expect +, glib +, glibcLocales +, libmesode +, libmicrohttpd +, libotr +, libuuid +, ncurses +, openssl +, pkg-config +, readline +, sqlite +, autoAwaySupport ? true, libXScrnSaver ? null, libX11 +, notifySupport ? true, libnotify, gdk-pixbuf +, omemoSupport ? true, libsignal-protocol-c, libgcrypt +, pgpSupport ? true, gpgme +, pythonPluginSupport ? true, python +, traySupport ? true, gtk }: assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; assert notifySupport -> libnotify != null && gdk-pixbuf != null; -assert traySupport -> gtk2 != null; +assert traySupport -> gtk != null; assert pgpSupport -> gpgme != null; assert pythonPluginSupport -> python != null; assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; -with lib; - stdenv.mkDerivation rec { pname = "profanity"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "0xmzsh0szm8x3hgw65j0cd2bp8cmrnq5pjz49lqajircyzflsngm"; + hash = "sha256-8WGHOy0fSW8o7vMCYZqqpvDsn81JZefM6wGfjQ5iKbU="; }; patches = [ @@ -37,26 +51,42 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - autoreconfHook autoconf-archive glibcLocales pkg-config + autoconf-archive + autoreconfHook + glibcLocales + pkg-config ]; buildInputs = [ - expect readline libuuid glib openssl expat ncurses libotr - curl libmesode cmocka libmicrohttpd sqlite - ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] - ++ optionals notifySupport [ libnotify gdk-pixbuf ] - ++ optionals traySupport [ gtk2 ] - ++ optionals pgpSupport [ gpgme ] - ++ optionals pythonPluginSupport [ python ] - ++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ]; + cmocka + curl + expat + expect + glib + libmesode + libmicrohttpd + libotr + libuuid + ncurses + openssl + readline + sqlite + ] ++ lib.optionals autoAwaySupport [ libXScrnSaver libX11 ] + ++ lib.optionals notifySupport [ libnotify gdk-pixbuf ] + ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ] + ++ lib.optionals pgpSupport [ gpgme ] + ++ lib.optionals pythonPluginSupport [ python ] + ++ lib.optionals traySupport [ gtk ]; # Enable feature flags, so that build fail if libs are missing - configureFlags = [ "--enable-c-plugins" "--enable-otr" ] - ++ optionals notifySupport [ "--enable-notifications" ] - ++ optionals traySupport [ "--enable-icons-and-clipboard" ] - ++ optionals pgpSupport [ "--enable-pgp" ] - ++ optionals pythonPluginSupport [ "--enable-python-plugins" ] - ++ optionals omemoSupport [ "--enable-omemo" ]; + configureFlags = [ + "--enable-c-plugins" + "--enable-otr" + ] ++ lib.optionals notifySupport [ "--enable-notifications" ] + ++ lib.optionals traySupport [ "--enable-icons-and-clipboard" ] + ++ lib.optionals pgpSupport [ "--enable-pgp" ] + ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ] + ++ lib.optionals omemoSupport [ "--enable-omemo" ]; preAutoreconf = '' mkdir m4 @@ -66,18 +96,15 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.utf8"; - meta = { + meta = with lib; { + homepage = "http://www.profanity.im/"; description = "A console based XMPP client"; longDescription = '' Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi. ''; - homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; - platforms = platforms.unix; - changelog = "https://github.com/profanity-im/profanity/releases/tag/${version}"; - downloadPage = "https://github.com/profanity-im/profanity/releases/"; maintainers = [ maintainers.devhell ]; - updateWalker = true; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 01ad09cd25f8..19354df40adf 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -1,28 +1,54 @@ -{ lib, fetchurl, appimageTools }: +{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, makeWrapper, +electron, libsecret }: -let +stdenv.mkDerivation rec { pname = "tutanota-desktop"; version = "3.88.4"; - name = "tutanota-desktop-${version}"; + src = fetchurl { - url = "https://mail.tutanota.com/desktop/tutanota-desktop-linux.AppImage"; - name = "tutanota-desktop-${version}.AppImage"; - sha256 = "sha256-MwvH6SGZwcvxAr5olklqKTF2p2pv8+F5qwpmwN3uZkc="; + url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; + name = "tutanota-desktop-${version}.tar.gz"; + sha256 = "sha256-UOb63+NfW6mHKaj3PDEzvz5hcmJBIISq02rtwgSZMjo="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { - inherit name src; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + dontConfigure = true; + dontBuild = true; - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + desktopItems = makeDesktopItem { + name = pname; + exec = "tutanota-desktop"; + icon = "tutanota-desktop"; + comment = meta.description; + desktopName = "Tutanota Desktop"; + genericName = "Email Reader"; + }; - install -m 444 -D ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications - substituteInPlace $out/share/applications/tutanota-desktop.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/opt/tutanota-desktop $out/share/tutanota-desktop + + cp -r ./ $out/opt/tutanota-desktop + mv $out/opt/tutanota-desktop/{locales,resources} $out/share/tutanota-desktop + + for icon_size in 64 512; do + icon=resources/icons/icon/$icon_size.png + path=$out/share/icons/hicolor/$icon_size'x'$icon_size/apps/tutanota-desktop.png + install -Dm644 $icon $path + done + + makeWrapper ${electron}/bin/electron \ + $out/bin/tutanota-desktop \ + --add-flags $out/share/tutanota-desktop/resources/app.asar \ + --run "mkdir /tmp/tutanota" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]} + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 723b67872c23..16db7384df17 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -44,7 +44,7 @@ let "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; - "8.14+rc1".sha256 = "0jrkgj7c2959dsinw4x7q4ril1x24qq08snl25hgx33ls4sym5zb"; + "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 20219be776a5..b46cfb8ee8df 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dRHlbxNV4nS50WbJP5lD1zB7NkZmv7nlPUm3RlQIBtc="; + sha256 = "sha256-NzE2eT3QxnbDW63Cnv6M7IlYgb2XuymphwaL1PTfcyQ="; }; - cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE="; + cargoSha256 = "sha256-9SWovdjYfeneqOVl+I+tuJTIC/htC7h1tXi2KUbdYb8="; nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 9859163031c3..f3400f7e8e02 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # should be odd-unstable but we are tracking unstable versions for now }; }; diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index a00b239641f8..1f2cb9dc52e1 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -13,6 +13,7 @@ , wrapGAppsHook , glib , gtk3 +, libhandy , libxml2 , gtk-vnc , gtk-frdp @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "40.0.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-vpvLoHzz+vWs4M5UzSL4YJtNx3ZuJe5f2cGAw5WbTRE="; + hash = "sha256-M5/1VaEI0gt6sPO/GCmWMWAYYOeO+peLpqudGO3DtGA="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { glib gtk-vnc gtk3 + libhandy libxml2 gtk-frdp ]; diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 11cd3735e1d5..39eb0338332c 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "40.4"; + version = "41.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M0IFAODgYPF4pDUGMZfULa57Z+OcxDepZRCjPd9+lfs="; + sha256 = "lautDW/urJVg2zq4C6fF6rsf3xyg47PJMzmvBUU6JNg="; }; postPatch = '' diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index 3d2f19b02e8b..7d15e6b41ef6 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , intltool , fetchFromGitLab , meson @@ -11,7 +12,6 @@ , desktop-file-utils , gtk-doc , wrapGAppsHook -, gnome , itstool , libxml2 , yelp-tools @@ -25,6 +25,7 @@ , runCommand , symlinkJoin , gobject-introspection +, nix-update-script }: let @@ -93,8 +94,8 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; + updateScript = nix-update-script { + attrPath = "gnome.gucharmap"; }; }; diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 7d1d4e90abf0..0178c04b53ca 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "j/rPfA6inO3qBndzCGHUh2qPesTaTGI0u3X3/TcFoQg="; + sha256 = "/OVi4rJsvPwMZ4U43MgfncFc5g1aie5DWJB79jQwTEA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 6efefd1fb032..5b1d110d46a5 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "unstable-2021-07-07"; + version = "unstable-2021-10-03"; - # temporarily switched to https://github.com/micheleg/dash-to-dock/pull/1402 because upstream doesn't work with GNOME 40 yet. + # temporarily switched to commit hash because GNOME 40 version is not released yet. src = fetchFromGitHub { - owner = "ewlsh"; + owner = "micheleg"; repo = "dash-to-dock"; - rev = "e4beec847181e4163b0a99ceaef4c4582cc8ae4c"; - hash = "sha256-7UVnLXH7COnIbqxbt3CCscuu1YyPH6ax5DlKdaHCT/0="; + rev = "9605dd69fe86d4f92416299c3f62605e75827dd3"; + sha256 = "0vrkiq5z2f11gqlfyis2rsnp6j25hwsp24s21vr55qkzkfszsigg"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix new file mode 100644 index 000000000000..f9b8020c924c --- /dev/null +++ b/pkgs/development/compilers/ligo/default.nix @@ -0,0 +1,62 @@ +{ lib +, fetchFromGitLab +, coq +, cacert +}: + +coq.ocamlPackages.buildDunePackage rec { + pname = "ligo"; + version = "0.26.0"; + src = fetchFromGitLab { + owner = "ligolang"; + repo = "ligo"; + rev = "d48098c6724bc0a62170c2f9ff73c792c71c8452"; + sha256 = "sha256-uu5985llYsi/9ExKZetk48FqU0sJQB1EirdT/pUw0DA="; + }; + + # The build picks this up for ligo --version + LIGO_VERSION=version; + + useDune2 = true; + + buildInputs = with coq.ocamlPackages; [ + coq + menhir + menhirLib + qcheck + ocamlgraph + ppx_deriving + ppx_deriving_yojson + ppx_expect + tezos-base + tezos-shell-services + tezos-010-PtGRANAD-test-helpers + tezos-protocol-010-PtGRANAD-parameters + tezos-protocol-010-PtGRANAD + tezos-protocol-environment + yojson + getopt + terminal_size + pprint + linenoise + data-encoding + bisect_ppx + cmdliner + ]; + + checkInputs = [ + cacert + coq.ocamlPackages.ca-certs + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://ligolang.org/"; + downloadPage = "https://ligolang.org/docs/intro/installation"; + description = "A friendly Smart Contract Language for Tezos"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ulrikstrid ]; + }; +} diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index fb134962b74a..ba64e53876cb 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -91,10 +91,11 @@ let doCheck = false; # fails, requires dbus daemon passthru = { - updateScript = gnome.updateScript { - attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; - packageName = pname; - }; + updateScript = gnome.updateScript { + attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; + packageName = pname; + freeze = true; + }; }; meta = with lib; { diff --git a/pkgs/development/coq-modules/goedel/default.nix b/pkgs/development/coq-modules/goedel/default.nix index 965ae1b6ec46..c50f8672e01c 100644 --- a/pkgs/development/coq-modules/goedel/default.nix +++ b/pkgs/development/coq-modules/goedel/default.nix @@ -5,12 +5,14 @@ mkCoqDerivation { pname = "goedel"; owner = "coq-community"; - release."8.12.0".rev = "v8.12.0"; + releaseRev = (v: "v${v}"); + release."8.12.0".sha256 = "sha256-4lAwWFHGUzPcfHI9u5b+N+7mQ0sLJ8bH8beqQubfFEQ="; + release."8.13.0".sha256 = "0sqqkmj6wsk4xmhrnqkhcsbsrqjzn2gnk67nqzgrmjpw5danz8y5"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.11" "8.13"; out = "8.12.0"; } + { case = range "8.11" "8.14"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; diff --git a/pkgs/development/libraries/atkmm/2.36.nix b/pkgs/development/libraries/atkmm/2.36.nix index 03dd009d2641..6b22c34e0c2f 100644 --- a/pkgs/development/libraries/atkmm/2.36.nix +++ b/pkgs/development/libraries/atkmm/2.36.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "atkmm_2_36"; packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index ff3e9ee52e99..a556b64f1d38 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,26 +1,69 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, exiv2 +, glib +, gnome +, gobject-introspection +, vala +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +}: stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.12.3"; + version = "0.14.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jt5cqL8b4QBULrR7XnBy+xnKVHhgMHh7DPKbHMMWfM="; + sha256 = "5YJ5pv8gtvZPpJlhXaXptXz2W6eFC3L6/fFyIanW1p4="; }; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib ]; - propagatedBuildInputs = [ exiv2 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + # Python binding overrides + python3 + python3.pkgs.pygobject3 + ]; + + propagatedBuildInputs = [ + exiv2 + ]; mesonFlags = [ "-Dgtk_doc=true" + "-Dpython3_girdir=${placeholder "out"}/${python3.sitePackages}/gi/overrides" ]; doCheck = true; + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running unit tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/gexiv2/libgexiv2.so.2 $out/lib/libgexiv2.so.2 + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -31,7 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.gnome.members; }; diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index db713cf9ea5f..1ba18898ad89 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.68.1"; + version = "2.70.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ZmTifJqcyoHCnjVof0ny4NFzovyemMNCgxH3B9tTL4w="; + sha256 = "sha256-gAj9iu3cyGej+X8RPeYl9ulu+Yz3hgN5gTqcD+/9tSA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index dfa454b9253a..f409935372ee 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.1"; + version = "2.66.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ab1rUydxbKL1EatYCpaf178M0sJM4V4dDlMFktP/IJw="; + sha256 = "sha256-sqTNe5rph3lMu1ob7MEM7LZRgrm7hBhoYl1ruxI+2x0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 4194064a5a29..1f2966695d86 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/pkgs/development/libraries/goocanvas/3.x.nix b/pkgs/development/libraries/goocanvas/3.x.nix index c5decffe74e2..8a07f31b818d 100644 --- a/pkgs/development/libraries/goocanvas/3.x.nix +++ b/pkgs/development/libraries/goocanvas/3.x.nix @@ -9,6 +9,7 @@ , cairo , gtk3 , glib +, gnome }: stdenv.mkDerivation rec { @@ -39,6 +40,14 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 1bc763349a86..03268fb024c6 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; + versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index 4e706f409870..764208008656 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; attrPath = "goocanvasmm2"; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # stable version has not been released yet, last update 2015 }; }; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 13ec503fae0e..ed8f8edd656f 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.13"; + version = "0.3.14"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HEMF1nNkqTBUODbMGYLzDpRpc7j/avPv4x2HcJq1IPg="; + sha256 = "aGhEs07HOySTH/bMT2Az8AcpR6bbYKzcf7Pq8Velgcg="; }; patches = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "A collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 172ae39536e6..16897c6f0446 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,40 +1,62 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, vala +, glib +, liboauth +, gtk3 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, libxml2 +, gnome +, gobject-introspection +, libsoup +, totem-pl-parser +}: -let +stdenv.mkDerivation rec { pname = "grilo"; - version = "0.3.13"; # if you change minor, also change ./setup-hook.sh -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.3.14"; # if you change minor, also change ./setup-hook.sh outputs = [ "out" "dev" "man" "devdoc" ]; outputBin = "dev"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2021-39365.patch"; - url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/cd2472e506dafb1bb8ae510e34ad4797f63e263e.patch"; - sha256 = "1i1p21vlms43iawg4dl1dibnpsbnkx27kcfvllnx76q07bfrpwzm"; - }) - ]; - setupHook = ./setup-hook.sh; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "A2nQsAuw9Zul966oz8Zl843xSltBgtKMfB4s0VtRh0M="; + }; + mesonFlags = [ "-Denable-gtk-doc=true" ]; nativeBuildInputs = [ - meson ninja pkg-config gettext gobject-introspection vala - gtk-doc docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkg-config + gettext + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + liboauth + gtk3 + libxml2 + libsoup + totem-pl-parser ]; - buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { updateScript = gnome.updateScript { @@ -47,7 +69,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 7123aa0d3ac1..76adcc1fae33 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = "gst_all_1.gstreamermm"; + attrPath = "gst_all_1.gstreamermm"; + packageName = "gstreamermm"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index e6c6d9391933..b7c2d5d3aa9c 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -9,19 +9,19 @@ , glib , gtk3 , freerdp -, nix-update-script +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "3.37.1-unstable-2020-10-26"; + version = "unstable-2021-10-01"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "805721e82ca1df6a50da3b5bd3b75d6747016482"; - sha256 = "q/UFKYj3LUkAzll3KeKd6oec0GJnDtTuFMTTatKFlcs="; + rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0"; + sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko="; }; nativeBuildInputs = [ @@ -39,8 +39,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = unstableGitUpdater { + # The updater tries src.url by default, which does not exist for fetchFromGitHub (fetchurl). + url = "${meta.homepage}.git"; + branch = "gtk-frdp-0-1"; }; }; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7999d62b9112..499615a79c1c 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -202,6 +202,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtk+"; attrPath = "gtk3"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 2e43e58db42d..734cf833fd84 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "${pname}3"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 0a654d9518dc..67afc4026d1a 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.2.0"; + version = "4.4.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12x9j82y37r4v0ngs22rzp4wmw7k2bbb9d3bymcczzz7y8w4q328"; + sha256 = "LrRkMmCW5qQMgunNB0Fk2BA/teB4ZWecCmSeQXRwDdo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index e5563d37f1ac..0095b6ca9e08 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { packageName = "gtksourceview"; attrPath = "gtksourceview4"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 3011a126c10d..5bdcc029c5c8 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "gtksourceviewmm4"; packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 2b9124032590..cdc96f3f1a04 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtksourceviewmm"; versionPolicy = "none"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 405598c69640..5889c6ee3acf 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -12,13 +12,16 @@ , vala , gobject-introspection , fribidi +, glib , gtk4 +, gnome +, gsettings-desktop-schemas , xvfb-run }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.0.0-alpha.2"; + version = "1.0.0.alpha.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - sha256 = "1yvjdzs5ipmr4gi0l4k6dkqhl9b090kpjc3ll8bv1a6i7yfaf53s"; + sha256 = "sha256-4ED2m8hZMWbu5sFbkH0W6q05+cYCCkx+ubeDqg3W3a0="; }; nativeBuildInputs = [ @@ -54,13 +57,31 @@ stdenv.mkDerivation rec { ]; checkInputs = [ + gnome.adwaita-icon-theme xvfb-run ]; doCheck = true; checkPhase = '' - xvfb-run meson test + runHook preCheck + + testEnvironment=( + # Disable portal since we cannot run it in tests. + ADW_DISABLE_PORTAL=1 + + # AdwSettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme. + # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name. + # See adw_settings_constructed function in https://gitlab.gnome.org/GNOME/libadwaita/commit/60ec69f0a5d49cad8a6d79e4ecefd06dc6e3db12 + "XDG_DATA_DIRS=${glib.getSchemaPath gsettings-desktop-schemas}/../.." + + # Tests need a cache directory + "HOME=$TMPDIR" + ) + env "''${testEnvironment[@]}" xvfb-run \ + meson test --print-errorlogs + + runHook postCheck ''; postInstall = '' diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index b3f6e1a7cdd9..63acabb320e4 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -87,6 +87,7 @@ assert postgresSupport -> postgresql != null; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index ad5e0cbecd6e..34735e644e43 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # Should be odd-unstable but stable version has not been released yet. }; }; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index cbc2c8a617b4..d4583c74df0f 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.6"; + version = "2.10.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths="; + sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "libsigcxx"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 6fd7f3e696a2..b958ba307674 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { glib-networking.out ]; updateScript = gnome.updateScript { - attrPath = "libsoup3"; + attrPath = "libsoup_3"; packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 6d2150103a10..f902d3203776 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 39a1d505b652..c78cc192a7cf 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "3.36.0"; + version = "40.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM="; }; nativeBuildInputs = [ @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "${pname}${lib.versions.major version}"; - versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 67c5a0794ed5..19af942d759f 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "libxmlxx"; packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 41c842220c7d..b3ff59ad41e1 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { --replace 'docdir=''${datarootdir}' "docdir=$doc/share" ''; + passthru = { + updateScript = gnome.updateScript { + attrPath = "libxmlxx3"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index a5553dd0d00a..2668de9b4612 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg="; + sha256 = "sha256-Bi+C3VSKYq7IUQWFAROskBpiK8UcbPxjIFY2Xof4GYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index fc3be7421adb..d6864b80f9ed 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6"; + sha256 = "N/GswCvL5ooxuG4HwSmoOb0yduZW3Inrf8CpJ0bv8nI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index bbc9a804aa74..ccd0b19e1ad3 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -1,6 +1,7 @@ { pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }: let + inherit (pkgs) lib; since = (version: pkgs.lib.versionAtLeast nodejs.version version); before = (version: pkgs.lib.versionOlder nodejs.version version); super = import ./composition.nix { @@ -319,23 +320,11 @@ let }; netlify-cli = - let - esbuild = pkgs.esbuild.overrideAttrs (old: rec { - version = "0.13.6"; - - src = fetchFromGitHub { - owner = "netlify"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; - }; - - }); - in super.netlify-cli.override { preRebuild = '' - export ESBUILD_BINARY_PATH="${esbuild}/bin/esbuild" + export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" ''; + meta.maintainers = with lib.maintainers; [ roberth ]; }; ssb-server = super.ssb-server.override { diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index cceda84be105..8a48df97f97d 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.6.1"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ug96Nj50fg29QHVCD95Cs+bFDnObqAiAdXh4l4qPT/k="; + sha256 = "48b8081700eeaa92f8921d5aff6a5287c0eb47a3cc483f2032105290ce0454b5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 3cba24e12bfb..203102cafb9a 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.8.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4RQCpgJ+QkTgNAu/9rJmnA0wxOUm3HeAEDLWBbMMuSo="; + sha256 = "bedd376807ab3dde08f2d92caa0e4e5ad7c2ccfc7069561e80964b998a0d8f51"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 94a1a5e342de..d7c389bb8640 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3gbCBb+jnz4hE2T02JsSGxoFSIVg2UDTOaRMKCXh1vg="; + sha256 = "3b53fde67a97718642d29ac26b1b7608e7581b37d1e468f3c2ae38ea6cf7308f"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index ced64648602b..43b35ca1988d 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cxuLaZ4cBdsWsyfRqb4NJ1+RWZSJhvTTclYF9uy6QM4="; + sha256 = "49c91574e04d52fc7c0fade95dd5e6ccb51190ab8b419352d008a617c7799879"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 23698885aba2..e6b88e727fa5 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.4.4"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RqFvdF4sYDTgz0uZfqOn1trcSQX6qrbUH89957zbUoU="; + sha256 = "e56e35fa647d794429c6fc1595b2ebf5f4d627f0b3d6499a000b54be343ea37e"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 0e0d19e4f40a..1542a447a1bc 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.7.5"; + version = "0.7.6"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-vC2teem231Lw7cglVc+0M+QbgMgZ23JzTYy7wvnhFI4="; + sha256 = "sha256-Gf3hNCXioaLiQ0fZWPe9PO2YQeId4ZLmWsSZ5WvjSk0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix new file mode 100644 index 000000000000..9e24309d984a --- /dev/null +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, python3 +, rustPlatform +, pkg-config +, glib +, libshumate +, gst_all_1 +, gtk4 +, libadwaita +, llvmPackages +, glibc +, pipewire +, wayland +, wrapGAppsHook4 +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "ashpd-demo"; + version = "0.0.1-alpha"; + + src = + let + share = fetchFromGitHub { + owner = "bilelmoussaoui"; + repo = "ashpd"; + rev = version; + sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; + }; + in + "${share}/ashpd-demo"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc + wrapGAppsHook4 + desktop-file-utils + glib # for glib-compile-schemas + ]; + + buildInputs = [ + glib + gtk4 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libadwaita + pipewire + wayland + libshumate + ]; + + # libspa-sys requires this for bindgen + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + # included by libspa-sys requires + BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + # https://github.com/bilelmoussaoui/ashpd/pull/32 + substituteInPlace build-aux/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Tool for playing with XDG desktop portals"; + homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix new file mode 100644 index 000000000000..efd5b917e9cd --- /dev/null +++ b/pkgs/development/tools/esbuild/netlify.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "esbuild"; + version = "0.13.6"; + + src = fetchFromGitHub { + owner = "netlify"; + repo = "esbuild"; + rev = "v${version}"; + sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; + }; + + vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + + meta = with lib; { + description = "A fork of esbuild maintained by netlify"; + homepage = "https://github.com/netlify/esbuild"; + license = licenses.mit; + maintainers = with maintainers; [ roberth ]; + }; +} diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch deleted file mode 100644 index 8070af173aaf..000000000000 --- a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua -index c5af5a2..1949fdc 100644 ---- a/src/luarocks/core/cfg.lua -+++ b/src/luarocks/core/cfg.lua -@@ -425,7 +425,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home) - defaults.external_lib_extension = "dylib" - defaults.arch = "macosx-"..target_cpu - defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" -- local version = util.popen_read("sw_vers -productVersion") -+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@" - version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 - if version >= 10 then - version = 8 -@@ -434,8 +434,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home) - else - defaults.gcc_rpath = false - end -- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" -- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" -+ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang" -+ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang" - defaults.web_browser = "open" - end - diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch b/pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch new file mode 100644 index 000000000000..3252e6ae7b4f --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch @@ -0,0 +1,24 @@ +diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua +index 535bd69..b017161 100644 +--- a/src/luarocks/core/cfg.lua ++++ b/src/luarocks/core/cfg.lua +@@ -436,7 +436,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home) + defaults.external_lib_extension = "dylib" + defaults.arch = "macosx-"..target_cpu + defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" +- local version = util.popen_read("sw_vers -productVersion") ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@" + if not (version:match("^%d+%.%d+%.%d+$") or version:match("^%d+%.%d+$")) then + version = "10.3" + end +@@ -448,8 +448,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home) + else + defaults.gcc_rpath = false + end +- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc" +- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc" ++ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang" ++ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang" + defaults.web_browser = "open" + end + diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index c2449de5dd28..aa49af753b32 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "luarocks"; - version = "3.2.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${version}"; - sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2"; + sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d"; }; - patches = [ ./darwin-3.1.3.patch ]; + patches = [ ./darwin-3.7.0.patch ]; postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix new file mode 100644 index 000000000000..a4b30c572a00 --- /dev/null +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, libX11, freeglut, glew, libXNVCtrl, libXext, lib }: + +stdenv.mkDerivation rec { + pname = "gl-gsync-demo"; + version = "unstable-2020-12-27"; + + src = fetchFromGitHub { + owner = "dahenry"; + repo = "gl-gsync-demo"; + rev = "4fd963a8ad880dc2d846394c8c80b2091a119591"; + sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d"; + }; + + buildInputs = [ libX11 freeglut glew libXNVCtrl libXext ]; + + installPhase = '' + runHook preInstall + + install -D gl-gsync-demo -t $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + license = with licenses; mit; + platforms = platforms.linux; + maintainers = with maintainers; [ atemu ]; + description = "A very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux"; + longDescription = '' + The demo simply draws a vertical bar moving accross the screen at constant speed, but deliberately rendered at a variable frame rate. + + The min and max frame rates can be manually changed at runtime, by step of 10 fps and with a min of 10 fps. + + The demo also allows to toggle V-Sync on/off. + ''; + homepage = "https://github.com/dahenry/gl-gsync-demo"; + }; +} diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d2cbf8c0d520..5209927c506d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -34,7 +34,7 @@ let description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen globin patryk27 ]; + maintainers = with maintainers; [ erictapen globin patryk27 pennae ]; }; }; diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index ac552abda07d..ee9739bfac28 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xfGx9rtpLmotW00pB4822dwBzB2u+QYNSLWtA+JDffU="; + sha256 = "sha256-C1KLwl+hwyoRUK4GrDhj1Wwx4Fut+QuhgTFagyQeldc="; }; - vendorSha256 = "sha256-USWrI2vH0RpGJgxoEfEwqDUwXjxylOOqA9g7GltOdYQ="; + vendorSha256 = "sha256-v81YkImg8GdI5locfsU4dg2JyO7XB24mfHRIZ+k8QBA="; doCheck = false; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index a615330a4a8f..0b481382ee7c 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -23,13 +23,13 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5"; + sha256 = "sha256-Blwj4cqrrYXohnGyJYe+1NYifxqfS4DoVUHmxFf62i4="; }; # XXX: See patch files for relevant explanations. diff --git a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch index 942c9a579f6f..31639c02f4c5 100644 --- a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch +++ b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch @@ -1,26 +1,23 @@ -commit c44347b3b813e209fff537b4d46d23430727a5e2 -Author: Bernardo Meurer -Date: Tue Feb 25 21:27:39 2020 -0800 makefile: correctly sed paths - + The default Makefile for tlp makes a mess with catenating `DESTDIR` to everything, but then not actualy using the catenated (_ prefixed) variables to sed it's `.in` files. - + This patch makes sure that it correctly sets the paths, taking `DESTDIR` in account where it makes sense (e.g. /bin where we want $out/bin) but not where it doesn't (/etc/tlp.conf should be just that). - + The reason DESTDIR is used at all, as opposed to the more appropriate PREFIX, is covered in the nix formula, and is (also) due to the Makefile being a bit "different." diff --git a/Makefile b/Makefile -index b5af74e..95122df 100644 +index e9bbab4..6b66651 100644 --- a/Makefile +++ b/Makefile -@@ -47,17 +47,17 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) +@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) SED = sed \ -e "s|@TLPVER@|$(TLPVER)|g" \ @@ -28,14 +25,18 @@ index b5af74e..95122df 100644 - -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ - -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ - -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ +- -e "s|@TLP_BATD@|$(TLP_BATD)|g" \ + -e "s|@TLP_SBIN@|$(_SBIN)|g" \ + -e "s|@TLP_TLIB@|$(_TLIB)|g" \ + -e "s|@TLP_FLIB@|$(_FLIB)|g" \ + -e "s|@TLP_ULIB@|$(_ULIB)|g" \ ++ -e "s|@TLP_BATD@|$(_BATD)|g" \ -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ - -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ +- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \ + -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ ++ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \ -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ diff --git a/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch b/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch index b37c7280e382..3b04f2fb061d 100644 --- a/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch +++ b/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch @@ -1,23 +1,20 @@ -commit ca94cd56210067e2a55c1f413bd7713f7d338f9f -Author: Bernardo Meurer -Date: Wed Feb 26 10:46:23 2020 -0800 tlp-sleep.service: reintroduce - + This patch reintroduces tlp-sleep as a systemd unit as opposed to a systemd system-sleep hook script. This is due to the recommendation by systemd itself to not use the hook scripts. As per the manual: - + > Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/ > are intended for local use only and should be considered hacks. If > applications want to react to system suspend/hibernation and resume, > they should rather use the Inhibitor interface[1]. diff --git a/Makefile b/Makefile -index 95122df..0e9230a 100644 +index e9bbab4..7d71e02 100644 --- a/Makefile +++ b/Makefile -@@ -70,6 +70,7 @@ INFILES = \ +@@ -76,6 +76,7 @@ INFILES = \ tlp.rules \ tlp-readconfs \ tlp-run-on \ @@ -25,7 +22,7 @@ index 95122df..0e9230a 100644 tlp.service \ tlp-stat \ tlp.upstart \ -@@ -99,7 +100,6 @@ SHFILES = \ +@@ -106,7 +107,6 @@ SHFILES = \ tlp-rdw-udev.in \ tlp-rf.in \ tlp-run-on.in \ @@ -33,27 +30,27 @@ index 95122df..0e9230a 100644 tlp-sleep.elogind \ tlp-stat.in \ tlp-usb-udev.in -@@ -147,7 +147,7 @@ ifneq ($(TLP_NO_INIT),1) +@@ -159,7 +159,7 @@ ifneq ($(TLP_NO_INIT),1) endif ifneq ($(TLP_WITH_SYSTEMD),0) install -D -m 644 tlp.service $(_SYSD)/tlp.service - install -D -m 755 tlp-sleep $(_SDSL)/tlp -+ install -D -m 644 tlp-sleep.service $(_SYSD)/tlp-sleep.service ++ install -D -m 644 tlp-sleep.service $(_SDSL)/tlp-sleep.service endif ifneq ($(TLP_WITH_ELOGIND),0) install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep -@@ -204,7 +204,7 @@ uninstall-tlp: +@@ -216,7 +216,7 @@ uninstall-tlp: rm $(_ULIB)/rules.d/85-tlp.rules rm -f $(_SYSV)/tlp rm -f $(_SYSD)/tlp.service - rm -f $(_SDSL)/tlp-sleep -+ rm -f $(_SYSD)/tlp-sleep.service ++ rm -f $(_SDSL)/tlp-sleep.service rm -f $(_ELOD)/49-tlp-sleep rm -f $(_SHCPL)/tlp-stat rm -f $(_SHCPL)/bluetooth diff --git a/tlp-sleep b/tlp-sleep deleted file mode 100644 -index 3de85ce..0000000 +index e548d55..0000000 --- a/tlp-sleep +++ /dev/null @@ -1,11 +0,0 @@ @@ -61,7 +58,7 @@ index 3de85ce..0000000 - -# tlp - systemd suspend/resume hook -# --# Copyright (c) 2020 Thomas Koch and others. +-# Copyright (c) 2021 Thomas Koch and others. -# This software is licensed under the GPL v2 or later. - -case $1 in diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 185176440c1b..4f59810a7623 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "v${version}"; - sha256 = "0vx8ki0wi9xil2iksvxzh8mhx4c5ikkhdcnc8mcwqn14cvjkggja"; + sha256 = "sha256-/gcNVTfLJKA5qzRgAqFSlSI618QBsJTxFE1doOKR7e8="; }; - cargoSha256 = "1nx2lvbjflsjma5q9ck6vq499hf75w91i4h8wlzr83wqk37i7rhc"; + cargoSha256 = "sha256-o5VKj69Wp7zLR3TS+wNA0D8nP6Cynlr4KtW4JSUm0VE="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 22ef43d36f90..00780306d905 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.109"; + version = "1.0.120"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPy0FcDFoBK02pCmDTe5T1QyB9+WC++cBuOI7CtaXtY="; + sha256 = "sha256-aFFJAib0/FTOaPtSLYXIFV3+QfIpzy8fC7rWAQW5yh0="; }; vendorSha256 = "sha256-vN+ci2vCbtDuEEVzZQiFkdi1QkMgnnbbJgD9g6DS7qs="; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 55116147f3bd..1ea4f8b05191 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.9" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.10" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 41c8daf29358..1eaf6d48a38c 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 1e520ab4a5779648de889d198100af4eb556a7f6 - ref: refs/tags/6.1.9 + revision: 822dd1ef2b1a1171d62803add58ee2afce30ea06 + ref: refs/tags/6.1.10 specs: - metasploit-framework (6.1.9) + metasploit-framework (6.1.10) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,13 +128,13 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.512.0) + aws-partitions (1.516.0) aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.266.0) + aws-sdk-ec2 (1.270.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.61.0) @@ -220,7 +220,7 @@ GEM jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.5.1) + json (2.6.0) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -296,7 +296,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.5.0) + puma (5.5.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 29c8b177986f..91b2bd60a318 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -14,13 +14,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.9"; + version = "6.1.10"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ZhNy6rp3Jdrua1dZr3dTQxLOVAflWiI0lc/f38d0kqc="; + sha256 = "sha256-VdnczTauHKYexXZs6U5F5v4DP8lJb8wCDy6yiPdEavI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7b0e12b509b0..8ba307e2b5a0 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09v7z0sg09vsysv0hm1552b3laa8sf933c0sqnb35mb4wksj1fv9"; + sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; type = "gem"; }; - version = "1.512.0"; + version = "1.516.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bwkgmdas7ig52cbfdx6vf63j8qk91lizd7sdjdapbfnabbpwmq1"; + sha256 = "1m46n4fn505l0qqwamc5gk88h6aqvjqc7j0pkrcngxcgh5r7hcvf"; type = "gem"; }; - version = "1.266.0"; + version = "1.270.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -594,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry"; type = "gem"; }; - version = "2.5.1"; + version = "2.6.0"; }; little-plugger = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "1e520ab4a5779648de889d198100af4eb556a7f6"; - sha256 = "19wjfk3xzpygjls24np50xacw4j3advsynapdgpdl9bppbm744v6"; + rev = "822dd1ef2b1a1171d62803add58ee2afce30ea06"; + sha256 = "1wka8kvqicif1w1cqvs9r4zh7zp68m7fjv3nqlgac75f6v6xrnam"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.9"; + version = "6.1.10"; }; metasploit-model = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ahk9a2a05985m0037gqlpha5vdkvmwhyk8v1shkbnwkkm30k0mq"; + sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; type = "gem"; }; - version = "5.5.0"; + version = "5.5.2"; }; racc = { groups = ["default"]; diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index daceff1486e3..fa2d774e1174 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -42,8 +42,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cuse" + "--localstatedir=/var" ]; + prePatch = '' + # Makefile tries to create the directory /var/lib/swtpm-localcafor, which fails + substituteInPlace samples/Makefile.am \ + --replace 'install-data-local:' 'do-not-execute:' + + # Use the correct path to the certtool binary + # instead of relying on it being in the environment + substituteInPlace samples/swtpm_localca.c --replace \ + '# define CERTTOOL_NAME "certtool"' \ + '# define CERTTOOL_NAME "${gnutls}/bin/certtool"' + ''; + enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index c269da48273e..1c8682e93bc0 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-7jJMF8pNCKkiOAY9sZEK0lOqP2/yBVqS3FaKOOz74XI="; + sha256 = "sha256-t/BQu6nq0FcmqTc/vo3bTUbVNDqzePqlOMFkl4pD598="; }; - vendorSha256 = "sha256-j+07Q5dpt8I0sf5B3AVw4343EMWyJDqrzFrdDrBp0DY="; + vendorSha256 = "sha256-9eXDcuVm+N4nenotUtCvyp2qB5uPDwzGHk43Y4uTT14="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 9758b6fbda8e..b67d63938c95 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.3"; + version = "1.8.4"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-x1ZHemRyblfMgmG2zx3AnZmhn2Q952v3nzi3HEvlmE8="; + sha256 = "sha256-zrCRnIScIWJ8ocrgYPNhtvuX3PBLF9HX0dyZU/zY4yk="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1141zjf56fz76ka7bim9qkdk46pa3kk39swxza17g3qxpj21w0jp"; + sha256 = "0sh9q29b0bi5ap6nvll0ykxd5vf4wliksj31cmm4gw5vp90irvl3"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "06bkka2k09alhps5h2dk0dgczgnnd6g4npjp9j103lvzi935zjsy"; + sha256 = "09nhfdw20g46fnrn82my7a59pfa81dxncxhiswmha3cdy8n0p6wb"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1z9pv46pgqnn34mc624x9z41kvr4hrjjdp6y9zv033h0cpxbd0y7"; + sha256 = "01ra0xrgivf01ff87p0gqmi1flnac9y02x7jpv5j6a9czr1sqw1j"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b19c0e62ca19..6c3346b16311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1269,6 +1269,8 @@ with pkgs; ashuffle = callPackage ../applications/audio/ashuffle {}; + ashpd-demo = callPackage ../development/tools/ashpd-demo {}; + asls = callPackage ../development/tools/misc/asls { }; astc-encoder = callPackage ../tools/graphics/astc-encoder { }; @@ -1614,6 +1616,8 @@ with pkgs; esbuild = callPackage ../development/tools/esbuild { }; + esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { }; + essentia-extractor = callPackage ../tools/audio/essentia-extractor { }; esh = callPackage ../tools/text/esh { }; @@ -6657,6 +6661,8 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; + ligo = callPackage ../development/compilers/ligo { }; + ldgallery = callPackage ../tools/graphics/ldgallery { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -27183,6 +27189,7 @@ with pkgs; procmail = callPackage ../applications/misc/procmail { }; profanity = callPackage ../applications/networking/instant-messengers/profanity ({ + gtk = gtk3; python = python3; } // (config.profanity or {})); @@ -29694,6 +29701,10 @@ with pkgs; gltron = callPackage ../games/gltron { }; + gl-gsync-demo = callPackage ../games/gl-gsync-demo { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; + gmad = callPackage ../games/gmad { }; gnonograms = callPackage ../games/gnonograms { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8c6882929aeb..96203b0be038 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -118,6 +118,36 @@ let }; }; + ActionCircuitBreaker = buildPerlPackage { + pname = "Action-CircuitBreaker"; + version = "0.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HANGY/Action-CircuitBreaker-0.1.tar.gz"; + sha256 = "3f8f5d726fae537ab336e00a6819ae4a8596e4c5f243e772a536ef2eb6e606b1"; + }; + buildInputs = [ ActionRetry TryTiny ]; + propagatedBuildInputs = [ Moo ]; + meta = { + homepage = "https://github.com/hangy/Action-CircuitBreaker"; + description = "Module to try to perform an action, with an option to suspend execution after a number of failures"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ActionRetry = buildPerlPackage { + pname = "Action-Retry"; + version = "0.24"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAMS/Action-Retry-0.24.tar.gz"; + sha256 = "a3759742c5bef2d1975ab73d35499d8113324919b24936130255cff07d0294f7"; + }; + propagatedBuildInputs = [ MathFibonacci ModuleRuntime Moo ]; + meta = { + description = "Module to try to perform an action, with various ways of retrying and sleeping between retries"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlgorithmAnnotate = buildPerlPackage { pname = "Algorithm-Annotate"; version = "0.10"; @@ -141,6 +171,20 @@ let }; }; + AlgorithmCheckDigits = buildPerlModule { + pname = "Algorithm-CheckDigits"; + version = "1.3.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-v1.3.5.tar.gz"; + sha256 = "a956d0517180d6d9042f47d73aa6a2728b75fcbd546940d2dbe0a7e7cf428f73"; + }; + buildInputs = [ ProbePerl ]; + meta = { + description = "Perl extension to generate and test check digits"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlgorithmDiff = buildPerlPackage { pname = "Algorithm-Diff"; version = "1.1903"; @@ -510,6 +554,19 @@ let }; }; + URIEscapeXS = buildPerlPackage { + pname = "URI-Escape-XS"; + version = "0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/URI-Escape-XS-0.14.tar.gz"; + sha256 = "c39ac50c6c2b831ae4bf08692e6ca5d4a3f9c57dc4d7f9c4cb0663e2c86c2759"; + }; + meta = { + description = "Drop-In replacement for URI::Escape"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; version = "3.30"; @@ -531,6 +588,19 @@ let }; }; + ApacheDB = buildPerlPackage { + pname = "Apache-DB"; + version = "0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LZ/LZE/Apache-DB-0.18.tar.gz"; + sha256 = "6527f4f1598270bea07bec787b71bdf0ec2b572548be7438cf74f2b9a600bfed"; + }; + meta = { + description = "Run the interactive Perl debugger under mod_perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ApacheLogFormatCompiler = buildPerlModule { pname = "Apache-LogFormat-Compiler"; version = "0.36"; @@ -1497,6 +1567,38 @@ let }; }; + BSON = buildPerlPackage { + pname = "BSON"; + version = "1.12.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-v1.12.2.tar.gz"; + sha256 = "f4612c0c354310741b99ab6d26451226823150ca27109b1b391232d5cfdda6db"; + }; + buildInputs = [ JSONMaybeXS PathTiny TestDeep TestFatal ]; + propagatedBuildInputs = [ CryptURandom Moo TieIxHash boolean namespaceclean ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-bson"; + description = "BSON serialization and deserialization (EOL)"; + license = lib.licenses.asl20; + }; + }; + + BSONXS = buildPerlPackage { + pname = "BSON-XS"; + version = "0.8.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-XS-v0.8.4.tar.gz"; + sha256 = "28f7d338fd78b6f9c9a6080be9de3f5cb23d888b96ebf6fcbface9f2966aebf9"; + }; + buildInputs = [ ConfigAutoConf JSONMaybeXS PathTiny TestDeep TestFatal TieIxHash ]; + propagatedBuildInputs = [ BSON boolean JSONXS JSONPP CpanelJSONXS ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-bson-xs"; + description = "XS implementation of MongoDB's BSON serialization (EOL)"; + license = lib.licenses.asl20; + }; + }; + BUtils = buildPerlPackage { pname = "B-Utils"; version = "0.27"; @@ -3205,6 +3307,23 @@ let }; }; + CLDRNumber = buildPerlModule { + pname = "CLDR-Number"; + version = "0.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PA/PATCH/CLDR-Number-0.19.tar.gz"; + sha256 = "c6716488e65fe779ff79a83f0f2036ad94463efe3d0f349c6b99112975bd85fc"; + }; + buildInputs = [ SoftwareLicense TestDifferences TestException TestWarn ]; + propagatedBuildInputs = + [ ClassMethodModifiers MathRound Moo namespaceclean ]; + meta = { + homepage = "https://github.com/patch/cldr-number-pm5"; + description = "Localized number formatters using the Unicode CLDR"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CLIHelpers = buildPerlPackage { pname = "CLI-Helpers"; version = "1.8"; @@ -3310,6 +3429,21 @@ let }; }; + ColorLibrary = buildPerlPackage { + pname = "Color-Library"; + version = "0.021"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz"; + sha256 = "58cbf7e333d3a4a40297abc43412b321da449c6816020e4fa6625ab079fc90a5"; + }; + buildInputs = [ TestMost TestWarn TestException TestDeep TestDifferences ModulePluggable ]; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable ]; + meta = { + description = "An easy-to-use and comprehensive named-color library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CommandRunner = buildPerlModule { pname = "Command-Runner"; version = "0.103"; @@ -4841,6 +4975,21 @@ let }; }; + DataDumperAutoEncode = buildPerlModule { + pname = "Data-Dumper-AutoEncode"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BA/BAYASHI/Data-Dumper-AutoEncode-1.00.tar.gz"; + sha256 = "2d9a0262ad443d321dc489ef6dfa7b3eed11a2708a75d397d371bb2585e5eca1"; + }; + buildInputs = [ ModuleBuildPluggable ModuleBuildPluggableCPANfile ]; + propagatedBuildInputs = [ IOInteractiveTiny ]; + meta = { + description = "Dump with recursive encoding"; + license = lib.licenses.artistic2; + }; + }; + DataDumperConcise = buildPerlPackage { pname = "Data-Dumper-Concise"; version = "2.023"; @@ -6470,6 +6619,18 @@ let }; }; + DevelSize = buildPerlPackage { + pname = "Devel-Size"; + version = "0.83"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.83.tar.gz"; + sha256 = "757a67e0aa59ae103ea5ca092cbecc025644ebdc326731688ffab6f8823ef4b3"; + }; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelStackTraceAsHTML = buildPerlPackage { pname = "Devel-StackTrace-AsHTML"; version = "0.15"; @@ -7441,6 +7602,22 @@ let }; }; + EncodePunycode = buildPerlPackage { + pname = "Encode-Punycode"; + version = "1.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Encode-Punycode-1.002.tar.gz"; + sha256 = "ca3aceecdb80b5d45aa10e1cde8fec4e90b4f8c9189c7504dd8658f071f77194"; + }; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ NetIDNEncode ]; + meta = { + homepage = "http://search.cpan.org/dist/Encode-Punycode"; + description = "Encode plugin for Punycode (RFC 3492)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + enum = buildPerlPackage { pname = "enum"; version = "1.11"; @@ -7526,6 +7703,21 @@ let }; }; + ExcelWriterXLSX = buildPerlPackage { + pname = "Excel-Writer-XLSX"; + version = "1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-1.09.tar.gz"; + sha256 = "d679c6ac19e93c32ab77594c793e41b948c7bb3873b600e70ad637d093dca187"; + }; + propagatedBuildInputs = [ ArchiveZip ]; + meta = { + homepage = "http://jmcnamara.github.com/excel-writer-xlsx/"; + description = "Create a new file in the Excel 2007+ XLSX format"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ExceptionBase = buildPerlModule { pname = "Exception-Base"; version = "0.2501"; @@ -8022,6 +8214,35 @@ let }; }; + Filechmod = buildPerlPackage { + pname = "File-chmod"; + version = "0.42"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.42.tar.gz"; + sha256 = "6cafafff68bc84215168b55ede0d191dcb57f9a3201b51d61edb2858a2407795"; + }; + meta = { + homepage = "https://metacpan.org/dist/File-chmod"; + description = "Implements symbolic and ls chmod modes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + FilechmodRecursive = buildPerlPackage { + pname = "File-chmod-Recursive"; + version = "1.0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MITHUN/File-chmod-Recursive-v1.0.3.tar.gz"; + sha256 = "9348ca5c5b88deadcc483b9399ef7c2e0fc2504f9058db65f3c3c53c41139aa7"; + }; + propagatedBuildInputs = [ Filechmod ]; + meta = { + homepage = "https://github.com/mithun/perl-file-chmod-recursive"; + description = "Run chmod recursively against directories"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileCopyRecursive = buildPerlPackage { pname = "File-Copy-Recursive"; version = "0.45"; @@ -9260,6 +9481,22 @@ let }; }; + GraphicsColor = buildPerlPackage { + pname = "Graphics-Color"; + version = "0.31"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GP/GPHAT/Graphics-Color-0.31.tar.gz"; + sha256 = "faa8fed5b2d80e5160af976e5db2242c0b3555542ce1042575ff6b694587a33d"; + }; + buildInputs = [ TestNumberDelta ModulePluggable ]; + propagatedBuildInputs = [ ColorLibrary Moose MooseXAliases MooseXClone MooseXStorage MooseXTypes ]; + meta = { + homepage = "https://github.com/gphat/graphics-color"; + description = "Device and library agnostic color spaces"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GraphicsTIFF = buildPerlPackage { pname = "Graphics-TIFF"; version = "16"; @@ -10556,6 +10793,29 @@ let }; }; + ImageOCRTesseract = buildPerlPackage { + pname = "Image-OCR-Tesseract"; + version = "1.26"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/Image-OCR-Tesseract-1.26.tar.gz"; + sha256 = "98d904266a7062f09c9b46f77c4e94529e1fe99339e3f83fda1f92013f007cea"; + }; + nativeBuildInputs = [ pkgs.which pkgs.makeWrapper pkgs.tesseract pkgs.imagemagick ]; + propagatedBuildInputs = [ FileFindRule FileWhich LEOCHARRECLI StringShellQuote ]; + postPatch = '' + substituteInPlace lib/Image/OCR/Tesseract.pm \ + --replace "which('tesseract')" "\"${pkgs.tesseract}/bin/tesseract\"" \ + --replace "which('convert')" "\"${pkgs.imagemagick}/bin/convert"\" + ''; + postInstall = '' + wrapProgram $out/bin/ocr --prefix PATH : ${lib.makeBinPath [ pkgs.tesseract pkgs.imagemagick ]} + ''; + meta = { + description = "Read an image with tesseract ocr and get output"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IMAPClient = buildPerlPackage { pname = "IMAP-Client"; version = "0.13"; @@ -10763,6 +11023,19 @@ let }; }; + IOInteractiveTiny = buildPerlPackage { + pname = "IO-Interactive-Tiny"; + version = "0.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DM/DMUEY/IO-Interactive-Tiny-0.2.tar.gz"; + sha256 = "45c0696505c7e4347845f5cd2512b7b1bc78fbce4cbed2b58008283fc95ea5f9"; + }; + meta = { + description = "Is_interactive() without large deps"; + license = lib.licenses.artistic2; + }; + }; + IOLockedFile = buildPerlPackage { pname = "IO-LockedFile"; version = "0.23"; @@ -11232,6 +11505,20 @@ let buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; }; + JSONCreate = buildPerlPackage { + pname = "JSON-Create"; + version = "0.35"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Create-0.35.tar.gz"; + sha256 = "5faefe0d833b8132568865308f3239d3cdaa1b8a1ecc9b5624dcf1efbe10683e"; + }; + propagatedBuildInputs = [ JSONParse UnicodeUTF8 ]; + meta = { + description = "Create JSON"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + JSONMaybeXS = buildPerlPackage { pname = "JSON-MaybeXS"; version = "1.004003"; @@ -11274,10 +11561,10 @@ let JSONParse = buildPerlPackage { pname = "JSON-Parse"; - version = "0.57"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.57.tar.gz"; - sha256 = "1rqaqpgh068kqj11srw874m5ph5qkaz77ib5fi4hrc402d2qxa45"; + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.61.tar.gz"; + sha256 = "ce8e55e70bef9bcbba2e96af631d10a605900961a22cad977e71aab56c3f2806"; }; meta = { description = "Read JSON into a Perl variable"; @@ -11396,6 +11683,33 @@ let }; }; + LEOCHARRECLI = buildPerlPackage { + pname = "LEOCHARRE-CLI"; + version = "1.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/LEOCHARRE-CLI-1.19.tar.gz"; + sha256 = "37835f11ee35326241b4d30368ae1bc195a50414b3662db3e13b865bd52fcde9"; + }; + propagatedBuildInputs = [ FileWhich Filechmod LEOCHARREDebug Linuxusermod YAML ]; + meta = { + description = "Useful subs for coding cli scripts"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LEOCHARREDebug = buildPerlPackage { + pname = "LEOCHARRE-Debug"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/LEOCHARRE-Debug-1.03.tar.gz"; + sha256 = "c1665aa3abd457cc8624b8c418c6f8bdf58fb3a686f8eed515cf7e93514df192"; + }; + meta = { + description = "Debug sub"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + libapreq2 = buildPerlPackage { pname = "libapreq2"; version = "2.16"; @@ -11770,6 +12084,20 @@ let }; }; + Linuxusermod = buildPerlPackage { + pname = "Linux-usermod"; + version = "0.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIDUL/Linux-usermod-0.69.tar.gz"; + sha256 = "97ca186a3c416bf69ed62da046f1a60d88d89b8e6ed25008b2f96e787dee9d60"; + }; + meta = { + description = "This module adds, removes and modify user and group accounts according to the passwd and shadow files syntax"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.linux; + }; + }; + ListAllUtils = buildPerlPackage { pname = "List-AllUtils"; version = "0.18"; @@ -11888,6 +12216,20 @@ let LANG="C"; }; + LocaleMaketextLexiconGetcontext = buildPerlPackage { + pname = "Locale-Maketext-Lexicon-Getcontext"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SAPER/Locale-Maketext-Lexicon-Getcontext-0.05.tar.gz"; + sha256 = "75cb33df9472a5962de54082f42c6a76b260fc405ba10ca53246fb1f82c09208"; + }; + propagatedBuildInputs = [ LocaleMaketextLexicon ]; + meta = { + description = "PO file parser for Maketext"; + license = lib.licenses.mit; + }; + }; + LocaleMOFile = buildPerlPackage { pname = "Locale-MO-File"; version = "0.09"; @@ -12084,6 +12426,21 @@ let }; }; + LogAnyAdapterTAP = buildPerlPackage { + pname = "Log-Any-Adapter-TAP"; + version = "0.003003"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NERDVANA/Log-Any-Adapter-TAP-0.003003.tar.gz"; + sha256 = "131f0689b2b42b1b31449714c6eda8f811dd96a7c86748f1e03b239cfd0121c0"; + }; + propagatedBuildInputs = [ LogAny TryTiny ]; + meta = { + homepage = "https://github.com/silverdirk/perl-Log-Any-Adapter-TAP"; + description = "Logger suitable for use with TAP test files"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LogContextual = buildPerlPackage { pname = "Log-Contextual"; version = "0.008001"; @@ -12798,6 +13155,19 @@ let }; }; + MathFibonacci = buildPerlPackage { + pname = "Math-Fibonacci"; + version = "1.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIPUL/Math-Fibonacci-1.5.tar.gz"; + sha256 = "70a8286e94558df99dc92f52d83e1e20a7b8f7852bcc3a1de7d9e338260b99ba"; + }; + meta = { + description = "This module provides a few functions related to Fibonacci numbers"; + license = lib.licenses.artistic2; + }; + }; + MathGMP = buildPerlPackage { pname = "Math-GMP"; version = "2.20"; @@ -13507,6 +13877,22 @@ let buildInputs = [ TestSharedFork ]; }; + ModuleBuildPluggableCPANfile = buildPerlModule { + pname = "Module-Build-Pluggable-CPANfile"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Module-Build-Pluggable-CPANfile-0.05.tar.gz"; + sha256 = "4aec6cba240cb6e78016406b6a3a875634cc2aec08ffc5f1572da1cdc40e1e7c"; + }; + buildInputs = [ CaptureTiny TestRequires TestSharedFork ]; + propagatedBuildInputs = [ ModuleBuildPluggable ModuleCPANfile ]; + meta = { + homepage = "https://github.com/kazeburo/Module-Build-Pluggable-CPANfile"; + description = "Include cpanfile"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleBuildPluggablePPPort = buildPerlModule { pname = "Module-Build-Pluggable-PPPort"; version = "0.04"; @@ -14275,6 +14661,22 @@ let }; }; + MongoDB = buildPerlPackage { + pname = "MongoDB"; + version = "2.2.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/MongoDB-v2.2.2.tar.gz"; + sha256 = "201935f92dac94f39c35de73661e8b252439e496f228657db85ff93257c3268f"; + }; + buildInputs = [ JSONMaybeXS PathTiny TestDeep TestFatal TimeMoment ]; + propagatedBuildInputs = [ AuthenSASLSASLprep AuthenSCRAM BSON IOSocketSSL NetSSLeay ClassXSAccessor BSONXS TypeTinyXS MozillaCA Moo NetDNS SafeIsa SubQuote TieIxHash TypeTiny UUIDURandom boolean namespaceclean ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-driver"; + description = "Official MongoDB Driver for Perl (EOL)"; + license = lib.licenses.asl20; + }; + }; + MonitoringPlugin = buildPerlPackage { pname = "Monitoring-Plugin"; version = "0.40"; @@ -14527,6 +14929,22 @@ let }; }; + MooseXStorageFormatJSONpm = buildPerlPackage { + pname = "MooseX-Storage-Format-JSONpm"; + version = "0.093093"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Storage-Format-JSONpm-0.093093.tar.gz"; + sha256 = "ebe0407a7eb1870270e0e2579f097dfd7df2aea3307fb71f324fb69e242cc58f"; + }; + buildInputs = [ Moose TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; + propagatedBuildInputs = [ JSON MooseXRoleParameterized MooseXStorage namespaceautoclean ]; + meta = { + homepage = "https://github.com/rjbs/MooseX-Storage-Format-JSONpm"; + description = "A format role for MooseX::Storage using JSON.pm"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooX = buildPerlPackage { pname = "MooX"; version = "0.101"; @@ -15019,6 +15437,22 @@ let propagatedBuildInputs = [ Moose ]; }; + MooseXStorage = buildPerlPackage { + pname = "MooseX-Storage"; + version = "0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Storage-0.53.tar.gz"; + sha256 = "8704bfe505f66b340f62e85c9ff319c19e9670b26d4b012c91f4e103b1daace0"; + }; + buildInputs = [ TestDeep TestDeepType TestFatal TestNeeds TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; + propagatedBuildInputs = [ ModuleRuntime Moose MooseXRoleParameterized PodCoverage StringRewritePrefix namespaceautoclean IOStringy JSON JSONXS JSONMaybeXS CpanelJSONXS YAML YAMLOld YAMLTiny YAMLLibYAML YAMLSyck ]; + meta = { + homepage = "https://github.com/moose/MooseX-Storage"; + description = "A serialization framework for Moose classes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooseXStrictConstructor = buildPerlPackage { pname = "MooseX-StrictConstructor"; version = "0.21"; @@ -19122,6 +19556,21 @@ let }; }; + SpreadsheetCSV = buildPerlPackage { + pname = "Spreadsheet-CSV"; + version = "0.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DD/DDICK/Spreadsheet-CSV-0.20.tar.gz"; + sha256 = "070bb252a8fe8b938a1ce4fc90525f833d4e619b6d4673b0ae0a23408d514ab6"; + }; + nativeBuildInputs = [ CGI ]; + propagatedBuildInputs = [ ArchiveZip SpreadsheetParseExcel TextCSV_XS XMLParser ]; + meta = { + description = "Drop-in replacement for Text::CSV_XS with spreadsheet support"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SpreadsheetParseExcel = buildPerlPackage { pname = "Spreadsheet-ParseExcel"; version = "0.65"; @@ -20935,6 +21384,38 @@ let }; }; + TestDeepJSON = buildPerlModule { + pname = "Test-Deep-JSON"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MOTEMEN/Test-Deep-JSON-0.05.tar.gz"; + sha256 = "aec8571b9e31b7301e26132c132c6800952dc089c645d76954a3ad1a6b350858"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ ExporterLite JSONMaybeXS TestDeep ]; + meta = { + homepage = "https://github.com/motemen/perl5-Test-Deep-JSON"; + description = "Compare JSON with Test::Deep"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + TestDeepType = buildPerlPackage { + pname = "Test-Deep-Type"; + version = "0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Deep-Type-0.008.tar.gz"; + sha256 = "6e7bea1a2f1e75319a22d1c51996ebac50ca5e3663d1bc223130887e62e959f1"; + }; + buildInputs = [ TestFatal TestNeeds ]; + propagatedBuildInputs = [ TestDeep TryTiny ]; + meta = { + homepage = "https://github.com/karenetheridge/Test-Deep-Type"; + description = "A Test::Deep plugin for validating type constraints"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestDir = buildPerlPackage { pname = "Test-Dir"; version = "1.16"; @@ -22376,6 +22857,19 @@ let }; }; + TextFuzzy = buildPerlPackage { + pname = "Text-Fuzzy"; + version = "0.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/Text-Fuzzy-0.29.tar.gz"; + sha256 = "3df5cfd2ca1a4c5ca7ff7bab3cc8d53ad2064e134cbf11004f3cf8c4b9055bff"; + }; + meta = { + description = "Partial string matching using edit distances"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextGerman = buildPerlPackage { pname = "Text-German"; version = "0.06"; @@ -23154,6 +23648,20 @@ let }; }; + TimeMoment = buildPerlPackage { + pname = "Time-Moment"; + version = "0.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Time-Moment-0.44.tar.gz"; + sha256 = "64acfa042f634fcef8dadf55e7f42ba4eaab8aaeb7d5212eb89815a31f78f6fd"; + }; + buildInputs = [ TestFatal TestNumberDelta TestRequires ]; + meta = { + description = "Represents a date and time of day with an offset from UTC"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TimeOut = buildPerlPackage { pname = "Time-Out"; version = "0.11"; @@ -23354,6 +23862,20 @@ let buildInputs = [ TestMemoryCycle ]; }; + TypeTinyXS = buildPerlPackage { + pname = "Type-Tiny-XS"; + version = "0.022"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.022.tar.gz"; + sha256 = "bcc34a31f7dc1d30cc803889b5c8f90e4773b73b5becbdb3860f5abe7e22ff00"; + }; + meta = { + homepage = "https://metacpan.org/release/Type-Tiny-XS"; + description = "Provides an XS boost for some of Type::Tiny's built-in type constraints"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TypesSerialiser = buildPerlPackage { pname = "Types-Serialiser"; version = "1.01"; @@ -23670,6 +24192,21 @@ let }; }; + UUIDURandom = buildPerlPackage { + pname = "UUID-URandom"; + version = "0.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/UUID-URandom-0.001.tar.gz"; + sha256 = "3f13631b13b9604fb489e2989490c99f103743a837239bdafae9d6baf55f8f46"; + }; + propagatedBuildInputs = [ CryptURandom ]; + meta = { + homepage = "https://github.com/dagolden/UUID-URandom"; + description = "UUIDs based on /dev/urandom or the Windows Crypto API"; + license = lib.licenses.asl20; + }; + }; + VariableMagic = buildPerlPackage { pname = "Variable-Magic"; version = "0.62"; @@ -24016,6 +24553,20 @@ let }; }; + XMLEncoding = buildPerlPackage { + pname = "XML-Encoding"; + version = "2.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHAY/XML-Encoding-2.11.tar.gz"; + sha256 = "a50e41af0a79b882d48816b95681f38a55af1e6a88828dcd96374a8bde2305a1"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = "A perl module for parsing XML encoding maps"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLDOM = buildPerlPackage { pname = "XML-DOM"; version = "1.46"; @@ -24263,6 +24814,21 @@ let }; }; + XMLRules = buildPerlModule { + pname = "XML-Rules"; + version = "1.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JE/JENDA/XML-Rules-1.16.tar.gz"; + sha256 = "3788255c07afe4195a0de72ce050652320d817528ff2d10c611f6e392043868b"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = + "Parse XML and specify what and how to keep/process for individual tags"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLSAX = buildPerlPackage { pname = "XML-SAX"; version = "1.02"; @@ -24484,6 +25050,21 @@ let }; }; + YAMLOld = buildPerlPackage { + pname = "YAML-Old"; + version = "1.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/YAML-Old-1.23.tar.gz"; + sha256 = "fa546fcd9acc5a39bc8871902f7fc1eba50e7dc781c5cd5c0abf1aece6d17ecd"; + }; + buildInputs = [ TestYAML TestBase ]; + meta = { + homepage = "https://github.com/ingydotnet/yaml-old-pm"; + description = "Old YAML.pm Legacy Code"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + YAMLSyck = buildPerlPackage { pname = "YAML-Syck"; version = "1.34";