diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f78246b50e8b..3dda306cd165 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -98,6 +98,7 @@ with lib.maintainers; { members = [ astro SuperSandro2000 + revol-xut ]; scope = "Maintain packages used in the C3D2 hackspace"; shortName = "c3d2"; diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix index 439a3ae68daa..004392c7873c 100644 --- a/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -50,6 +50,12 @@ in default_access.properties["enable-flatpak-portal"] = false ''; }; + environment.etc."wireplumber/bluetooth.lua.d/80-systemwide.lua" = lib.mkIf config.services.pipewire.systemWide { + text = '' + -- When running system-wide, logind-integration needs to be disabled. + bluez_monitor.properties["with-logind"] = false + ''; + }; systemd.packages = [ cfg.package ]; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 8eb52f26cdba..e43fbec5d9a7 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-P+usJCzf92WZ46mdaDbej59/RUzmFcMvlYXVe2VpgY0="; + sha256 = "sha256-mwiG9DwnCX/9REq/oNHi2n/l829Ozgum/WygIb+FV04="; }; - cargoSha256 = "sha256-N5qHu0sCmIWtDYerWqMlD3qr8QtXLvEC7VqPEvnW2cw="; + cargoSha256 = "sha256-ylSVyrI9LuctuoMZsZpIH7loBBjxE2onk6L19uV8zCQ="; checkFlags = [ # these want internet access, disable them diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 56b721842a36..238bc905f713 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }: stdenv.mkDerivation rec { pname = "hexedit"; - version = "1.2.13"; + version = "1.6"; - src = fetchurl { - url = "http://rigaux.org/${pname}-${version}.src.tgz"; - sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka"; + src = fetchFromGitHub { + owner = "pixel"; + repo = "hexedit"; + rev = version; + sha256 = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI="; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ]; - meta = { + meta = with lib; { description = "View and edit files in hexadecimal or in ASCII"; - homepage = "http://prigaux.chez.com/hexedit.html"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + homepage = "http://rigaux.org/hexedit.html"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/applications/graphics/glimpse/default.nix b/pkgs/applications/graphics/glimpse/default.nix deleted file mode 100644 index 09e58fccf9d1..000000000000 --- a/pkgs/applications/graphics/glimpse/default.nix +++ /dev/null @@ -1,200 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, substituteAll -, pkg-config -, intltool -, babl -, gegl -, gtk2 -, glib -, gdk-pixbuf -, isocodes -, pango -, cairo -, freetype -, fontconfig -, lcms -, libpng -, libjpeg -, poppler -, poppler_data -, libtiff -, libmng -, librsvg -, libwmf -, zlib -, libzip -, ghostscript -, aalib -, shared-mime-info -, python2 -, libexif -, gettext -, xorg -, glib-networking -, libmypaint -, gexiv2 -, harfbuzz -, mypaint-brushes1 -, libwebp -, libheif -, libgudev -, openexr -, AppKit -, Cocoa -, gtk-mac-integration-gtk2 -, libxslt -, automake -, autoconf -, libtool -, makeWrapper -, autoreconfHook -, gtk-doc -, graphviz -}: -let - python = python2.withPackages (pp: [ pp.pygtk ]); -in -stdenv.mkDerivation rec { - pname = "glimpse"; - version = "0.2.0"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "glimpse-editor"; - repo = "Glimpse"; - rev = "v${version}"; - sha256 = "sha256-qbZQmAo7fuJWWbn0QTyxAwAenZOdsGueUq5/3IV8Njc="; - }; - - patches = [ - # to remove compiler from the runtime closure, reference was retained via - # gimp --version --verbose output - (substituteAll { - src = ./remove-cc-reference.patch; - cc_version = stdenv.cc.cc.name; - }) - ../gimp/hardcode-plugin-interpreters.patch - ]; - - postPatch = '' - ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . - ''; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - intltool - gettext - automake - autoconf - makeWrapper - gtk-doc - libxslt - libtool - ]; - - buildInputs = [ - babl - gegl - gtk2 - glib - gdk-pixbuf - pango - cairo - gexiv2 - harfbuzz - isocodes - freetype - fontconfig - lcms - libpng - libjpeg - poppler - poppler_data - libtiff - openexr - libmng - librsvg - libwmf - zlib - libzip - ghostscript - aalib - shared-mime-info - libwebp - libheif - python - libexif - xorg.libXpm - glib-networking - libmypaint - mypaint-brushes1 - ] ++ lib.optionals stdenv.isDarwin [ - AppKit - Cocoa - gtk-mac-integration-gtk2 - ] ++ lib.optionals stdenv.isLinux [ - libgudev - ]; - - # needed by gimp-2.0.pc - propagatedBuildInputs = [ - gegl - ]; - - # Check if librsvg was built with --disable-pixbuf-loader. - PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; - - preAutoreconf = '' - # The check runs before glib-networking is registered - export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" - ''; - - postFixup = '' - wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix PATH ":" ${ lib.makeBinPath [ graphviz ] } - ''; - - passthru = rec { - # The declarations for `glimpse-with-plugins` wrapper, - # used for determining plug-in installation paths - majorVersion = "2.0"; - targetPluginDir = "lib/glimpse/${majorVersion}/plug-ins"; - targetScriptDir = "share/glimpse/${majorVersion}/scripts"; - targetDataDir = "share/gimp/${majorVersion}"; - targetLibDir = "lib/gimp/${majorVersion}"; - - # probably its a good idea to use the same gtk in plugins ? - gtk = gtk2; - }; - - configureFlags = [ - "--without-webkit" # old version is required - "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" - "--with-icc-directory=/run/current-system/sw/share/color/icc" - # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) - "--libdir=\${exec_prefix}/lib" - ]; - - # on Darwin, - # test-eevl.c:64:36: error: initializer element is not a compile-time constant - doCheck = !stdenv.isDarwin; - - enableParallelBuilding = true; - - meta = with lib; { - description = "An open source image editor based on the GNU Image Manipulation Program"; - longDescription = '' - Glimpse is an open source image editor based on the GNU Image Manipulation Program (GIMP). The goal is to experiment with new ideas and expand the use of free software. - ''; - homepage = "https://glimpse-editor.org"; - maintainers = with maintainers; [ ashkitten erictapen ]; - license = licenses.gpl3Plus; - platforms = platforms.unix; - mainProgram = "glimpse"; - }; -} diff --git a/pkgs/applications/graphics/glimpse/plugins/default.nix b/pkgs/applications/graphics/glimpse/plugins/default.nix deleted file mode 100644 index 48c65c3d5646..000000000000 --- a/pkgs/applications/graphics/glimpse/plugins/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Use `glimpse-with-plugins` package for Glimpse with all plug-ins. -# If you just want a subset of plug-ins, you can specify them explicitly: -# `glimpse-with-plugins.override { plugins = with glimpsePlugins; [ gap ]; }`. - -{ gimpPlugins, glimpse }: - -# This attrs can be extended in the future if there happen to be glimpse-only -# plugins or some that need further modification in order to work with Glimpse. -gimpPlugins.overrideScope' (self: super: { - gimp = glimpse; -}) diff --git a/pkgs/applications/graphics/glimpse/remove-cc-reference.patch b/pkgs/applications/graphics/glimpse/remove-cc-reference.patch deleted file mode 100644 index e63bf88dfdd7..000000000000 --- a/pkgs/applications/graphics/glimpse/remove-cc-reference.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/app/gimp-version.c b/app/gimp-version.c -index b584398231..1b40a1570f 100644 ---- a/app/gimp-version.c -+++ b/app/gimp-version.c -@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, - GIMP_BUILD_ID, - gimp_version_get_revision (), - GIMP_BUILD_PLATFORM_FAMILY, -- CC_VERSION, -+ "@cc_version@", - lib_versions); - g_free (lib_versions); - diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix deleted file mode 100644 index 63697a9bb66b..000000000000 --- a/pkgs/applications/graphics/glimpse/wrapper.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome, plugins ? null }: - -let - allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins); - selectedPlugins = if plugins == null then allPlugins else plugins; - extraArgs = map (x: x.wrapArgs or "") selectedPlugins; - versionBranch = lib.versions.majorMinor glimpse.version; - -in -symlinkJoin { - name = "glimpse-with-plugins-${glimpse.version}"; - - paths = [ glimpse ] ++ selectedPlugins; - - nativeBuildInputs = [ makeWrapper ]; - - postBuild = '' - for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do - wrapProgram $out/bin/$each \ - --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \ - --set GIMP2_DATADIR "$out/share/glimpse/2.0" \ - --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ - ${toString extraArgs} - done - - for each in glimpse glimpse-console; do - ln -sf "$each-${versionBranch}" $out/bin/$each - done - ''; - - inherit (glimpse) meta; -} diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index d83a90b0466f..e5dc54729e51 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "102.0-2", + "packageVersion": "102.0.1-1", "source": { - "rev": "102.0-2", - "sha256": "1gr17sk9ans6f2w3y6zr2cy5pz84br2b0kfi9pqz58yjz94q7jm2" + "rev": "102.0.1-1", + "sha256": "10f9gngn04nwrhcqkdznx7209c4javscqz8arswyrn4c8rc5x6w5" }, "firefox": { - "version": "102.0", - "sha512": "c7dd6d8d74c46573b16d097a5e5d230669e5778cd680b3b6f30510e989d21543138ced3bb013998b76614aa380b28efd8542450c591d8b724e03bd163d012057" + "version": "102.0.1", + "sha512": "a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417" } } diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index e331dfeedfbb..8382f6f519db 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -49,12 +49,6 @@ in rec { mkKops = generic; - kops_1_21 = mkKops rec { - version = "1.21.4"; - sha256 = "sha256-f2xOVa3N/GH5IoI6H/QwDdKTeQoF/kEHX6lNytCZ9cs="; - rev = "v${version}"; - }; - kops_1_22 = mkKops rec { version = "1.22.4"; sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE="; @@ -66,4 +60,11 @@ rec { sha256 = "sha256-9GANjGRS9QaJw+CEeMv/f+rEu37QV2YxMvSRSH6+3PM="; rev = "v${version}"; }; + + kops_1_24 = mkKops rec { + version = "1.24.0"; + sha256 = "sha256-4vvmwqsRSu8hZZE7fZUTv9v19wRtJvA5IX5w9jr5pEI="; + rev = "v${version}"; + }; + } diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 8f840b2998db..2304e9f77f4c 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -10,14 +10,17 @@ , gnome , gobject-introspection , gtk4 +, gtksourceview5 +, libadwaita , libxml2 , pkg-config , python3Packages -, wrapGAppsHook4 }: +, wrapGAppsHook4 +}: python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.6.2"; + version = "0.7.2"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +28,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "refs/tags/v${version}"; - sha256 = "sha256-3dXtBwqEqiXLjntmqLYeuwLv0RDb774+yOXc7vdf8+Y="; + sha256 = "sha256-+b4Ko2srWZUs8zsH9jU+aiKQYZti3z2Bil8PogfpPlc="; }; nativeBuildInputs = [ @@ -42,6 +45,8 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf glib gtk4 + gtksourceview5 + libadwaita ]; checkInputs = [ diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix new file mode 100644 index 000000000000..e6dbb84610fc --- /dev/null +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "nixpacks"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "railwayapp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-UxdK2e5VYcOEYdZn0oGRFIVGiwnPixiZ3rOnqJDSQO8="; + }; + + cargoSha256 = "sha256-dJdPs4BJ1R2ZbGmGmvBerLPVqUHn5b/fz9C0kEnxA6U="; + + # skip test due FHS dependency + doCheck = false; + + meta = with lib; { + description = "App source + Nix packages + Docker = Image Resources"; + homepage = "https://github.com/railwayapp/nixpacks"; + license = licenses.mit; + maintainers = [ maintainers.zoedsoupe ]; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 6014e5907b8c..57f4bad82a1b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -120,13 +120,6 @@ self: super: { path = doJailbreak super.path; polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse); primitive = doJailbreak super.primitive; - # https://github.com/protolude/protolude/pull/136 - protolude = appendPatches [ - (pkgs.fetchpatch { - url = "https://github.com/protolude/protolude/commit/47820a36c25ea6f0c6e44382f7d4f3507358b8e7.diff"; - sha256 = "sha256-PtHx5SyTgqFzI03YVeQD+RqglO6ASMQWSxdpy4ROMDY="; - }) - ] (doJailbreak super.protolude); regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; retrie = doDistribute (dontCheck self.retrie_1_2_0_1); diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 98d5a6718575..85d5c30691c1 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -13,26 +13,26 @@ let url = "https://download.fcitx-im.org/data/table.tar.gz"; sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; }; - arpaVer = "20140820"; + arpaVer = "20220630"; arpa = fetchurl { - url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2"; - sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm"; + url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz"; + sha256 = "sha256-jTsPqPoWuT0NRZDwLaBAKcJxNktZJcHJAoRcN0oqAL8="; }; - dictVer = "20211021"; + dictVer = "20220706"; dict = fetchurl { - url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz"; - sha256 = "sha256-MAWX5vf3n3iEgP1mXeige/6QInBItafjn0D0OmKpgd8="; + url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.xz"; + sha256 = "sha256-vNeR//eDr7QMHI6S2z+Dc0+Lk8nGriwV4eqHeLkHB3k="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.12"; + version = "unstable-2022-07-11"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; - rev = version; - sha256 = "sha256-7zm0eQgOZk7PYCBqq6FmPGIz1ZaVlEaT9QM5clhovuQ="; + rev = "1adb14eb0617ef0eb0f07ad99684f43ca8a4395c"; + sha256 = "sha256-UldswsnkMuJh2G/EdsFl4CS7Y2RSRAb1hYeWUA2MHPw="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 9f1b396e4759..7bb28825d242 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { patchShebangs ./configure ./utils/check.sh ./utils/install-sh ''; + # Written in shell manually, does not support autoconf-style + # --build=/--host= options: + # Error: --build=x86_64-unknown-linux-gnu: unrecognised argument + configurePlatforms = [ ]; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index c59dd195a0b1..4f6753790196 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder -, pytest, nose, glibcLocales +, pytestCheckHook, nose, glibcLocales, fetchpatch , numpy, scipy, matplotlib, h5py }: buildPythonPackage rec { @@ -15,15 +15,28 @@ buildPythonPackage rec { sha256 = "ed0057dc22bd392df4b3bba23536117e1b2866e3201b12c5a37428d23421a5ba"; }; - checkInputs = [ pytest nose glibcLocales ]; + patches = [ + # Change from scipy to locally defined epsilon + # https://github.com/bayespy/bayespy/pull/126 + (fetchpatch { + name = "locally-defined-epsilon.patch"; + url = "https://github.com/bayespy/bayespy/commit/9be53bada763e19c2b6086731a6aa542ad33aad0.patch"; + sha256 = "sha256-KYt/0GcaNWR9K9/uS2OXgK7g1Z+Bayx9+IQGU75Mpuo="; + }) + ]; + + checkInputs = [ pytestCheckHook nose glibcLocales ]; + propagatedBuildInputs = [ numpy scipy matplotlib h5py ]; - checkPhase = '' - LC_ALL=en_US.utf-8 pytest -k 'not test_message_to_parents' - ''; + disabledTests = [ + # Assertion error + "test_message_to_parents" + ]; + + pythonImportsCheck = [ "bayespy" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "http://www.bayespy.org"; description = "Variational Bayesian inference tools for Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 41e3c95a0410..2c7019a26b7f 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.1"; + version = "2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = pname; rev = "v${version}"; - hash = "sha256-frjPxSATvXgeACT4kThoiPu04Ez8bs8FIPdf5PVuiSg="; + hash = "sha256-G0ApoSBs8RRq/sKxyyCB7uCIFNccDMMCqPMIAHuJLCI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix index f69f6db863c6..87f7ce588f8e 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/vala-language-server/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "vala-language-server"; - version = "0.48.4"; + version = "0.48.5"; src = fetchFromGitHub { - owner = "Prince781"; + owner = "vala-lang"; repo = pname; rev = version; - sha256 = "sha256-vCQ/j0DxG9sSEquPh9TtZ5hTADPh0d8sDIDSJdUDK4s="; + sha256 = "sha256-gntGnz8uqGz2EGwWWyty/N1ImaUKAPtXVZcjgp73SQM="; }; passthru = { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Code Intelligence for Vala & Genie"; - homepage = "https://github.com/Prince781/vala-language-server"; + homepage = "https://github.com/vala-lang/vala-language-server"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ andreasfelix ]; platforms = platforms.linux; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 04124379b147..dcfad88bdcbe 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -4,25 +4,25 @@ let aarch64-darwin = { arch = "aarch64"; shortName = "darwin"; - sha256 = "06kf4dyb8y486r2bbpz8znnaxah9y2hwc9km3cigacfchi4dy28j"; + sha256 = "sha256-6mi1I8dga16dQLFy2+qa4dzDzlW6J0fdiv104Re3cZ0="; }; x86_64-darwin = { arch = "x64"; shortName = "darwin"; - sha256 = "06q8cajxra8lgyd1ap6iqzqdw31gkvlc6l2ma0mm22y63msgdn8b"; + sha256 = "sha256-RGlpwRKLo4Y6uPvwubclIg3wJWePgKTDJvuzdxOrtfM="; }; x86_64-linux = { arch = "x64"; shortName = "linux"; - sha256 = "038w54yyk94042hg27hfm49w12xsg8wh0skza9l9iybvc9qlvh2i"; + sha256 = "sha256-Xjm+1wkAsC5Mn6Fm4MRdGyL4gpw2L++N0nKo7ofXLXs="; }; }; dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); in stdenvNoCC.mkDerivation rec { - version = "0.1.1"; + version = "0.1.2"; pname = "bun"; src = fetchurl { diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 46f71c856221..39bae61160a1 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.2"; + version = "16.2.1"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-VQISfScZ11DYiZhQVc8EvXYEAN2/580peP34bBTuXPo="; + sha256 = "sha256-xDUvBsiQk7qZN9HEMCrCfxJSCZ/PruEdS5EjnHFufTA="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index b0d1967d10c2..86a873e06368 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20220224"; + version = "20220620"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-ShneKhGK7kT4Vs0b7PpaGSV0tZV3lTcqhuN9yiTaH50="; + sha256 = "sha256-kVmhwJWm5ExspjBsUIC/4qe83iXo3Bbwb1+HTXcyyxo="; }; # For pod2man during the build process. diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index ae4e19ef0f84..a8c263144208 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,58 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dmidecode"; - version = "3.2"; + version = "3.4"; src = fetchurl { url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz"; - sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; + sha256 = "sha256-Q8uoUdhGfJl5zNvqsZLrZjjH06aX66Xdt3naiDdUIhI="; }; - patches = [ - # suggested patches for 3.2 according to https://www.nongnu.org/dmidecode/ - (fetchpatch { - name = "0001-fix_redfish_hostname_print_length.patch"; - url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=fde47bb227b8fa817c88d7e10a8eb771c46de1df"; - sha256 = "133nd0c72p68hnqs5m714167761r1pp6bd3kgbsrsrwdx40jlc3m"; - }) - (fetchpatch { - name = "0002-add_logical_non-volatile_device_to_memory_device_types.patch"; - url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=74dfb854b8199ddb0a27e89296fa565f4706cb9d"; - sha256 = "0wdpmlcwmqdyyrsmyis8jb7cx3q6fnqpdpc5xly663dj841jcvwh"; - }) - (fetchpatch { - name = "0003-only-scan-devmem-for-entry-point-on-x86.patch"; - url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d"; - sha256 = "1y2858n98bfa49syjinx911vza6mm7aa6xalvzjgdlyirhccs30i"; - }) - (fetchpatch { - name = "0004-fix_formatting_of_tpm_table_output.patch"; - url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=1d0db85949a5bdd96375f6131d393a11204302a6"; - sha256 = "11s8jciw7xf2668v79qcq2c9w2gwvm3dkcik8dl9v74p654y1nr8"; - }) - (fetchpatch { - name = "0005-fix_system-slot_information_for_pcie_ssd.patch"; - url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=fd08479625b5845e4d725ab628628f7ebfccc407"; - sha256 = "07l61wvsw1d8g14zzf6zm7l0ri9kkqz8j5n4h116qwhg1p2k49y4"; - }) - (fetchpatch { - name = "0006-print_type_33_name_unconditionally.patch"; - url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=65438a7ec0f4cddccf810136da6f280bd148af71"; - sha256 = "0gqz576ccxys0c8217spf1qmw9lxi9xalw85jjqwsi2bj1k6vy4n"; - }) - (fetchpatch { - name = "0007-dont_choke_on_invalid_processor_voltage.patch"; - url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=5bb7eb173b72256f70c6b3f3916d7a444be93340"; - sha256 = "1dkg4lq9kn2g1w5raz1gssn6zqk078zjqbnh9i32f822f727syhp"; - }) - (fetchpatch { - name = "0008-fix_the_alignment_of_type_25_name.patch"; - url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=557c3c373a9992d45d4358a6a2ccf53b03276f39"; - sha256 = "18hc91pk7civyqrlilg3kn2nmp2warhh49xlbzrwqi7hgipyf12z"; - }) - ]; - makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" @@ -63,5 +19,6 @@ stdenv.mkDerivation rec { description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard"; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 438b877bb271..d1dfdd98c810 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "confluent-platform"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz"; - sha256 = "sha256-uoJQQZxUGniMLJk/BwwiNnpgYFcqJ+27GFQLEpsFxCw="; + sha256 = "sha256-TtHPsrkmZ53mNL+/Ru2eHb0RKoXW/xSagrD6HF2s5ew="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 879f85a9406c..d4a20201e0f6 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.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Az3l11J2IhgugPHP3cMT7b2iwQ/TCbdjYKvmHG3c7II="; + sha256 = "sha256-WxbD68KTO9hYhwwSSj7wwDGOiJdaLFdqJR+xw3dLfio="; }; - vendorSha256 = "sha256-phQ39li/iCoZFwmaKel6r4bRV8NZXbQhNgWdJbyqdIo="; + vendorSha256 = "sha256-i3hK1567KrxBSS3iGeNnKfsFuHsukRI6l9jG+UztY+c="; doCheck = false; diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index b68f680dcc9b..9dfa5a702f2e 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.17"; + version = "5.0.18"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-N98LhzfeCenjmHEva5PBeiLE/xNOdNT/6WA8Fe+O64c="; + sha256 = "sha256-ZhjNUWzi74lr8Wtf0f+VN1kc9C6q2TJ9ogXeu3NJKbI="; }; prePatch = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index 7e2ac0593eb8..76a48e4d03c8 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.0.11"; + version = "5.0.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-w5ogK0jjvAEslXiCJvuhsS+z/Afy1KqDG7PzRQ+CMkY="; + sha256 = "sha256-3VC6hp8WN6Ttfw5TcpgjTUYxXJxmU6SUw7ZfjR+Laig="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 4ac15e7218ad..18da967c048b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.13"; + version = "5.0.14"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-umtt1xOgOEGVYVH0y/qRy3ihtKsVxYGvMGi4WFI9beY="; + sha256 = "sha256-ZIOPzRXW+aaVKDIBC3N04wx662r8WOa205CgTeYmudQ="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 4555330423bc..85ec938645f2 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -14,18 +14,20 @@ , xkeyboardconfig , libxkbfile , libXdmcp +, plasma5Packages +, plasma-framework , kcmSupport ? true }: mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.13"; + version = "5.0.14"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-sh3hd4hpqKKHdE8n5jf2v09ch2xUCCmapkp5tkeylKA="; + sha256 = "sha256-nfVdYW//ehjTFvb5ciu7ajoUB5NPZ/BkLkChJiBJPWY="; }; cmakeFlags = [ @@ -50,6 +52,8 @@ mkDerivation rec { ] ++ lib.optionals kcmSupport [ kdeclarative kwidgetsaddons + plasma5Packages.kiconthemes + plasma-framework ]; meta = with lib; { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 2b38e4ce773e..f8d8b4d5af4c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.15"; + version = "5.0.16"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Vm2Un4PZugATjDz+mcEOnoapw3yyVf8Q55f5LO6juCU="; + sha256 = "sha256-gdYtQyCczJOGkCjl7fVCjcKkhEW3wDO5HDYNfMhnb1g="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 62161bcfafdf..aea8e6151e7f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-jT9k5QXW3fdG6s91NjFZ3lrjADy8wxf2SRiVDSnr6So="; + sha256 = "sha256-Hjnt9E24u1ycKreZf6Nb8cH7S3JKRlLSYAxhA11DMjs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 72d7cb6480db..f367ccd7a935 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.8"; + version = "5.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-VHGHKV5KLbfIMWLErLRNl8pOQOkYkc/f6VjZUSqluFk="; + sha256 = "sha256-XeRMPbatXUudxo1EICL7z8V3slxkzo27f+D4xLjRtU4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index 214d7ea699d1..3c1b02a3d6ce 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-JySEzWyPZqVrvgRA4Hc0ZSGLdS29n8uoSQsFEMK6kbs="; + sha256 = "sha256-u4rW89ofuKYCn+NcvdIy0eU+lZ7Lp9kp/d0NdHW2V1s="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 6aeede334bba..79a0e7310336 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.13"; + version = "5.0.14"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-eX0tdNFGFiWrxBgghSGLHzKhK/eQ6DLLu7+ggNqTScg="; + sha256 = "sha256-LmE6HgNLoJmgJtJmubAIjFi8Xpnmw3hgqJh6HUcakzg="; }; preConfigure = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 2dfa238225a7..a9e9f0210417 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.13"; + version = "5.0.14"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-/oQdBCDV5obSHw7dzdceC+zWHcNve3NDlA50GhvkK8o="; + sha256 = "sha256-EvYNeBmP2c+kDQ4GQU0SyGhxK4jolxMmhAaoVyINmfg="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 8076cccb68c7..eb12cf0d054b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-fKT1nCr6kAFJEdacff4qBr3uI5fvIwMDPkHVFGTQf10="; + sha256 = "sha256-tn493mSC+bvCgbKV1j+HV0Oh7n1ZufZoOccpK2i0JeY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index da12f8057b2f..115af7e100a4 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-y/OY7m136VQvK75079OTFqLLR2o0NCIc5llljrJ91DU="; + sha256 = "sha256-jdc1W8aLkR2VcpjiEOJNApxNGgNqWreEBkW1pjuy1WU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 7b26d98a1945..3da555a1b198 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.0.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "sha256-gGKLv+IUcLOE3jHDzK7oX2R76cUT9VXaVFGEyNN0tV4="; + sha256 = "sha256-pFFxTk97m/ThSrJglY+tSjjKCzXbj2EukdPg8fckoDU="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22de55f6b8f4..c0fd2aacdee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8085,6 +8085,8 @@ with pkgs; netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; + nixpacks = callPackage ../applications/virtualization/nixpacks { }; + nkeys = callPackage ../tools/system/nkeys { }; nyxt = callPackage ../applications/networking/browsers/nyxt { }; @@ -27127,18 +27129,6 @@ with pkgs; gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {}); - glimpse = callPackage ../applications/graphics/glimpse { - autoreconfHook = buildPackages.autoreconfHook269; - lcms = lcms2; - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; - }; - - glimpse-with-plugins = callPackage ../applications/graphics/glimpse/wrapper.nix { - plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied - }; - - glimpsePlugins = recurseIntoAttrs (callPackage ../applications/graphics/glimpse/plugins {}); - girara = callPackage ../applications/misc/girara { gtk = gtk3; }; @@ -34658,11 +34648,11 @@ with pkgs; # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_21 kops_1_22 kops_1_23 + kops_1_24 ; - kops = kops_1_23; + kops = kops_1_24; lguf-brightness = callPackage ../misc/lguf-brightness { };