Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub b4a9badc 31938a3f

+330 -131
+10
maintainers/maintainer-list.nix
··· 822 githubId = 1771266; 823 name = "Vo Anh Duy"; 824 }; 825 anirrudh = { 826 email = "anik597@gmail.com"; 827 github = "anirrudh";
··· 822 githubId = 1771266; 823 name = "Vo Anh Duy"; 824 }; 825 + Anillc = { 826 + name = "Anillc"; 827 + email = "i@anillc.cn"; 828 + github = "Anillc"; 829 + githubId = 23411248; 830 + keys = [{ 831 + longkeyid = "ed25519/0x0BE8A88F47B2145C"; 832 + fingerprint = "6141 1E4F FE10 CE7B 2E14 CD76 0BE8 A88F 47B2 145C"; 833 + }]; 834 + }; 835 anirrudh = { 836 email = "anik597@gmail.com"; 837 github = "anirrudh";
+3 -3
pkgs/applications/graphics/rnote/default.nix
··· 22 23 stdenv.mkDerivation rec { 24 pname = "rnote"; 25 - version = "0.5.0-hotfix-2"; 26 27 src = fetchFromGitHub { 28 owner = "flxzt"; 29 repo = "rnote"; 30 rev = "v${version}"; 31 fetchSubmodules = true; 32 - hash = "sha256-8sv7GQopUbKv8JS1/UXRFeK++UZKk3CJBOzUMx9vZDU="; 33 }; 34 35 cargoDeps = rustPlatform.fetchCargoTarball { 36 inherit src; 37 name = "${pname}-${version}"; 38 - hash = "sha256-N0qsph68FAkwOpyr9QUw0bDQKn7t22Hbz9BYYOs4pCM="; 39 }; 40 41 nativeBuildInputs = [
··· 22 23 stdenv.mkDerivation rec { 24 pname = "rnote"; 25 + version = "0.5.1-hotfix-1"; 26 27 src = fetchFromGitHub { 28 owner = "flxzt"; 29 repo = "rnote"; 30 rev = "v${version}"; 31 fetchSubmodules = true; 32 + hash = "sha256-Oq/RKeKICyImSPr4GSNjPXZWtuRQ7+9nRfl9MmC+UYI="; 33 }; 34 35 cargoDeps = rustPlatform.fetchCargoTarball { 36 inherit src; 37 name = "${pname}-${version}"; 38 + hash = "sha256-gdVy+7xSQVkI84Ta6KLOLR9UUsDoD2Cd0cuNU+OXf2M="; 39 }; 40 41 nativeBuildInputs = [
+34 -33
pkgs/applications/networking/browsers/firefox/wrapper.nix
··· 1 { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config 2 - , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText 3 4 ## various stuff that can be plugged in 5 , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc ··· 176 startupWMClass = wmClass; 177 }; 178 179 - nativeBuildInputs = [ makeWrapper lndir replace jq ]; 180 buildInputs = [ browser.gtk3 ]; 181 182 ··· 206 done 207 208 # fix links and absolute references 209 - cd "${browser}" 210 211 find . -type l -print0 | while read -d $'\0' l; do 212 - target="$(readlink "$l" | replace-literal -es -- "${browser}" "$out")" 213 ln -sfT "$target" "$out/$l" 214 done 215 216 - # This will not patch binaries, only "text" files. 217 - # Its there for the wrapper mostly. 218 - cd "$out" 219 - replace-literal -esfR -- "${browser}" "$out" 220 - 221 # create the wrapper 222 223 executablePrefix="$out/bin" 224 executablePath="$executablePrefix/${applicationName}" 225 226 - if [ ! -x "$executablePath" ] 227 - then 228 - echo "cannot find executable file \`${browser}/bin/${applicationName}'" 229 - exit 1 230 - fi 231 - 232 - if [ ! -L "$executablePath" ] 233 - then 234 - # Careful here, the file at executablePath may already be 235 - # a wrapper. That is why we postfix it with -old instead 236 - # of -wrapped. 237 - oldExe="$executablePrefix"/".${applicationName}"-old 238 mv "$executablePath" "$oldExe" 239 - else 240 - oldExe="$(readlink -v --canonicalize-existing "$executablePath")" 241 - fi 242 - 243 - if [ ! -x "${browser}/bin/${applicationName}" ] 244 - then 245 - echo "cannot find executable file \`${browser}/bin/${applicationName}'" 246 - exit 1 247 fi 248 249 makeWrapper "$oldExe" \ 250 - "$out/bin/${applicationName}${nameSuffix}" \ 251 --prefix LD_LIBRARY_PATH ':' "$libs" \ 252 --suffix-each GTK_PATH ':' "$gtk_modules" \ 253 --prefix PATH ':' "${xdg-utils}/bin" \ ··· 258 --set MOZ_ALLOW_DOWNGRADE 1 \ 259 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ 260 --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ 261 - ${lib.optionalString forceWayland '' 262 - --set MOZ_ENABLE_WAYLAND "1" \ 263 - ''} 264 ############################# 265 # # 266 # END EXTRA PREF CHANGES #
··· 1 { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config 2 + , fetchurl, zip, unzip, jq, xdg-utils, writeText 3 4 ## various stuff that can be plugged in 5 , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc ··· 176 startupWMClass = wmClass; 177 }; 178 179 + nativeBuildInputs = [ makeWrapper lndir jq ]; 180 buildInputs = [ browser.gtk3 ]; 181 182 ··· 206 done 207 208 # fix links and absolute references 209 210 find . -type l -print0 | while read -d $'\0' l; do 211 + target="$(readlink "$l")" 212 + target=''${target/#"${browser}"/"$out"} 213 ln -sfT "$target" "$out/$l" 214 done 215 216 # create the wrapper 217 218 executablePrefix="$out/bin" 219 executablePath="$executablePrefix/${applicationName}" 220 + oldWrapperArgs=() 221 222 + if [[ -L $executablePath ]]; then 223 + # Symbolic link: wrap the link's target. 224 + oldExe="$(readlink -v --canonicalize-existing "$executablePath")" 225 + rm "$executablePath" 226 + elif wrapperCmd=$(strings -dw "$executablePath" | sed -n '/^makeCWrapper/,/^$/ p'); [[ $wrapperCmd ]]; then 227 + # If the executable is a binary wrapper, we need to update its target to 228 + # point to $out, but we can't just edit the binary in-place because of length 229 + # issues. So we extract the command used to create the wrapper and add the 230 + # arguments to our wrapper. 231 + parseMakeCWrapperCall() { 232 + shift # makeCWrapper 233 + oldExe=$1; shift 234 + for arg do case $arg in 235 + --inherit-argv0) oldWrapperArgs+=(--argv0 '$0');; # makeWrapper doesn't understand --inherit-argv0 236 + *) oldWrapperArgs+=("$arg");; 237 + esac done 238 + } 239 + eval "parseMakeCWrapperCall ''${wrapperCmd//"${browser}"/"$out"}" 240 + rm "$executablePath" 241 + else 242 + if read -rn2 shebang < "$executablePath" && [[ $shebang == '#!' ]]; then 243 + # Shell wrapper: patch in place to point to $out. 244 + sed -i "s@${browser}@$out@g" "$executablePath" 245 + fi 246 + # Suffix the executable with -old, because -wrapped might already be used by the old wrapper. 247 + oldExe="$executablePrefix/.${applicationName}"-old 248 mv "$executablePath" "$oldExe" 249 fi 250 251 makeWrapper "$oldExe" \ 252 + "''${executablePath}${nameSuffix}" \ 253 --prefix LD_LIBRARY_PATH ':' "$libs" \ 254 --suffix-each GTK_PATH ':' "$gtk_modules" \ 255 --prefix PATH ':' "${xdg-utils}/bin" \ ··· 260 --set MOZ_ALLOW_DOWNGRADE 1 \ 261 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ 262 --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ 263 + ${lib.optionalString forceWayland "--set MOZ_ENABLE_WAYLAND 1"} \ 264 + "''${oldWrapperArgs[@]}" 265 ############################# 266 # # 267 # END EXTRA PREF CHANGES #
+3 -3
pkgs/data/misc/cldr-annotations/default.nix
··· 1 { lib, fetchzip }: 2 3 let 4 - version = "40.0"; 5 in fetchzip rec { 6 name = "cldr-annotations-${version}"; 7 8 - url = "https://unicode.org/Public/cldr/40/cldr-common-${version}.zip"; 9 10 postFetch = '' 11 mkdir -p $out/share/unicode/cldr 12 unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*' 13 ''; 14 15 - sha256 = "sha256-L4NSMNFYKJWV3qKQhio9eMABtDlLieT9VeMZfzeAkbM="; 16 17 meta = with lib; { 18 description = "Names and keywords for Unicode characters from the Common Locale Data Repository";
··· 1 { lib, fetchzip }: 2 3 let 4 + version = "41.0"; 5 in fetchzip rec { 6 name = "cldr-annotations-${version}"; 7 8 + url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; 9 10 postFetch = '' 11 mkdir -p $out/share/unicode/cldr 12 unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*' 13 ''; 14 15 + sha256 = "sha256-3dHVZGx3FmR97fzhlTSx/xp6YTAV+sMExl6gpLzl1MY="; 16 17 meta = with lib; { 18 description = "Names and keywords for Unicode characters from the Common Locale Data Repository";
+2 -2
pkgs/development/libraries/libyang/default.nix
··· 15 16 stdenv.mkDerivation rec { 17 pname = "libyang"; 18 - version = "2.0.164"; 19 20 src = fetchFromGitHub { 21 owner = "CESNET"; 22 repo = "libyang"; 23 rev = "v${version}"; 24 - sha256 = "sha256-0Ou0j9KaNkX/SFmid+wphvtu3wDTXkw+8xdck6lEE3w="; 25 }; 26 27 nativeBuildInputs = [
··· 15 16 stdenv.mkDerivation rec { 17 pname = "libyang"; 18 + version = "2.0.194"; 19 20 src = fetchFromGitHub { 21 owner = "CESNET"; 22 repo = "libyang"; 23 rev = "v${version}"; 24 + sha256 = "sha256-5dgSBXJIeGXT+jGqT2MFqtsEFcIn+ULjybnyXz+95Gk="; 25 }; 26 27 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/peaqevcore/default.nix
··· 6 7 buildPythonPackage rec { 8 pname = "peaqevcore"; 9 - version = "0.0.22"; 10 format = "setuptools"; 11 12 disabled = pythonOlder "3.7"; 13 14 src = fetchPypi { 15 inherit pname version; 16 - hash = "sha256-ye8evqkOy08wHYohVOpXB2pfPN/vsK9GnPnL/nbVZU0="; 17 }; 18 19 postPatch = ''
··· 6 7 buildPythonPackage rec { 8 pname = "peaqevcore"; 9 + version = "0.0.23"; 10 format = "setuptools"; 11 12 disabled = pythonOlder "3.7"; 13 14 src = fetchPypi { 15 inherit pname version; 16 + hash = "sha256-z59TJ+P7WNMcTyevi4etWUFUnBJXAVhDOnO4GXjjuR0="; 17 }; 18 19 postPatch = ''
+31 -9
pkgs/development/python-modules/py3exiv2/default.nix
··· 1 - { lib, buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }: 2 3 buildPythonPackage rec { 4 pname = "py3exiv2"; 5 - version = "0.9.3"; 6 - disabled = !(isPy3k); 7 8 src = fetchPypi { 9 inherit pname version; 10 - sha256 = "838836e58ca22557d83d1f0ef918bcce899b4c2666340b924b940dcdebf1d18c"; 11 }; 12 13 - buildInputs = [ exiv2 boost ]; 14 15 - # work around python distutils compiling C++ with $CC (see issue #26709) 16 - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; 17 18 meta = with lib; { 19 homepage = "https://launchpad.net/py3exiv2"; 20 - description = "A Python3 binding to the library exiv2"; 21 - license = licenses.gpl3; 22 maintainers = with maintainers; [ vinymeuh ]; 23 platforms = with platforms; linux ++ darwin; 24 };
··· 1 + { lib 2 + , stdenv 3 + , boost 4 + , buildPythonPackage 5 + , exiv2 6 + , fetchPypi 7 + , libcxx 8 + , pythonOlder 9 + }: 10 11 buildPythonPackage rec { 12 pname = "py3exiv2"; 13 + version = "0.11.0"; 14 + format = "setuptools"; 15 + 16 + disabled = pythonOlder "3.7"; 17 18 src = fetchPypi { 19 inherit pname version; 20 + hash = "sha256-ZgDaa4lxmdTaZhkblgRfPMxfVwENp2s6xdKSuD/MqEQ="; 21 }; 22 23 + buildInputs = [ 24 + boost 25 + exiv2 26 + ]; 27 28 + # Work around Python distutils compiling C++ with $CC (see issue #26709) 29 + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ 30 + "-I${lib.getDev libcxx}/include/c++/v1" 31 + ]; 32 + 33 + pythonImportsCheck = [ 34 + "pyexiv2" 35 + ]; 36 + 37 + # Tests are not shipped 38 + doCheck = false; 39 40 meta = with lib; { 41 + description = "Python binding to the library exiv2"; 42 homepage = "https://launchpad.net/py3exiv2"; 43 + license = licenses.gpl3Plus; 44 maintainers = with maintainers; [ vinymeuh ]; 45 platforms = with platforms; linux ++ darwin; 46 };
-1
pkgs/development/python-modules/txaio/default.nix
··· 21 }; 22 23 propagatedBuildInputs = [ 24 - six 25 twisted 26 zope_interface 27 ];
··· 21 }; 22 23 propagatedBuildInputs = [ 24 twisted 25 zope_interface 26 ];
+1 -1
pkgs/development/python-modules/zope_event/default.nix
··· 14 15 meta = with lib; { 16 description = "An event publishing system"; 17 - homepage = "https://pypi.python.org/pypi/zope.event"; 18 license = licenses.zpl20; 19 maintainers = with maintainers; [ goibhniu ]; 20 };
··· 14 15 meta = with lib; { 16 description = "An event publishing system"; 17 + homepage = "https://pypi.org/project/zope.event/"; 18 license = licenses.zpl20; 19 maintainers = with maintainers; [ goibhniu ]; 20 };
+10 -11
pkgs/development/tools/compile-daemon/default.nix
··· 1 - { lib, buildGoPackage, fetchFromGitHub }: 2 3 - buildGoPackage rec { 4 - pname = "compile-daemon-unstable"; 5 - version = "2017-03-08"; 6 - rev = "d447e567232bcb84cedd3b2be012c7127f31f469"; 7 - 8 - goPackagePath = "github.com/githubnemo/CompileDaemon"; 9 10 src = fetchFromGitHub { 11 owner = "githubnemo"; 12 repo = "CompileDaemon"; 13 - inherit rev; 14 - sha256 = "0jfbipp3gd89n6d7gds1qvfkqvz80qdlqqhijxffh8z8ss0xinqc"; 15 }; 16 17 - goDeps = ./deps.nix; 18 19 meta = with lib; { 20 description = "Very simple compile daemon for Go"; 21 license = licenses.bsd2; 22 maintainers = with maintainers; [ ]; 23 mainProgram = "CompileDaemon"; 24 - inherit (src.meta) homepage; 25 }; 26 }
··· 1 + { lib, buildGoModule, fetchFromGitHub }: 2 3 + buildGoModule rec { 4 + pname = "compile-daemon"; 5 + version = "1.4.0"; 6 7 src = fetchFromGitHub { 8 owner = "githubnemo"; 9 repo = "CompileDaemon"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-gpyXy7FO7ZVXJrkzcKHFez4S/dGiijXfZ9eSJtNlm58="; 12 }; 13 14 + vendorSha256 = "sha256-UDPOeg8jQbDB+Fr4x6ehK7UyQa8ySZy6yNxS1xotkgA="; 15 + 16 + ldflags = [ "-s" "-w" ]; 17 18 meta = with lib; { 19 description = "Very simple compile daemon for Go"; 20 + homepage = "https://github.com/githubnemo/CompileDaemon"; 21 license = licenses.bsd2; 22 maintainers = with maintainers; [ ]; 23 mainProgram = "CompileDaemon"; 24 }; 25 }
-48
pkgs/development/tools/compile-daemon/deps.nix
··· 1 - # This file was generated by https://github.com/kamilchm/go2nix v1.2.0-devel 2 - [ 3 - { 4 - goPackagePath = "github.com/fatih/color"; 5 - fetch = { 6 - type = "git"; 7 - url = "https://github.com/fatih/color"; 8 - rev = "9131ab34cf20d2f6d83fdc67168a5430d1c7dc23"; 9 - sha256 = "111x6rhpxfjhwkjrmrirqqh6nc68q5g7air9fl5kgr3bg85hybr5"; 10 - }; 11 - } 12 - { 13 - goPackagePath = "github.com/mattn/go-colorable"; 14 - fetch = { 15 - type = "git"; 16 - url = "https://github.com/mattn/go-colorable"; 17 - rev = "a392f450ea64cee2b268dfaacdc2502b50a22b18"; 18 - sha256 = "1msiq5nb1sdhwfjv65hjnvr2s4pfsp8mv6f5z8aa8n9bjf0cksyc"; 19 - }; 20 - } 21 - { 22 - goPackagePath = "github.com/mattn/go-isatty"; 23 - fetch = { 24 - type = "git"; 25 - url = "https://github.com/mattn/go-isatty"; 26 - rev = "57fdcb988a5c543893cc61bce354a6e24ab70022"; 27 - sha256 = "1fkhmi3nhz6vasfvjzjjwxkbpwsb9hzc0g5h1rygqrnzjykl2r39"; 28 - }; 29 - } 30 - { 31 - goPackagePath = "golang.org/x/sys"; 32 - fetch = { 33 - type = "git"; 34 - url = "https://go.googlesource.com/sys"; 35 - rev = "99f16d856c9836c42d24e7ab64ea72916925fa97"; 36 - sha256 = "0g2x5krfhnraq03v0b48y3xv3ffg92pbgvps0npj9l7wq8q9hkmx"; 37 - }; 38 - } 39 - { 40 - goPackagePath = "gopkg.in/fsnotify.v1"; 41 - fetch = { 42 - type = "git"; 43 - url = "https://gopkg.in/fsnotify.v1"; 44 - rev = "629574ca2a5df945712d3079857300b5e4da0236"; 45 - sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; 46 - }; 47 - } 48 - ]
···
+13 -12
pkgs/development/tools/go-junit-report/default.nix
··· 1 - { lib, buildGoPackage, fetchFromGitHub }: 2 3 - buildGoPackage rec { 4 - pname = "go-junit-report-unstable"; 5 - version = "2018-06-14"; 6 - rev = "385fac0ced9acaae6dc5b39144194008ded00697"; 7 - 8 - goPackagePath = "github.com/jstemmer/go-junit-report"; 9 10 src = fetchFromGitHub { 11 - inherit rev; 12 owner = "jstemmer"; 13 repo = "go-junit-report"; 14 - sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi"; 15 }; 16 17 meta = with lib; { 18 - description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)"; 19 - homepage = "https://${goPackagePath}"; 20 maintainers = with maintainers; [ cryptix ]; 21 - license = licenses.mit; 22 }; 23 }
··· 1 + { lib, buildGoModule, fetchFromGitHub }: 2 3 + buildGoModule rec { 4 + pname = "go-junit-report"; 5 + version = "1.0.0"; 6 7 src = fetchFromGitHub { 8 owner = "jstemmer"; 9 repo = "go-junit-report"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-/ER99EmYrERBjcJeYeV3GBq6lDjACM0loICg41hUuPQ="; 12 }; 13 + 14 + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; 15 + 16 + ldflags = [ "-s" "-w" ]; 17 18 meta = with lib; { 19 + description = "Convert go test output to junit xml"; 20 + homepage = "https://github.com/jstemmer/go-junit-report"; 21 + license = licenses.mit; 22 maintainers = with maintainers; [ cryptix ]; 23 }; 24 }
+3 -3
pkgs/development/tools/rgp/default.nix
··· 19 }: 20 21 let 22 - buildNum = "2022-01-18-884"; 23 in 24 stdenv.mkDerivation rec { 25 pname = "rgp"; 26 - version = "1.12"; 27 28 src = fetchurl { 29 url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; 30 - sha256 = "88ot16N8XtRlDCP+zIaOqG5BuR0OyG/0u1NEXsun/nY="; 31 }; 32 33 nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
··· 19 }: 20 21 let 22 + buildNum = "2022-04-20-920"; 23 in 24 stdenv.mkDerivation rec { 25 pname = "rgp"; 26 + version = "1.13"; 27 28 src = fetchurl { 29 url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; 30 + hash = "sha256-/Z7mSZVAvaTAY9RU7suK/gA0RJIeeLdN6LWiseVq9Js="; 31 }; 32 33 nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
+25
pkgs/servers/telegram-bot-api/default.nix
···
··· 1 + { lib, stdenv, fetchFromGitHub, cmake, gperf, openssl, zlib }: 2 + 3 + stdenv.mkDerivation { 4 + pname = "telegram-bot-api"; 5 + version = "5.7"; 6 + 7 + src = fetchFromGitHub { 8 + repo = "telegram-bot-api"; 9 + owner = "tdlib"; 10 + rev = "c57b04c4c8c4e8d8bb6fdd0bd3bfb5b93b9d8f05"; 11 + sha256 = "sha256-WetzX8GBdwQAnnZjek+W4v+QN1aUFdlvs+Jv6n1B+eY="; 12 + fetchSubmodules = true; 13 + }; 14 + 15 + nativeBuildInputs = [ cmake gperf ]; 16 + buildInputs = [ openssl zlib ]; 17 + 18 + meta = with lib; { 19 + description = "Telegram Bot API server"; 20 + homepage = "https://github.com/tdlib/telegram-bot-api"; 21 + license = licenses.boost; 22 + maintainers = with maintainers; [ Anillc ]; 23 + platforms = platforms.all; 24 + }; 25 + }
+3 -3
pkgs/tools/misc/kak-lsp/default.nix
··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "kak-lsp"; 5 - version = "12.1.0"; 6 7 src = fetchFromGitHub { 8 owner = pname; 9 repo = pname; 10 rev = "v${version}"; 11 - sha256 = "sha256-5sPw95lSbswIUbNIZ4mpA3WeZt7u+a5s4KxkTnN14Sw="; 12 }; 13 14 - cargoSha256 = "sha256-rPsiMeoc8cWUgmqAxdDGrAQdurIH3bzNq5tpocnnegA="; 15 16 buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; 17
··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "kak-lsp"; 5 + version = "12.2.0"; 6 7 src = fetchFromGitHub { 8 owner = pname; 9 repo = pname; 10 rev = "v${version}"; 11 + sha256 = "sha256-Il3eF9bVrAaJkTDPB1DzEjROnJxIAnnk27qdT9qsp1k"; 12 }; 13 14 + cargoSha256 = "sha256-wRjPjCKsvqnJkybNVAdVMgBA9RaviFyCJPv3D5hipSs"; 15 16 buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; 17
+186
pkgs/tools/virtualization/ovftool/default.nix
···
··· 1 + { lib, stdenv, system ? builtins.currentSystem, ovftoolBundles ? {} 2 + , requireFile, buildFHSUserEnv, autoPatchelfHook, makeWrapper, unzip 3 + , glibc, c-ares, libressl, curl, expat, icu60, xercesc, zlib 4 + }: 5 + 6 + let 7 + version = "4.4.1-16812187"; 8 + 9 + # FHS environment required to unpack ovftool on x86. 10 + ovftoolX86Unpacker = buildFHSUserEnv rec { 11 + name = "ovftool-unpacker"; 12 + targetPkgs = pkgs: [ pkgs.bash ]; 13 + multiPkgs = targetPkgs; 14 + runScript = "bash"; 15 + }; 16 + 17 + # unpackPhase for i686 and x86_64 ovftool self-extracting bundles. 18 + ovftoolX86UnpackPhase = '' 19 + runHook preUnpack 20 + # This is a self-extracting shell script and needs a FHS environment to run. 21 + # In reality, it could be doing anything, which is bad for reproducibility. 22 + # Our postUnpack uses nix-hash to verify the hash to prevent problems. 23 + # 24 + # Note that the Arch PKGBUILD at 25 + # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vmware-ovftool 26 + # appears to use xvfb-run - this hasn't been proven necessary so far. 27 + # 28 + cp ${ovftoolSource} ./ovftool.bundle 29 + chmod +x ./ovftool.bundle 30 + ${ovftoolX86Unpacker}/bin/ovftool-unpacker ./ovftool.bundle -x ovftool 31 + rm ovftool.bundle 32 + extracted=ovftool/vmware-ovftool/ 33 + if [ -d "$extracted" ]; then 34 + # Move the directory we care about to ovftool/ 35 + mv "$extracted" . 36 + rm -r ovftool 37 + mv "$(basename -- "$extracted")" ovftool 38 + echo "ovftool extracted successfully" >&2 39 + else 40 + echo "Could not find $extracted - are you sure this is ovftool?" >&2 41 + rm -r ovftool 42 + exit 1 43 + fi 44 + runHook postUnpack 45 + ''; 46 + 47 + # unpackPhase for aarch64 .zip. 48 + ovftoolAarch64UnpackPhase = '' 49 + runHook preUnpack 50 + unzip ${ovftoolSource} 51 + extracted=ovftool/ 52 + if [ -d "$extracted" ]; then 53 + echo "ovftool extracted successfully" >&2 54 + else 55 + echo "Could not find $extracted - are you sure this is ovftool?" >&2 56 + exit 1 57 + fi 58 + runHook postUnpack 59 + ''; 60 + 61 + # When the version is bumped, postUnpackHash will change 62 + # for all these supported systems. Update it from the printed error on build. 63 + # 64 + # This is just a sanity check, since ovftool is a self-extracting bundle 65 + # that could be doing absolutely anything on 2/3 of the supported platforms. 66 + ovftoolSystems = { 67 + "i686-linux" = { 68 + filename = "VMware-ovftool-${version}-lin.i386.bundle"; 69 + sha256 = "0gx78g3s77mmpir7jbiskna10i6262ihal1ywivlb6xxxxbhqzwj"; 70 + unpackPhase = ovftoolX86UnpackPhase; 71 + postUnpackHash = "1k8rp8ywhs0cl9aad37v1p0493bdvkxrsvwg5pgv2bhvjs4hqk7n"; 72 + }; 73 + "x86_64-linux" = { 74 + filename = "VMware-ovftool-${version}-lin.x86_64.bundle"; 75 + sha256 = "1kp2bp4d9i8y7q25yqff2bn62mh292lws7b66lyn8ka9b35kvnzc"; 76 + unpackPhase = ovftoolX86UnpackPhase; 77 + postUnpackHash = "0zvyakwi4iishqxxisihgh91bmdsfvj5vchm2c192hia03a143py"; 78 + }; 79 + "aarch64-linux" = { 80 + filename = "VMware-ovftool-${version}-lin.aarch64.zip"; 81 + sha256 = "0all8bwv5p5adnzqvrly6nzmxmfpywvlbfr0finr4n100yv0v1xy"; 82 + unpackPhase = ovftoolAarch64UnpackPhase; 83 + postUnpackHash = "16vyyzrmryi8b7mrd6nxnhywvvj2pw0ban4qfiqfahw763fn6971"; 84 + }; 85 + }; 86 + 87 + ovftoolSystem = if builtins.hasAttr system ovftoolSystems then 88 + ovftoolSystems.${system} 89 + else throw "System '${system}' is unsupported by ovftool"; 90 + 91 + ovftoolSource = if builtins.hasAttr system ovftoolBundles then 92 + ovftoolBundles.${system} 93 + else 94 + requireFile { 95 + name = ovftoolSystem.filename; 96 + url = "https://my.vmware.com/group/vmware/downloads/get-download?downloadGroup=OVFTOOL441"; 97 + sha256 = ovftoolSystem.sha256; 98 + }; 99 + in 100 + stdenv.mkDerivation rec { 101 + pname = "ovftool"; 102 + inherit version; 103 + 104 + src = ovftoolSource; 105 + 106 + buildInputs = [ 107 + glibc 108 + libressl 109 + c-ares 110 + (curl.override { openssl = libressl; }) 111 + expat 112 + icu60 113 + xercesc 114 + zlib 115 + ]; 116 + 117 + nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ]; 118 + 119 + sourceRoot = "."; 120 + 121 + unpackPhase = ovftoolSystem.unpackPhase; 122 + 123 + postUnpackHash = ovftoolSystem.postUnpackHash; 124 + 125 + # Expects a directory named 'ovftool' containing the ovftool install. 126 + # Based on https://aur.archlinux.org/packages/vmware-ovftool/ 127 + # with the addition of a libexec directory and a Nix-style binary wrapper. 128 + installPhase = '' 129 + runHook preInstall 130 + if [ -d ovftool ]; then 131 + # Ensure we're in the staging directory 132 + cd ovftool 133 + fi 134 + # libraries 135 + install -m 755 -d "$out/lib/${pname}" 136 + # These all appear to be VMWare proprietary except for libgoogleurl. 137 + # The rest of the libraries that the installer extracts are omitted here, 138 + # and provided in buildInputs. 139 + # 140 + # FIXME: can we replace libgoogleurl? Possibly from Chromium? 141 + # 142 + install -m 644 -t "$out/lib/${pname}" \ 143 + libgoogleurl.so.59 \ 144 + libssoclient.so \ 145 + libvim-types.so libvmacore.so libvmomi.so 146 + # ovftool specifically wants 1.0.2 but our libcrypto is named 1.0.0 147 + ln -s "${lib.getLib libressl}/lib/libcrypto.so" \ 148 + "$out/lib/${pname}/libcrypto.so.1.0.2" 149 + ln -s "${lib.getLib libressl}/lib/libssl.so" \ 150 + "$out/lib/${pname}/libssl.so.1.0.2" 151 + # libexec 152 + install -m 755 -d "$out/libexec/${pname}" 153 + install -m 755 -t "$out/libexec/${pname}" ovftool.bin 154 + install -m 644 -t "$out/libexec/${pname}" icudt44l.dat 155 + # libexec resources 156 + for subdir in "certs" "env" "env/en" "schemas/DMTF" "schemas/vmware"; do 157 + install -m 755 -d "$out/libexec/${pname}/$subdir" 158 + install -m 644 -t "$out/libexec/${pname}/$subdir" "$subdir"/*.* 159 + done 160 + # EULA/OSS files 161 + install -m 755 -d "$out/share/licenses/${pname}" 162 + install -m 644 -t "$out/share/licenses/${pname}" \ 163 + "vmware.eula" "vmware-eula.rtf" "open_source_licenses.txt" 164 + # documentation files 165 + install -m 755 -d "$out/share/doc/${pname}" 166 + install -m 644 -t "$out/share/doc/${pname}" "README.txt" 167 + # binary wrapper; note that LC_CTYPE is defaulted to en_US.UTF-8 by 168 + # VMWare's wrapper script. We use C.UTF-8 instead. 169 + install -m 755 -d "$out/bin" 170 + makeWrapper "$out/libexec/${pname}/ovftool.bin" "$out/bin/ovftool" \ 171 + --set-default LC_CTYPE C.UTF-8 \ 172 + --prefix LD_LIBRARY_PATH : "$out/lib" 173 + runHook postInstall 174 + ''; 175 + 176 + preFixup = '' 177 + addAutoPatchelfSearchPath "$out/lib" 178 + ''; 179 + 180 + meta = with lib; { 181 + description = "VMWare tools for working with OVF, OVA, and VMX images"; 182 + license = licenses.unfree; 183 + maintainers = with maintainers; [ numinit wolfangaukang ]; 184 + platforms = builtins.attrNames ovftoolSystems; 185 + }; 186 + }
+4
pkgs/top-level/all-packages.nix
··· 9101 9102 otpw = callPackage ../os-specific/linux/otpw { }; 9103 9104 overcommit = callPackage ../development/tools/overcommit { }; 9105 9106 overmind = callPackage ../applications/misc/overmind { }; ··· 29870 tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { 29871 abseil-cpp = abseil-cpp_202111; 29872 }; 29873 29874 tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; 29875
··· 9101 9102 otpw = callPackage ../os-specific/linux/otpw { }; 9103 9104 + ovftool = callPackage ../tools/virtualization/ovftool { }; 9105 + 9106 overcommit = callPackage ../development/tools/overcommit { }; 9107 9108 overmind = callPackage ../applications/misc/overmind { }; ··· 29872 tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { 29873 abseil-cpp = abseil-cpp_202111; 29874 }; 29875 + 29876 + telegram-bot-api = callPackage ../servers/telegram-bot-api { }; 29877 29878 tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; 29879