lol

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
70776ac2 3f661609

+405 -161
+7
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
··· 235 235 </listitem> 236 236 <listitem> 237 237 <para> 238 + <link xlink:href="https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master">OpenRGB</link>, 239 + a FOSS tool for controlling RGB lighting. Available as 240 + <link xlink:href="options.html#opt-services-hardware-openrgb-enable">services.hardware.openrgb.enable</link>. 241 + </para> 242 + </listitem> 243 + <listitem> 244 + <para> 238 245 <link xlink:href="https://www.getoutline.com/">Outline</link>, 239 246 a wiki and knowledge base similar to Notion. Available as 240 247 <link linkend="opt-services.outline.enable">services.outline</link>.
+2
nixos/doc/manual/release-notes/rl-2211.section.md
··· 85 85 - [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. 86 86 Available as [services.languagetool](options.html#opt-services.languagetool.enable). 87 87 88 + - [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master), a FOSS tool for controlling RGB lighting. Available as [services.hardware.openrgb.enable](options.html#opt-services-hardware-openrgb-enable). 89 + 88 90 - [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). 89 91 90 92 - [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable).
+1
nixos/modules/module-list.nix
··· 455 455 ./services/hardware/lcd.nix 456 456 ./services/hardware/lirc.nix 457 457 ./services/hardware/nvidia-optimus.nix 458 + ./services/hardware/openrgb.nix 458 459 ./services/hardware/pcscd.nix 459 460 ./services/hardware/pommed.nix 460 461 ./services/hardware/power-profiles-daemon.nix
+52
nixos/modules/services/hardware/openrgb.nix
··· 1 + { pkgs, lib, config, ... }: 2 + 3 + with lib; 4 + 5 + let 6 + cfg = config.services.hardware.openrgb; 7 + in { 8 + options.services.hardware.openrgb = { 9 + enable = mkEnableOption (lib.mdDoc "OpenRGB server"); 10 + 11 + package = mkOption { 12 + type = types.package; 13 + default = pkgs.openrgb; 14 + defaultText = literalMD "pkgs.openrgb"; 15 + description = lib.mdDoc "Set version of openrgb package to use."; 16 + }; 17 + 18 + motherboard = mkOption { 19 + type = types.nullOr (types.enum [ "amd" "intel" ]); 20 + default = null; 21 + description = lib.mdDoc "CPU family of motherboard. Allows for addition motherboard i2c support."; 22 + }; 23 + 24 + server.port = mkOption { 25 + type = types.port; 26 + default = 6742; 27 + description = lib.mdDoc "Set server port of openrgb."; 28 + }; 29 + 30 + }; 31 + 32 + config = mkIf cfg.enable { 33 + environment.systemPackages = [ cfg.package ]; 34 + services.udev.packages = [ cfg.package ]; 35 + 36 + boot.kernelModules = [ "i2c-dev" ] 37 + ++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix" ] 38 + ++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ]; 39 + 40 + systemd.services.openrgb = { 41 + description = "OpenRGB server daemon"; 42 + wantedBy = [ "multi-user.target" ]; 43 + 44 + serviceConfig = { 45 + ExecStart = "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}"; 46 + Restart = "always"; 47 + }; 48 + }; 49 + }; 50 + 51 + meta.maintainers = with lib.maintainers; [ jonringer ]; 52 + }
+2 -2
pkgs/applications/graphics/batik/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "batik"; 5 - version = "1.14"; 5 + version = "1.15"; 6 6 7 7 src = fetchurl { 8 8 url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; 9 - sha256 = "sha256-D06qgb5wdS5AahnznDnAGISPCZY/CPqJdGQFRwUsRhg="; 9 + sha256 = "sha256-NYo7+8DikUmDsioM1Q1YW1s3KwsQeTnwIKDr+RHxxyo="; 10 10 }; 11 11 12 12 meta = with lib; {
+6 -6
pkgs/applications/misc/calibre/default.nix
··· 27 27 28 28 mkDerivation rec { 29 29 pname = "calibre"; 30 - version = "5.42.0"; 30 + version = "5.44.0"; 31 31 32 32 src = fetchurl { 33 33 url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; 34 - hash = "sha256-pob9GZl3Wiky5aMGGvcNQdDrKh19bo+n5ihdS45X+Vg="; 34 + hash = "sha256-b/qj6v02okNV5ZV/D4ONttttNFbPoXy00Tn9lOuviOw="; 35 35 }; 36 36 37 37 # https://sources.debian.org/patches/calibre/${version}+dfsg-1 ··· 40 40 (fetchpatch { 41 41 name = "0001-only-plugin-update.patch"; 42 42 url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; 43 - sha256 = "sha256:1h2hl4z9qm17crms4d1lq2cq44cnxbga1dv6qckhxvcg6pawxg3l"; 43 + sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA="; 44 44 }) 45 45 (fetchpatch { 46 - name = "0007-Hardening-Qt-code.patch"; 47 - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch"; 48 - sha256 = "sha256:18wps7fn0cpzb7gf78f15pmbaff4vlygc9g00hq7zynfa4pcgfdg"; 46 + name = "0006-Hardening-Qt-code.patch"; 47 + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch"; 48 + sha256 = "sha256-/X6iZZFxv4793h2yYI3UAz0mLNEmKpdVrmOnABFT0tE="; 49 49 }) 50 50 ] 51 51 ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+2 -2
pkgs/applications/misc/dasel/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "dasel"; 8 - version = "1.26.1"; 8 + version = "1.27.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "TomWright"; 12 12 repo = "dasel"; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-7DQJiwszE+qGcyyOZd9Zzg9PPc79HTYk8knI7upduts="; 14 + sha256 = "sha256-bVAW8DrLqZKm9/iLleFxIMVkxaqhgdKwQUSEPpYhwt8="; 15 15 }; 16 16 17 17 vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA=";
+11
pkgs/applications/misc/doctave/cargo-lock.patch
··· 1 + --- a/Cargo.lock 2 + +++ b/Cargo.lock 3 + @@ -295,7 +295,7 @@ dependencies = [ 4 + 5 + [[package]] 6 + name = "doctave" 7 + -version = "0.4.0" 8 + +version = "0.4.2" 9 + dependencies = [ 10 + "alphanumeric-sort", 11 + "ascii",
+30
pkgs/applications/misc/doctave/default.nix
··· 1 + { lib, rustPlatform, fetchFromGitHub, stdenv, CoreServices }: 2 + 3 + rustPlatform.buildRustPackage rec { 4 + pname = "doctave"; 5 + version = "0.4.2"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "doctave"; 9 + repo = pname; 10 + rev = version; 11 + sha256 = "1780pqvnlbxxhm7rynnysqr0vihdkwmc6rmgp43bmj1k18ar4qgj"; 12 + }; 13 + 14 + # Cargo.lock is outdated 15 + cargoPatches = [ ./cargo-lock.patch ]; 16 + 17 + cargoSha256 = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc="; 18 + 19 + buildInputs = lib.optionals stdenv.isDarwin [ 20 + CoreServices 21 + ]; 22 + 23 + meta = with lib; { 24 + description = "A batteries-included developer documentation site generator"; 25 + homepage = "https://github.com/doctave/doctave"; 26 + changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md"; 27 + license = licenses.mit; 28 + maintainers = with maintainers; [ figsoda ]; 29 + }; 30 + }
+2 -2
pkgs/applications/networking/cluster/k9s/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "k9s"; 5 - version = "0.26.5"; 5 + version = "0.26.6"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "derailed"; 9 9 repo = "k9s"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-IARb8MGFIg2X5rOipQyM2qL3fXa6xRS58cavR4ytH+k="; 11 + sha256 = "sha256-cWk2K1+j5P14TO7YSTY9/1RT2HjG9BtfsFJy+cg9EDs="; 12 12 }; 13 13 14 14 ldflags = [
+6 -10
pkgs/applications/office/paperless-ngx/default.nix
··· 26 26 src = fetchFromGitHub { 27 27 owner = "paperless-ngx"; 28 28 repo = "django-q"; 29 - sha256 = "sha256-aoDuPig8Nf8fLzn7GjBn69aF2zH2l8gxascAu9lIG3U="; 30 - rev = "71abc78fdaec029cf71e9849a3b0fa084a1678f7"; 29 + hash = "sha256-alu7tZwUn77xhUF9c/aGmwRwO//mR/FucXjvXUl/6ek="; 30 + rev = "8b5289d8caf36f67fb99448e76ead20d5b498c1b"; 31 31 }; 32 32 # due to paperless-ngx modification of the pyproject.toml file 33 33 # the patch is not needed any more 34 - patches = []; 35 - }); 36 - 37 - # django-extensions 3.1.5 is required, but its tests are incompatible with Django 4 38 - django-extensions = super.django-extensions.overridePythonAttrs (_: { 39 - doCheck = false; 34 + patches = [ ]; 40 35 }); 41 36 42 37 aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec { ··· 66 61 in 67 62 python.pkgs.pythonPackages.buildPythonApplication rec { 68 63 pname = "paperless-ngx"; 69 - version = "1.8.0"; 64 + version = "1.9.1"; 70 65 71 66 # Fetch the release tarball instead of a git ref because it contains the prebuilt fontend 72 67 src = fetchurl { 73 68 url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; 74 - hash = "sha256-BLfhh04RvBJFRQiPXkMl8XlWqZOWKmjjl+6lZ326stU="; 69 + hash = "sha256-KWq3zUES8klXexNO9krlqZKZEajOhkTHF13t/3rxrPc="; 75 70 }; 76 71 77 72 format = "other"; ··· 120 115 inotifyrecursive 121 116 joblib 122 117 langdetect 118 + pkgs.libmysqlclient 123 119 lxml 124 120 msgpack 125 121 numpy
+14 -2
pkgs/applications/office/pdfmixtool/default.nix
··· 1 1 { lib 2 2 , mkDerivation 3 3 , fetchFromGitLab 4 + , fetchpatch 4 5 , cmake 5 6 , pkg-config 6 7 , qtbase 7 8 , qttools 8 9 , qpdf 9 10 , podofo 11 + , imagemagick 10 12 }: 11 13 12 14 mkDerivation rec { 13 15 pname = "pdfmixtool"; 14 - version = "1.0.2"; 16 + version = "1.1"; 15 17 16 18 src = fetchFromGitLab { 17 19 owner = "scarpetta"; 18 20 repo = pname; 19 21 rev = "v${version}"; 20 - sha256 = "066ap1w05gj8n0kvilyhlr1fzwrmlczx3lax7mbw0rfid9qh3467"; 22 + hash = "sha256-S8hhWZ6nHyIWPwsfl+o9XnljLD3aE/vthCLuWEbm5nc="; 21 23 }; 22 24 23 25 nativeBuildInputs = [ ··· 26 28 ]; 27 29 28 30 buildInputs = [ 31 + imagemagick 29 32 qtbase 30 33 qttools 31 34 qpdf 32 35 podofo 36 + ]; 37 + 38 + patches = [ 39 + # fix incompatibility with qpdf11 40 + (fetchpatch { 41 + url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/81f7e96f6e68dfeba3cd4e00d8553dfdd2d7f2fa.diff"; 42 + hash = "sha256-uBchYjUIqL7dJR7U/TSxhSGu1qY742cFUIv0XKU6L2g="; 43 + }) 44 + 33 45 ]; 34 46 35 47 meta = with lib; {
+2 -2
pkgs/applications/science/misc/snakemake/default.nix
··· 5 5 6 6 python3.pkgs.buildPythonApplication rec { 7 7 pname = "snakemake"; 8 - version = "7.14.1"; 8 + version = "7.14.2"; 9 9 format = "setuptools"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "snakemake"; 13 13 repo = pname; 14 14 rev = "refs/tags/v${version}"; 15 - hash = "sha256-o2pERzt6wU/EiXBc9kI2qn9PhXGyvNiEWbSRzI85R8c="; 15 + hash = "sha256-4XduybmDmlux3zvjbN1ouaJ1PkNO8h6vHuxgZ3YLBrw="; 16 16 }; 17 17 18 18 propagatedBuildInputs = with python3.pkgs; [
+3 -3
pkgs/applications/virtualization/colima/default.nix
··· 11 11 12 12 buildGoModule rec { 13 13 pname = "colima"; 14 - version = "0.4.4"; 14 + version = "0.4.5"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "abiosoft"; 18 18 repo = pname; 19 19 rev = "v${version}"; 20 - sha256 = "bSBaSS+rVkFqTSdyegdE/F0X5u7yvF/nHslAO3xgD6I="; 20 + sha256 = "sha256-hoxEf62EPD/WFXW6qbPCvEwViwmme3pSBfjeKOLsGjc="; 21 21 # We need the git revision 22 22 leaveDotGit = true; 23 23 postFetch = '' ··· 28 28 29 29 nativeBuildInputs = [ installShellFiles makeWrapper ]; 30 30 31 - vendorSha256 = "sha256-jDzDwK7qA9lKP8CfkKzfooPDrHuHI4OpiLXmX9vOpOg="; 31 + vendorSha256 = "sha256-tsMQMWEkTE1NhevcqBETGWiboqL6QTepgnIo4B5Y4wQ="; 32 32 33 33 CGO_ENABLED = 1; 34 34
+11 -32
pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
··· 1 1 { lib 2 - , stdenv 3 - , fetchurl 4 - , pkg-config 5 - , intltool 6 - , glib 2 + , mkXfceDerivation 7 3 , exo 4 + , gtk3 8 5 , libXtst 9 - , xorgproto 6 + , libxfce4ui 10 7 , libxfce4util 11 8 , xfce4-panel 12 - , libxfce4ui 13 9 , xfconf 14 - , gtk3 15 - , hicolor-icon-theme 16 - , xfce 10 + , xorgproto 17 11 }: 18 12 19 - let 13 + mkXfceDerivation rec { 20 14 category = "panel-plugins"; 21 - in stdenv.mkDerivation rec { 22 15 pname = "xfce4-cpugraph-plugin"; 23 16 version = "1.2.6"; 24 - 25 - src = fetchurl { 26 - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; 27 - sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k="; 28 - }; 29 - 30 - nativeBuildInputs = [ 31 - pkg-config 32 - intltool 33 - ]; 17 + rev-prefix = "xfce4-cpugraph-plugin-"; 18 + odd-unstable = false; 19 + sha256 = "sha256-Elm10ZGN93R+1XZ4vJJZZIJ6OcaHpsrH0nQRMMuFnLY="; 34 20 35 21 buildInputs = [ 36 - glib 37 22 exo 23 + gtk3 38 24 libXtst 39 - xorgproto 25 + libxfce4ui 40 26 libxfce4util 41 - libxfce4ui 42 27 xfce4-panel 43 28 xfconf 44 - gtk3 45 - hicolor-icon-theme 29 + xorgproto 46 30 ]; 47 31 48 - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; 49 - 50 32 meta = with lib; { 51 - homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"; 52 33 description = "CPU graph show for Xfce panel"; 53 - license = licenses.gpl2Plus; 54 - platforms = platforms.linux; 55 34 maintainers = with maintainers; [ ] ++ teams.xfce.members; 56 35 }; 57 36 }
+2 -2
pkgs/development/compilers/nextpnr/default.nix
··· 14 14 in 15 15 stdenv.mkDerivation rec { 16 16 pname = "nextpnr"; 17 - version = "0.3"; 17 + version = "0.4"; 18 18 19 19 srcs = [ 20 20 (fetchFromGitHub { 21 21 owner = "YosysHQ"; 22 22 repo = "nextpnr"; 23 23 rev = "${pname}-${version}"; 24 - hash = "sha256-q4h1TNAn66fJou8abNFowRbGXZTBfz5x+H5Q/psMvIw="; 24 + hash = "sha256-gnNUFSV+/SzCuP43KyUUgVNdAzjOM7lOLNJT72L8lTY="; 25 25 name = "nextpnr"; 26 26 }) 27 27 (fetchFromGitHub {
+2 -2
pkgs/development/compilers/swi-prolog/default.nix
··· 34 34 }: 35 35 36 36 let 37 - version = "8.5.17"; 37 + version = "8.3.29"; 38 38 packInstall = swiplPath: pack: 39 39 ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." 40 40 ''; ··· 47 47 owner = "SWI-Prolog"; 48 48 repo = "swipl-devel"; 49 49 rev = "V${version}"; 50 - sha256 = "sha256-n1o6eG40DHnmNXuifQC6UFwGzuiL22V++0qRmq1RSzc="; 50 + sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU="; 51 51 fetchSubmodules = true; 52 52 }; 53 53
+6 -9
pkgs/development/embedded/fpga/trellis/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, python3, boost, cmake }: 2 2 3 3 let 4 - rev = "2f06397673bbca3da11928d538b8ab7d01c944c6"; 4 + rev = "488f4e71073062de314c55a037ede7cf03a3324c"; 5 5 # git describe --tags 6 - realVersion = "1.0-534-g${builtins.substring 0 7 rev}"; 6 + realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}"; 7 7 in stdenv.mkDerivation rec { 8 8 pname = "trellis"; 9 - version = "2021-12-14"; 9 + version = "unstable-2022-09-14"; 10 10 11 11 srcs = [ 12 12 (fetchFromGitHub { 13 13 owner = "YosysHQ"; 14 14 repo = "prjtrellis"; 15 15 inherit rev; 16 - hash = "sha256-m5CalAIbzY2bhOvpBbPBeLZeDp+itk1HlRsSmtiddaA="; 16 + hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw="; 17 17 name = "trellis"; 18 18 }) 19 19 20 20 (fetchFromGitHub { 21 21 owner = "YosysHQ"; 22 22 repo = "prjtrellis-db"; 23 - # note: the upstream submodule points to revision 0ee729d20eaf, 24 - # but that's just the tip of the branch that was merged into master. 25 - # fdf4bf275a is the merge commit itself 26 - rev = "fdf4bf275a7402654bc643db537173e2fbc86103"; 27 - sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA="; 23 + rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa"; 24 + hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0="; 28 25 name = "trellis-database"; 29 26 }) 30 27 ];
+3 -3
pkgs/development/interpreters/wasmtime/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "wasmtime"; 5 - version = "1.0.0"; 5 + version = "1.0.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "bytecodealliance"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-e5YEHVALk6wJ76dl68mT+ncztU2FjpFqTp6YS9Gsz2c="; 11 + sha256 = "sha256-dQ5RAeJYEfU/WcHf9Xz1jjetlEePB1oHDAbKpzqkda4="; 12 12 fetchSubmodules = true; 13 13 }; 14 14 15 - cargoSha256 = "sha256-q0eS5vPOh/VhC+oke2GeZX18GmrHwrsaMXcHK0jBZ7A="; 15 + cargoSha256 = "sha256-0xEMlt1d6E+APf6SQ23E+mS/U4f0ziRpn2tTF9nSbx4="; 16 16 17 17 cargoBuildFlags = [ 18 18 "--package wasmtime-cli"
+1 -1
pkgs/development/libraries/arrow-cpp/default.nix
··· 39 39 , zstd 40 40 , enableShared ? !stdenv.hostPlatform.isStatic 41 41 , enableFlight ? true 42 - , enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin) 42 + , enableJemalloc ? !stdenv.isDarwin 43 43 # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and 44 44 # non-existent in older versions 45 45 # see https://github.com/boostorg/process/issues/55
+2 -2
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
··· 8 8 nv-codec-headers = nv-codec-headers-11; 9 9 }).overrideAttrs (old: rec { 10 10 pname = "jellyfin-ffmpeg"; 11 - version = "5.1.1-1"; 11 + version = "5.1.1-2"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "jellyfin"; 15 15 repo = "jellyfin-ffmpeg"; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-WxUADm5z6SH6Xegi2dhhien5IBY/Y/ZZaXr7MdOvpYA="; 17 + sha256 = "sha256-aviluHVNGxbWkmJ6mnlFbtRKKb0FoKkNw0Bgl+tmqyA="; 18 18 }; 19 19 20 20 configureFlags = old.configureFlags ++ [
+9 -10
pkgs/development/libraries/qpdf/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, libjpeg, zlib, perl }: 1 + { lib, stdenv, fetchFromGitHub, libjpeg, zlib, cmake, perl }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "qpdf"; 5 - version = "10.6.3"; 5 + version = "11.1.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "qpdf"; 9 9 repo = "qpdf"; 10 - rev = "release-qpdf-${version}"; 11 - hash = "sha256-SiZA8T7N1SWlbCFosSqFosLDV/3Q7+ywvgq1iB4umdg="; 10 + rev = "v${version}"; 11 + hash = "sha256-T06BLtDZN6ulJ9Po3LN1RlI6q8ddAfo95RAhyfrn+qg="; 12 12 }; 13 13 14 - nativeBuildInputs = [ perl ]; 14 + nativeBuildInputs = [ cmake perl ]; 15 15 16 16 buildInputs = [ zlib libjpeg ]; 17 17 18 - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) 19 - "--with-random=/dev/urandom"; 20 - 21 - preCheck = '' 18 + preConfigure = '' 22 19 patchShebangs qtest/bin/qtest-driver 20 + patchShebangs run-qtest 21 + # qtest needs to know where the source code is 22 + substituteInPlace CMakeLists.txt --replace "run-qtest" "run-qtest --top $src --code $src --bin $out" 23 23 ''; 24 24 25 25 doCheck = true; 26 - enableParallelBuilding = true; 27 26 28 27 meta = with lib; { 29 28 homepage = "http://qpdf.sourceforge.net/";
+1 -1
pkgs/development/node-packages/overrides.nix
··· 361 361 362 362 src = fetchurl { 363 363 url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; 364 - sha512 = "sha512-HuYqnTDgH8atjPGtYmY0Ql9XrrJnfW7daG1PtAJRW0E6gJxc50lY3vrIDn0yjMR3TvRlypjTcspQX8DT+xD4Sg=="; 364 + sha512 = "sha512-l/QKLmLcKJQFuc+X02LyICo0NWTUVaNNZ00jKJBqwDyhwMAhboD1FWwYV50rkH4Wls0RviAJSFzkC2ZrfawpfA=="; 365 365 }; 366 366 postInstall = with pkgs; '' 367 367 wrapProgram "$out/bin/prisma" \
+2 -2
pkgs/development/python-modules/fakeredis/default.nix
··· 16 16 17 17 buildPythonPackage rec { 18 18 pname = "fakeredis"; 19 - version = "1.9.1"; 19 + version = "1.9.3"; 20 20 format = "pyproject"; 21 21 22 22 disabled = pythonOlder "3.7"; ··· 25 25 owner = "dsoftwareinc"; 26 26 repo = "fakeredis-py"; 27 27 rev = "refs/tags/v${version}"; 28 - hash = "sha256-3jsTNwxUZzkNxutYqK8lI37Cexrii6QydikW/TkUqbk="; 28 + hash = "sha256-tZ+t4s5V8Na2Lt/TlkdJi7vZxlxAaMbk3MvxUhdQOLs="; 29 29 }; 30 30 31 31 nativeBuildInputs = [
+3 -5
pkgs/development/python-modules/pikepdf/default.nix
··· 24 24 25 25 buildPythonPackage rec { 26 26 pname = "pikepdf"; 27 - version = "5.4.2"; 27 + version = "6.0.2"; 28 28 format = "setuptools"; 29 29 30 30 disabled = pythonOlder "3.7"; ··· 39 39 postFetch = '' 40 40 rm "$out/.git_archival.txt" 41 41 ''; 42 - hash = "sha256-b4QUn+wfkk6Yx74ViBg6yaE1+bXtxidoyXYgBaJ9iiM="; 42 + hash = "sha256-rwMSmARUrScG2nmiYBSkcq0NuUMhn0pHOPvgdKZbH7w="; 43 43 }; 44 44 45 45 patches = [ ··· 51 51 ]; 52 52 53 53 postPatch = '' 54 - sed -i 's|\S*/opt/homebrew.*|pass|' setup.py 55 - 56 54 substituteInPlace setup.py \ 57 - --replace setuptools_scm_git_archive "" 55 + --replace "shims_enabled = not cflags_defined" "shims_enabled = False" 58 56 ''; 59 57 60 58 SETUPTOOLS_SCM_PRETEND_VERSION = version;
+12 -21
pkgs/development/python-modules/pikepdf/paths.patch
··· 12 12 check=True, 13 13 ) 14 14 diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py 15 - index be390a1..3818ec3 100644 15 + index 28c596b..aff3565 100644 16 16 --- a/src/pikepdf/jbig2.py 17 17 +++ b/src/pikepdf/jbig2.py 18 - @@ -31,7 +31,7 @@ def extract_jbig2( 18 + @@ -28,7 +28,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: 19 19 output_path = Path(tmpdir) / "outfile" 20 - 20 + 21 21 args = [ 22 22 - "jbig2dec", 23 23 + "@jbig2dec@", 24 24 "--embedded", 25 25 "--format", 26 26 "png", 27 - @@ -64,7 +64,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: 28 - output_path = Path(tmpdir) / "outfile" 29 - 30 - args = [ 31 - - "jbig2dec", 32 - + "@jbig2dec@", 33 - "--embedded", 34 - "--format", 35 - "png", 36 - @@ -100,7 +100,7 @@ def extract_jbig2_bytes( 37 - 38 - def _check_jbig2dec_available() -> None: # pragma: no cover 39 - try: 40 - - proc = run(['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii') 41 - + proc = run(['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii') 42 - except (CalledProcessError, FileNotFoundError) as e: 43 - raise DependencyError("jbig2dec - not installed or not found") from e 44 - else: 27 + @@ -88,7 +88,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): 28 + def _version(self) -> Version: 29 + try: 30 + proc = run( 31 + - ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii' 32 + + ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii' 33 + ) 34 + except (CalledProcessError, FileNotFoundError) as e: 35 + raise DependencyError("jbig2dec - not installed or not found") from e
+28
pkgs/development/tools/argc/default.nix
··· 1 + { lib, rustPlatform, fetchFromGitHub, installShellFiles }: 2 + 3 + rustPlatform.buildRustPackage rec { 4 + pname = "argc"; 5 + version = "0.11.0"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "sigoden"; 9 + repo = pname; 10 + rev = "v${version}"; 11 + sha256 = "1gzsp08x54bsvzjm09cr1lgdr5mq1gzs36x2fjd710ixwcf9fcb6"; 12 + }; 13 + 14 + cargoSha256 = "sha256-LIQ/j4NMYwrwBQkEYlrqRobrfkPERwtWZqT8pwSoICA="; 15 + 16 + nativeBuildInputs = [ installShellFiles ]; 17 + 18 + postInstall = '' 19 + installShellCompletion completions/argc.{bash,zsh} 20 + ''; 21 + 22 + meta = with lib; { 23 + description = "A tool to handle sh/bash cli parameters"; 24 + homepage = "https://github.com/sigoden/argc"; 25 + license = with licenses; [ mit /* or */ asl20 ]; 26 + maintainers = with maintainers; [ figsoda ]; 27 + }; 28 + }
+3 -3
pkgs/development/tools/database/prisma-engines/default.nix
··· 13 13 # function correctly. 14 14 rustPlatform.buildRustPackage rec { 15 15 pname = "prisma-engines"; 16 - version = "4.2.1"; 16 + version = "4.4.0"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "prisma"; 20 20 repo = "prisma-engines"; 21 21 rev = version; 22 - sha256 = "sha256-TlKjAfpygQq2c77d6ZoMIBtWC0bAiMiKygFkh5GrBBc="; 22 + sha256 = "sha256-gk+psYNSC5Xy6R3aUF0E9TyJgJ78+EMvz/xnPgN3+RY="; 23 23 }; 24 24 25 25 # Use system openssl. 26 26 OPENSSL_NO_VENDOR = 1; 27 27 28 - cargoSha256 = "sha256-KkCq7h6qqh37LvA4wQYjLk/LPKCg5Wgl6tEhH55qh8M="; 28 + cargoSha256 = "sha256-BiQMoY2hd5q05YZBrTrHlKDtWlOkyfWjjNB/8F2+lXg="; 29 29 30 30 nativeBuildInputs = [ pkg-config ]; 31 31
+2 -2
pkgs/development/tools/oh-my-posh/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "oh-my-posh"; 5 - version = "11.0.1"; 5 + version = "11.1.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "jandedobbeleer"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-ovbhU23m4idWOSmdzPh5RH5/DxPjzsk1qqccIzGjNY4="; 11 + sha256 = "sha256-6BTH4wiiiQEP8DMq+pYHizIgnJrj8bO3i/RIwvqAYbQ="; 12 12 }; 13 13 14 14 vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E=";
+22
pkgs/development/tools/rust/dioxus-cli/default.nix
··· 1 + { fetchCrate, lib, rustPlatform, openssl, pkg-config }: 2 + rustPlatform.buildRustPackage rec { 3 + pname = "dioxus-cli"; 4 + version = "0.1.4"; 5 + 6 + src = fetchCrate { 7 + inherit pname version; 8 + sha256 = "sha256-SnmDOMxc+39LX6kOzma2zA6T91UGCnvr7WWhX+wXnLo="; 9 + }; 10 + 11 + nativeBuildInputs = [ pkg-config ]; 12 + buildInputs = [ openssl ]; 13 + 14 + cargoSha256 = "sha256-Mf/WtOO/vFuhg90DoPDwOZ6XKj423foHZ8vHugXakb0="; 15 + 16 + meta = with lib; { 17 + description = "CLI tool for developing, testing, and publishing Dioxus apps"; 18 + homepage = "https://dioxuslabs.com"; 19 + license = with licenses; [ mit asl20 ]; 20 + maintainers = with maintainers; [ xanderio ]; 21 + }; 22 + }
+3 -3
pkgs/development/tools/rust/rust-analyzer/default.nix
··· 12 12 13 13 rustPlatform.buildRustPackage rec { 14 14 pname = "rust-analyzer-unwrapped"; 15 - version = "2022-09-19"; 16 - cargoSha256 = "sha256-GoGnhO1WaDpNrxyOj2xJPirwmsZ2IESDmA7orryupfo="; 15 + version = "2022-09-26"; 16 + cargoSha256 = "sha256-Wq5fI/ohoTHEjx0wa8De2uh8cG5+92H+vAfDa25JilY="; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "rust-lang"; 20 20 repo = "rust-analyzer"; 21 21 rev = version; 22 - sha256 = "sha256-aG6JOn3BG/2U1zuusB4bwLnPMXNoAeDSL8MWUCDLvl8="; 22 + sha256 = "sha256-aCHudrXd8DKocehX6aWzlbZv4bq2l7MFXhM/wc2NdmI="; 23 23 }; 24 24 25 25 cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
+3 -3
pkgs/games/unvanquished/default.nix
··· 33 33 }: 34 34 35 35 let 36 - version = "0.53.1"; 36 + version = "0.53.2"; 37 37 binary-deps-version = "6"; 38 38 39 39 src = fetchFromGitHub { ··· 41 41 repo = "Unvanquished"; 42 42 rev = "v${version}"; 43 43 fetchSubmodules = true; 44 - sha256 = "sha256-AWXuPXOhhPfdDrcyZF5o7uBnieSCGhwCzOYN8MjgTl8="; 44 + sha256 = "sha256-VqMhA6GEYh/m+dzOgXS+5Jqo4x7RrQf4qIwstdTTU+E="; 45 45 }; 46 46 47 47 unvanquished-binary-deps = stdenv.mkDerivation rec { ··· 119 119 pname = "unvanquished-assets"; 120 120 inherit version src; 121 121 122 - outputHash = "sha256-+mO4HQwFfy7SeGrN4R52KOr/uNQXkHMvYir3k0l5rDo="; 122 + outputHash = "sha256-MPqyqcZGc5KlkftGCspWhISBJ/h+Os29g7ZK6yWz0cQ="; 123 123 outputHashMode = "recursive"; 124 124 125 125 nativeBuildInputs = [ aria2 cacert ];
+32 -3
pkgs/servers/matrix-synapse/default.nix
··· 1 - { lib, stdenv, python3, openssl 1 + { lib, stdenv, python3, openssl, rustPlatform 2 2 , enableSystemd ? stdenv.isLinux, nixosTests 3 3 , enableRedis ? true 4 4 , callPackage ··· 11 11 with python3.pkgs; 12 12 buildPythonApplication rec { 13 13 pname = "matrix-synapse"; 14 - version = "1.67.0"; 14 + version = "1.68.0"; 15 + format = "pyproject"; 15 16 16 17 src = fetchPypi { 17 18 inherit pname version; 18 - sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY="; 19 + hash = "sha256-jQcprvKEbLuLWth0aWeh5mi/v8z83GIrjCsm3JdJcUM="; 19 20 }; 20 21 22 + cargoDeps = rustPlatform.fetchCargoTarball { 23 + inherit src; 24 + name = "${pname}-${version}"; 25 + hash = "sha256-k8iAYRgFCuv6QYAUW5kSEwFSEXVNAEGpPya7biS1Vlo="; 26 + }; 27 + 28 + postPatch = '' 29 + # Remove setuptools_rust from runtime dependencies 30 + # https://github.com/matrix-org/synapse/blob/v1.68.0/pyproject.toml#L177-L185 31 + sed -i '/^setuptools_rust =/d' pyproject.toml 32 + ''; 33 + 34 + nativeBuildInputs = [ 35 + poetry-core 36 + rustPlatform.cargoSetupHook 37 + setuptools-rust 38 + ] ++ (with rustPlatform.rust; [ 39 + cargo 40 + rustc 41 + ]); 42 + 21 43 buildInputs = [ openssl ]; 22 44 23 45 propagatedBuildInputs = [ ··· 63 85 doCheck = !stdenv.isDarwin; 64 86 65 87 checkPhase = '' 88 + runHook preCheck 89 + 90 + # remove src module, so tests use the installed module instead 91 + rm -rf ./synapse 92 + 66 93 PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests 94 + 95 + runHook postCheck 67 96 ''; 68 97 69 98 passthru.tests = { inherit (nixosTests) matrix-synapse; };
+3 -3
pkgs/servers/minio/default.nix
··· 15 15 in 16 16 buildGoModule rec { 17 17 pname = "minio"; 18 - version = "2022-09-22T18-57-27Z"; 18 + version = "2022-09-25T15-44-53Z"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "minio"; 22 22 repo = "minio"; 23 23 rev = "RELEASE.${version}"; 24 - sha256 = "sha256-y8FgfUQG5vuBCqLmTtiIdpduJhfLZ7oSvOgPBYV+sQY="; 24 + sha256 = "sha256-ygDE7oqNddC+7kIkGu3QuswQp1Mh441rHvwF2JIKOzE="; 25 25 }; 26 26 27 - vendorSha256 = "sha256-zXEGukIHfb9CX+GJFcpVwo2UFZSJoc8Iq6olDKqh/gM="; 27 + vendorSha256 = "sha256-nl7lQ+PnfEgEnc/g2PIpsSQH18v/YF5yw+tlIYWNP1A="; 28 28 29 29 doCheck = false; 30 30
+2 -2
pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
··· 10 10 11 11 stdenv.mkDerivation rec { 12 12 pname = "check_ssl_cert"; 13 - version = "2.47.0"; 13 + version = "2.48.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "matteocorti"; 17 17 repo = "check_ssl_cert"; 18 18 rev = "v${version}"; 19 - hash = "sha256-8Xzu9uyShhJ/gmEs60qJ9W+00NSTCpNe2nqa9aT19ng="; 19 + hash = "sha256-uaDeg7Dph99NWN0pKHrffBYOOzN8/1fW2YBEE8vnYMs="; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+3 -3
pkgs/servers/web-apps/vikunja/api.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "vikunja-api"; 5 - version = "0.19.0"; 5 + version = "0.19.2"; 6 6 7 7 src = fetchFromGitea { 8 8 domain = "kolaente.dev"; 9 9 owner = "vikunja"; 10 10 repo = "api"; 11 11 rev = "v${version}"; 12 - sha256 = "sha256-1BxkQFiAqH+n8yzQn0+5cd/Z6oEBbGuK1pu1qt8CUbk="; 12 + sha256 = "sha256-KI/RgtyjO+LdsoZ0JMo7xHeINpUAd5nDvd/WiWYEA6c="; 13 13 }; 14 14 15 15 nativeBuildInputs = ··· 24 24 ''; 25 25 in [ fakeGit mage ]; 26 26 27 - vendorSha256 = "fzk22B7KpXfGS+8GF6J3ydmFyvP7oelRuiF+IveYdg4="; 27 + vendorSha256 = "sha256-ZEmZeIB+uL1/JWEfBd7gZuGNF95pdiJfu5+FY2+sL64="; 28 28 29 29 # checks need to be disabled because of needed internet for some checks 30 30 doCheck = false;
+2 -2
pkgs/servers/web-apps/vikunja/frontend.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "vikunja-frontend"; 5 - version = "0.19.0"; 5 + version = "0.19.1"; 6 6 src = fetchurl { 7 7 url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; 8 - sha256 = "sha256-pdUNPfGgbSMyXcS2HKMekIiIzJ3GutHCs0gFVkHN9yc="; 8 + sha256 = "sha256-Kf55M1m/NBQhgaul/4seDMdPFU8jhgOwTNAzdgVg2OQ="; 9 9 }; 10 10 11 11 nativeBuildInputs = [ unzip ];
+11 -3
pkgs/servers/web-apps/wordpress/default.nix
··· 1 - { lib, stdenv, fetchurl, nixosTests }: 1 + { lib, stdenv, fetchurl, nixosTests, writeScript }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "wordpress"; 5 - version = "6.0.1"; 5 + version = "6.0.2"; 6 6 7 7 src = fetchurl { 8 8 url = "https://wordpress.org/${pname}-${version}.tar.gz"; 9 - sha256 = "sha256-9nhZaASqidfNySgIYpOEZOqyWurr/vqRrhdeFao+8FQ="; 9 + sha256 = "sha256-UG5FYlJowBy71DJHgoDE1/lIIndp0qx1yFlDIeMV0Og="; 10 10 }; 11 11 12 12 installPhase = '' ··· 17 17 passthru.tests = { 18 18 inherit (nixosTests) wordpress; 19 19 }; 20 + 21 + passthru.updateScript = writeScript "update.sh" '' 22 + #!/usr/bin/env nix-shell 23 + #!nix-shell -i bash -p common-updater-scripts jq 24 + set -eu -o pipefail 25 + version=$(curl --globoff "https://api.wordpress.org/core/version-check/1.7/" | jq -r '.offers[0].version') 26 + update-source-version wordpress $version 27 + ''; 20 28 21 29 meta = with lib; { 22 30 homepage = "https://wordpress.org";
+39
pkgs/tools/misc/fw/default.nix
··· 1 + { lib 2 + , rustPlatform 3 + , fetchFromGitHub 4 + , pkg-config 5 + , libgit2 6 + , openssl 7 + , stdenv 8 + , Security 9 + }: 10 + 11 + rustPlatform.buildRustPackage rec { 12 + pname = "fw"; 13 + version = "2.16.1"; 14 + 15 + src = fetchFromGitHub { 16 + owner = "brocode"; 17 + repo = pname; 18 + rev = "v${version}"; 19 + sha256 = "1nhkirjq2q9sxg4k2scy8vxlqa9ikvr5lid0f22vws07vif4kkfs"; 20 + }; 21 + 22 + cargoSha256 = "sha256-iD3SBSny0mYpmVEInYaylHn0AbtIqTOwJHdFeq3UBaM="; 23 + 24 + nativeBuildInputs = [ pkg-config ]; 25 + 26 + buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ 27 + Security 28 + ]; 29 + 30 + OPENSSL_NO_VENDOR = 1; 31 + USER = "nixbld"; 32 + 33 + meta = with lib; { 34 + description = "A workspace productivity booster"; 35 + homepage = "https://github.com/brocode/fw"; 36 + license = licenses.wtfpl; 37 + maintainers = with maintainers; [ figsoda ]; 38 + }; 39 + }
+3 -3
pkgs/tools/misc/macchina/default.nix
··· 3 3 4 4 rustPlatform.buildRustPackage rec { 5 5 pname = "macchina"; 6 - version = "6.1.5"; 6 + version = "6.1.6"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "Macchina-CLI"; 10 10 repo = pname; 11 11 rev = "v${version}"; 12 - sha256 = "sha256-420Ng/LgmcYPH5q0boDaBjlWgLSeySXW/BTOp9+2XgA="; 12 + sha256 = "sha256-0wPMx3IMYhB3XxSsTRqKIsNCGghnRcpwZloHjLxjlMo="; 13 13 }; 14 14 15 - cargoSha256 = "sha256-uRgHKj3EeT1Nq7j5koOovZJTVoVPVeBL8wLogJJoCfU="; 15 + cargoSha256 = "sha256-QaqRIc3eKp7Wy5798wCCA4hk9Twa5Nr1mXTIxf+Hy/Q="; 16 16 17 17 nativeBuildInputs = [ installShellFiles ]; 18 18 buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
+2 -2
pkgs/tools/networking/nebula/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "nebula"; 5 - version = "1.6.0"; 5 + version = "1.6.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "slackhq"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-JUFMcqu24YK1FjaNPkQLOtkyEhvqZPXZyFV+HBAKn5w="; 11 + sha256 = "sha256-IsLSlQsrfw3obkz4jHL23BRQY2fviGbPEvs5j0zkdX0="; 12 12 }; 13 13 14 14 vendorSha256 = "sha256-GvMiOEC3Y/pGG++Z+XCgLVADKymUR9shDxjx3xIz8u0=";
+6 -8
pkgs/tools/networking/zerotierone/default.nix
··· 26 26 in stdenv.mkDerivation { 27 27 inherit pname version src; 28 28 29 - cargoDeps = rustPlatform.fetchCargoTarball { 30 - src = "${src}/zeroidc"; 31 - name = "${pname}-${version}"; 32 - sha256 = "sha256-8K4zAXo85MT4pfIsg7DZAO+snfwzdo2TozVw17KhX4Q="; 33 - }; 34 - postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock"; 35 - 36 29 preConfigure = '' 37 30 patchShebangs ./doc/build.sh 38 31 substituteInPlace ./doc/build.sh \ ··· 41 34 substituteInPlace ./make-linux.mk \ 42 35 --replace '-march=armv6zk' "" \ 43 36 --replace '-mcpu=arm1176jzf-s' "" 37 + 38 + # Upstream does not define the cargo settings necessary to use the vendorized rust-jwt version, so it has to be added manually. 39 + # Can be removed once ZeroTierOne's zeroidc no longer uses a git url in Cargo.toml for jwt 40 + echo '[source."https://github.com/glimberg/rust-jwt"] 41 + git = "https://github.com/glimberg/rust-jwt" 42 + replace-with = "vendored-sources"' >> ./zeroidc/.cargo/config.toml 44 43 ''; 45 44 46 45 nativeBuildInputs = [ 47 46 pkg-config 48 47 ronn 49 - rustPlatform.cargoSetupHook 50 48 rustPlatform.rust.cargo 51 49 rustPlatform.rust.rustc 52 50 ];
+29
pkgs/tools/text/teip/default.nix
··· 1 + { lib, rustPlatform, fetchCrate, installShellFiles, perl }: 2 + 3 + rustPlatform.buildRustPackage rec { 4 + pname = "teip"; 5 + version = "2.0.0"; 6 + 7 + src = fetchCrate { 8 + inherit pname version; 9 + sha256 = "sha256-fME+tS8wcC6mk5FjuDJpFWWhIsiXV4kuybSqj9awFUM="; 10 + }; 11 + 12 + cargoSha256 = "sha256-wrfS+OEYF60nOhtrnmk7HKqVuAJQFaiT0GM+3OoZ3Wk="; 13 + 14 + nativeBuildInputs = [ installShellFiles ]; 15 + 16 + checkInputs = [ perl ]; 17 + 18 + postInstall = '' 19 + installManPage man/teip.1 20 + installShellCompletion --zsh completion/zsh/_teip 21 + ''; 22 + 23 + meta = with lib; { 24 + description = "A tool to bypass a partial range of standard input to any command"; 25 + homepage = "https://github.com/greymd/teip"; 26 + license = licenses.mit; 27 + maintainers = with maintainers; [ figsoda ]; 28 + }; 29 + }
+2 -2
pkgs/tools/virtualization/kubevirt/default.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "kubevirt"; 11 - version = "0.57.0"; 11 + version = "0.57.1"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "kubevirt"; 15 15 repo = "kubevirt"; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-+35z953dgb6lJpC/8+VcrHLY6yXINoDxq6GxkEEVOgU="; 17 + sha256 = "sha256-b832NNAoLYiHfvAm2eWGa8Odlppj8hLKl7jQA09s+4k="; 18 18 }; 19 19 20 20 vendorSha256 = null;
+14
pkgs/top-level/all-packages.nix
··· 1508 1508 1509 1509 fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; 1510 1510 1511 + fw = callPackage ../tools/misc/fw { 1512 + inherit (darwin.apple_sdk.frameworks) Security; 1513 + }; 1514 + 1511 1515 gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; 1512 1516 1513 1517 gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; ··· 2864 2868 apprise = with python3Packages; toPythonApplication apprise; 2865 2869 2866 2870 aptdec = callPackage ../development/libraries/aptdec {}; 2871 + 2872 + argc = callPackage ../development/tools/argc { }; 2867 2873 2868 2874 aria2 = callPackage ../tools/networking/aria2 { 2869 2875 inherit (darwin.apple_sdk.frameworks) Security; ··· 5772 5778 5773 5779 dockbarx = callPackage ../applications/misc/dockbarx { }; 5774 5780 5781 + doctave = callPackage ../applications/misc/doctave { 5782 + inherit (darwin.apple_sdk.frameworks) CoreServices; 5783 + }; 5784 + 5775 5785 dog = callPackage ../tools/system/dog { }; 5776 5786 5777 5787 dogdns = callPackage ../tools/networking/dogdns { ··· 11573 11583 11574 11584 teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { }; 11575 11585 11586 + teip = callPackage ../tools/text/teip { }; 11587 + 11576 11588 telegraf = callPackage ../servers/monitoring/telegraf { }; 11577 11589 11578 11590 teleport = callPackage ../servers/teleport { ··· 16377 16389 }; 16378 16390 16379 16391 dive = callPackage ../development/tools/dive { }; 16392 + 16393 + dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { }; 16380 16394 16381 16395 doclifter = callPackage ../development/tools/misc/doclifter { }; 16382 16396
+2
pkgs/top-level/stage.nix
··· 259 259 crossSystem = { 260 260 isStatic = true; 261 261 parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed; 262 + } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { 263 + gcc.abi = "elfv2"; 262 264 }; 263 265 }); 264 266 };