diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-22 21:20:32 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-22 21:20:32 +0200 |
commit | 3e01d383eed06fd4d86ea9385a2795000baab80c (patch) | |
tree | 5d801faa946b7116ac69e865f90ef1623e7cb7d8 /pkgs/applications | |
parent | e22e6d763a2dd6c73131820a0fbff817d393d7a4 (diff) | |
parent | d13fc932cd213b2f7d50094fdcf7ef9b2e8439ab (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications')
33 files changed, 411 insertions, 218 deletions
diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index fe39b955a281..f8988af683d1 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.8.0.0"; + version = "1.9.0.1"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "BCHunlimited${version}"; - sha256 = "01qi15li5x9fvhsmvx7ai5fz6yzqqd3r9yv7081h75jn0nxai49q"; + sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c"; }; nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index c55d78b0176b..45cecf7e9fb8 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.24"; + version = "0.8.25"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "15q5scajxrf82k8nxysah8cs3yl2p09xzzwlkxvjkcn08r3zhig6"; + sha256 = "1jdklmysr25rlwgx7pz0jw66j1w60h98kqghzjhr90zhynzh39lz"; }; - cargoSha256 = "0qp20g5c15qzp2n1nzwqbnn2wx6c905vh652nvkm7sb1d901iiqi"; + cargoSha256 = "08yfafrspkd1g1mhlfwngbknkxjkyymbcga8n2rdsk7mz0hm0vgy"; cargoPatches = [ ./substrate-wasm-builder-runner.patch ]; @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; license = licenses.gpl3; - maintainers = with maintainers; [ akru andresilva ]; + maintainers = with maintainers; [ akru andresilva RaghavSood ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 9f55975764fa..a3cad7d9f2e7 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calcurse"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; - sha256 = "0hzhdpkkn75jlymanwzl69hrrf1pw29hrchr11wlxqjpl43h62gs"; + sha256 = "0dc4bka2l9z03bnlygsnl06l1zi2wbn29rkc02b13x2kdab7arpg"; }; buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 7cf89a74e100..de1dacd50c2e 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "04jidibf0b80c5vd659pz2wibmggjyyj9yz2bw7j4g84hwraksxb"; + sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 31e919e37706..d042f011bb78 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -28,11 +28,11 @@ mkDerivation rec { pname = "kdeconnect"; - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz"; - sha256 = "0s76djgpx08jfmh99c7kx18mnr3w7bv4hdra120nicq89mmy7gwf"; + sha256 = "0rzfnkgkv759d4pa16qk0sw87wqzwgkd99yzrzfy2zcq423f6hvd"; }; patches = [ diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 514ac859c776..366b3866dfd5 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -13,132 +13,147 @@ self: super: let in { inherit buildPlugin; - # Deprecated alias - m3d-fio = self.m33-fio; # added 2016-08-13 + abl-expert = buildPlugin rec { + pname = "ABL_Expert"; + version = "0.6"; - m33-fio = buildPlugin rec { - pname = "M33-Fio"; - version = "1.21"; + src = fetchgit { + url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + rev = version; + sha256 = "0ij3rvdwya1sbymwm5swlh2j4jagb6fal945g88zrzh5xf26hzjh"; + }; - src = fetchFromGitHub { - owner = "donovan6000"; - repo = "M33-Fio"; - rev = "V${version}"; - sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; + meta = with stdenv.lib; { + description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; + homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; }; + }; - patches = [ - ./m33-fio-one-library.patch - ]; + bedlevelvisualizer = buildPlugin rec { + pname = "BedLevelVisualizer"; + version = "0.1.15"; - postPatch = '' - rm -rf octoprint_m33fio/static/libraries/* - ( - cd 'shared library source' - make - ) - ''; + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1bq39fnarnpk8phxfbpx6l4n9anf358z1cgid5r89nadmn2a0cny"; + }; + + propagatedBuildInputs = with super; [ numpy ]; meta = with stdenv.lib; { - description = "OctoPrint plugin for the Micro 3D printer"; - homepage = "https://github.com/donovan6000/M33-Fio"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; + description = "Displays 3D mesh of bed topography report"; + homepage = "https://github.com/jneilliii/OctoPrint-BedLevelVisualizer"; + license = licenses.agpl3; + maintainers = with maintainers; [ lovesegfault ]; }; }; - mqtt = buildPlugin rec { - pname = "MQTT"; - version = "0.8.6"; + curaenginelegacy = buildPlugin rec { + pname = "CuraEngineLegacy"; + version = "1.1.1"; src = fetchFromGitHub { owner = "OctoPrint"; - repo = "OctoPrint-MQTT"; + repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; + sha256 = "1a7pxlmj1a7blkv97sn1k390pbjcxx2860011pbjcdnli74zpvv5"; }; - propagatedBuildInputs = with super; [ paho-mqtt ]; - meta = with stdenv.lib; { - description = "Publish printer status MQTT"; - homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; + description = "Plugin for slicing via Cura Legacy from within OctoPrint"; + homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; license = licenses.agpl3; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ gebner ]; }; }; - titlestatus = buildPlugin rec { - pname = "TitleStatus"; - version = "0.0.4"; + displaylayerprogress = buildPlugin rec { + pname = "OctoPrint-DisplayLayerProgress"; + version = "1.24.0"; src = fetchFromGitHub { - owner = "MoonshineSG"; - repo = "OctoPrint-TitleStatus"; + owner = "OllisGit"; + repo = pname; rev = version; - sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; + sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; }; meta = with stdenv.lib; { - description = "Show printers status in window title"; - homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; + description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; + homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ j0hax ]; }; }; - stlviewer = buildPlugin rec { - pname = "STLViewer"; - version = "0.4.2"; + gcodeeditor = buildPlugin rec { + pname = "GcodeEditor"; + version = "0.2.9"; src = fetchFromGitHub { - owner = "jneilliii"; - repo = "OctoPrint-STLViewer"; + owner = "ieatacid"; + repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + sha256 = "1yjj9lmxbzmzrn7gahw9lj7554fphalbjjp8ns0rr9py3rshwxkm"; }; meta = with stdenv.lib; { - description = "A simple stl viewer tab for OctoPrint"; - homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; + description = "Edit gcode on OctoPrint"; + homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ WhittlesJr ]; }; }; - curaenginelegacy = buildPlugin rec { - pname = "CuraEngineLegacy"; - version = "1.0.2"; + mqtt = buildPlugin rec { + pname = "MQTT"; + version = "0.8.7"; src = fetchFromGitHub { owner = "OctoPrint"; - repo = "OctoPrint-${pname}"; + repo = "OctoPrint-MQTT"; rev = version; - sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; + sha256 = "0k82h7wafbcqdvk5wjw4dp9lydwszfj1lf8vvymwbqdn7pf5h0dy"; }; + propagatedBuildInputs = with super; [ paho-mqtt ]; + meta = with stdenv.lib; { - description = "Plugin for slicing via Cura Legacy from within OctoPrint"; - homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; + description = "Publish printer status MQTT"; + homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ peterhoeg ]; }; }; - touchui = buildPlugin rec { - pname = "TouchUI"; - version = "0.3.14"; + printtimegenius = buildPlugin rec { + pname = "PrintTimeGenius"; + version = "2.2.6"; src = fetchFromGitHub { - owner = "BillyBlaze"; + owner = "eyal0"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "033b9nk3kpnmjw9nggcaxy39hcgfviykcy2cx0j6m411agvmqbzf"; + sha256 = "04zfgd3x3lbriyzwhpqnwdcfdm19fsqgsb7l2ix5d0ssmqxwg2r6"; }; + preConfigure = '' + # PrintTimeGenius ships with marlin-calc binaries for multiple architectures + rm */analyzers/marlin-calc* + sed 's@"{}.{}".format(binary_base_name, machine)@"${pkgs.marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py + ''; + + patches = [ + ./printtimegenius-logging.patch + ]; + meta = with stdenv.lib; { - description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; - homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + description = "Better print time estimation for OctoPrint"; + homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; license = licenses.agpl3; maintainers = with maintainers; [ gebner ]; }; @@ -168,107 +183,98 @@ in { }; }; - printtimegenius = buildPlugin rec { - pname = "PrintTimeGenius"; - version = "2.2.1"; + simpleemergencystop = buildPlugin rec { + pname = "SimpleEmergencyStop"; + version = "1.0.3"; src = fetchFromGitHub { - owner = "eyal0"; + owner = "Sebclem"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; + sha256 = "0hhh5grmn32abkix1b9fr1d0pcpdi2r066iypcxdxcza9qzwjiyi"; }; - preConfigure = '' - # PrintTimeGenius ships with marlin-calc binaries for multiple architectures - rm */analyzers/marlin-calc* - sed 's@"{}.{}".format(binary_base_name, machine)@"${pkgs.marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py - ''; - - patches = [ - ./printtimegenius-logging.patch - ]; - meta = with stdenv.lib; { - description = "Better print time estimation for OctoPrint"; - homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; + description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; + homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ WhittlesJr ]; }; }; - abl-expert = buildPlugin rec { - pname = "ABL_Expert"; - version = "2019-12-21"; + stlviewer = buildPlugin rec { + pname = "STLViewer"; + version = "0.4.2"; - src = fetchgit { - url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; - sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-STLViewer"; + rev = version; + sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; }; meta = with stdenv.lib; { - description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; - homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + description = "A simple stl viewer tab for OctoPrint"; + homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; + maintainers = with maintainers; [ abbradar ]; }; }; - gcodeeditor = buildPlugin rec { - pname = "GcodeEditor"; - version = "0.2.6"; + themeify = buildPlugin rec { + pname = "Themeify"; + version = "1.2.2"; src = fetchFromGitHub { - owner = "ieatacid"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; + owner = "Birkbjo"; + repo = "Octoprint-${pname}"; + rev = "v${version}"; + sha256 = "0j1qs6kyh947npdy7pqda25fjkqinpas3sy0qyscqlxi558lhvx2"; }; meta = with stdenv.lib; { - description = "Edit gcode on OctoPrint"; - homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + description = "Beautiful themes for OctoPrint"; + homepage = "https://github.com/birkbjo/OctoPrint-Themeify"; license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; + maintainers = with maintainers; [ lovesegfault ]; }; }; - simpleemergencystop = buildPlugin rec { - pname = "SimpleEmergencyStop"; - version = "0.2.5"; + titlestatus = buildPlugin rec { + pname = "TitleStatus"; + version = "0.0.5"; src = fetchFromGitHub { - owner = "Sebclem"; - repo = "OctoPrint-${pname}"; + owner = "MoonshineSG"; + repo = "OctoPrint-TitleStatus"; rev = version; - sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; + sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6"; }; meta = with stdenv.lib; { - description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; - homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; + description = "Show printers status in window title"; + homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; + maintainers = with maintainers; [ abbradar ]; }; }; - displaylayerprogress = buildPlugin rec { - pname = "OctoPrint-DisplayLayerProgress"; - version = "1.24.0"; + touchui = buildPlugin rec { + pname = "TouchUI"; + version = "0.3.16"; src = fetchFromGitHub { - owner = "OllisGit"; - repo = pname; + owner = "BillyBlaze"; + repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; + sha256 = "1jlqjirc4ygl4k7jp93l2h6b18jap3mzz8sf2g61j9w0kgv9l365"; }; meta = with stdenv.lib; { - description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; - homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; + description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; + homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; license = licenses.agpl3; - maintainers = with maintainers; [ j0hax ]; + maintainers = with maintainers; [ gebner ]; }; }; @@ -293,13 +299,13 @@ in { octoprint-dashboard = buildPlugin rec { pname = "OctoPrint-Dashboard"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "StefanCohen"; repo = pname; rev = version; - sha256 = "1psk069g8xdpgbzmna51dh978vrildh33dn7kbbi5y31ry5c3gx6"; + sha256 = "0p94jwd7kagh3sixhcrqmsgbay4aaf9l1pgyi2b45jym8pvld5n4"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index fc86b2e885de..496340e0d753 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "polar-bookshelf"; - version = "1.13.10"; + version = "2.0.42"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { - url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "1bxcyf6n2m5x1z8ic6kzskinyyc6lh6nj0bycbwc524n6ms5j99p"; + url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-desktop-app-${version}-amd64.deb"; + hash = "sha256-JyO71wyE6b0iHAYs/6/WbG+OdUVUUPpJla+ZUzg0Gng="; }; buildInputs = [ @@ -64,16 +64,15 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/lib - mv opt/Polar\ Bookshelf/* $out/share/polar-bookshelf + mv opt/Polar/* $out/share/polar-bookshelf mv $out/share/polar-bookshelf/*.so $out/lib mv usr/share/* $out/share/ - ln -s $out/share/polar-bookshelf/polar-bookshelf $out/bin/polar-bookshelf + ln -s $out/share/polar-bookshelf/polar-desktop-app $out/bin/polar-desktop-app - # Correct desktop file `Exec` - substituteInPlace $out/share/applications/polar-bookshelf.desktop \ - --replace "/opt/Polar Bookshelf/polar-bookshelf" "$out/bin/polar-bookshelf" + substituteInPlace $out/share/applications/polar-desktop-app.desktop \ + --replace "/opt/Polar/polar-desktop-app" "$out/bin/polar-desktop-app" ''; preFixup = '' diff --git a/pkgs/applications/misc/wayst/default.nix b/pkgs/applications/misc/wayst/default.nix new file mode 100644 index 000000000000..99ee326aebf2 --- /dev/null +++ b/pkgs/applications/misc/wayst/default.nix @@ -0,0 +1,91 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkgconfig +, freetype +, fontconfig +, libGL +, libX11 +, libXrandr +, libxcb +, libxkbcommon +, utf8proc +, wayland + +, libnotify +, xdg_utils +, makeDesktopItem +}: + +let + desktopItem = makeDesktopItem { + desktopName = "Wayst"; + name = "wayst"; + exec = "wayst"; + icon = "wayst"; + terminal = "false"; + categories = "System;TerminalEmulator"; + comment = "A simple terminal emulator"; + extraEntries = '' + GenericName=Terminal + Keywords=wayst;terminal; + ''; + }; +in +stdenv.mkDerivation rec { + pname = "wayst"; + version = "unstable-2020-10-12"; + + src = fetchFromGitHub { + owner = "91861"; + repo = pname; + rev = "b8c7ca00a785a748026ed1ba08bf3d19916ced18"; + hash = "sha256-wHAU1yxukxApzhLLLctZ/AYqF7t21HQc5omPBZyxra0="; + }; + + makeFlags = [ "INSTALL_DIR=\${out}/bin" ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + fontconfig + libX11 + freetype + libGL + libxcb + libxkbcommon + libXrandr + utf8proc + wayland + ]; + + # This patch forces the Makefile to use utf8proc + # The makefile relies on ldconfig to find the utf8proc libraries + # which is not possible on nixpkgs + patches = [ ./utf8proc.patch ]; + + postPatch = '' + substituteInPlace src/settings.c \ + --replace xdg-open ${xdg_utils}/bin/xdg-open + substituteInPlace src/main.c \ + --replace notify-send ${libnotify}/bin/notify-send + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + postInstall = '' + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications + install -D icons/wayst.svg $out/share/icons/hicolor/scalable/apps/wayst.svg + ''; + + meta = with lib; { + description = "A simple terminal emulator"; + homepage = "https://github.com/91861/wayst"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ berbiche ]; + }; +} diff --git a/pkgs/applications/misc/wayst/utf8proc.patch b/pkgs/applications/misc/wayst/utf8proc.patch new file mode 100644 index 000000000000..0923c5dbe18d --- /dev/null +++ b/pkgs/applications/misc/wayst/utf8proc.patch @@ -0,0 +1,24 @@ +commit caa5a6bed31937f2d1b322da204e11eae57a720f +Author: Nicolas Berbiche <nicolas@normie.dev> +Date: Tue Oct 20 18:14:44 2020 -0400 + + PATCH: use nixpkgs utf8proc + + This patch forces the Makefile to use utf8proc from `buildInputs`. + The Makefile relies on ldconfig to find the utf8proc libraries, + which is not possible with nixpkgs. + +diff --git a/Makefile b/Makefile +index caccdf7..90b11ea 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ else + LDFLAGS = -O2 -flto + endif + +-ifeq ($(shell ldconfig -p | grep libutf8proc.so > /dev/null || echo fail),fail) ++ifeq (false,fail) + $(info libutf8proc not found. Support for language-specific combining characters and unicode normalization will be disabled.) + CFLAGS += -DNOUTF8PROC + else + diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ed5a8a715564..4341a419142c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -319,15 +319,8 @@ let NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; buildPhase = let - # Build paralelism: on Hydra the build was frequently running into memory - # exhaustion, and even other users might be running into similar issues. - # -j is halved to avoid memory problems, and -l is slightly increased - # so that the build gets slight preference before others - # (it will often be on "critical path" and at risk of timing out) buildCommand = target: '' - ninja -C "${buildPath}" \ - -j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \ - "${target}" + ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}" ( source chrome/installer/linux/common/installer.include PACKAGE=$packageName diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 7523a6653f24..8a8bce3a194a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-i |