commit cb91ac99e0c8b110f6ad60acd56925616341c6b6 · pyrox.dev/nixpkgs

-2

pkgs/applications/misc/cherrytree/default.nix

···

       13
       13
        
       , sqlite

     

       14
       14
        
       , curl

     

       15
       15
        
       , libuchardet

     

       16
       16
       -
       , fmt

     

       17
       16
        
       , spdlog

     

       18
       17
        
       }:

     

       19
       18
        
       

     
···

       44
       43
        
           sqlite

     

       45
       44
        
           curl

     

       46
       45
        
           libuchardet

     

       47
       47
       -
           fmt

     

       48
       46
        
           spdlog

     

       49
       47
        
         ];

     

       50
       48

+2 -2

pkgs/applications/misc/far2l/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash

     

       2
       2
        
       , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick

     

       3
       3
       -
       , libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }:

     

       3
       3
       +
       , libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "far2l";

     
···

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build

     

       18
       18
       +
         buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build

     

       19
       19
        
           ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats

     

       20
       20
        
           #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below

     

       21
       21

+1 -2

pkgs/applications/misc/waybar/default.nix

···

       10
       10
        
       , gtkmm3

     

       11
       11
        
       , libsigcxx

     

       12
       12
        
       , jsoncpp

     

       13
       13
       -
       , fmt

     

       14
       13
        
       , scdoc

     

       15
       14
        
       , spdlog

     

       16
       15
        
       , gtk-layer-shell

     
···

       51
       50
        
         strictDeps = false;

     

       52
       51
        
       

     

       53
       52
        
         buildInputs = with lib;

     

       54
       54
       -
           [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]

     

       53
       53
       +
           [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]

     

       55
       54
        
           ++ optional  traySupport  libdbusmenu-gtk3

     

       56
       55
        
           ++ optional  pulseSupport libpulseaudio

     

       57
       56
        
           ++ optional  sndioSupport sndio

-2

pkgs/applications/networking/instant-messengers/nheko/default.nix

···

       18
       18
        
       , mtxclient

     

       19
       19
        
       , boost17x

     

       20
       20
        
       , spdlog

     

       21
       21
       -
       , fmt

     

       22
       21
        
       , olm

     

       23
       22
        
       , pkg-config

     

       24
       23
        
       , nlohmann_json

     
···

       52
       51
        
           libsecret

     

       53
       52
        
           lmdb

     

       54
       53
        
           spdlog

     

       55
       55
       -
           fmt

     

       56
       54
        
           cmark

     

       57
       55
        
           qtbase

     

       58
       56
        
           qtmultimedia

+4 -9

pkgs/applications/networking/irc/tiny/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "tiny";

     

       13
       13
       -
         version = "0.9.0";

     

       13
       13
       +
         version = "0.10.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "osa1";

     

       17
       17
        
           repo = pname;

     

       18
       18
        
           rev = "v${version}";

     

       19
       19
       -
           sha256 = "gKyHR3FZHDybaP38rqB8/gvr8T+mDO4QQxoTtWS+TlE=";

     

       19
       19
       +
           sha256 = "177d1x4z0mh0p7c5ldq70cn1j3pac50d8cil2ni50hl49c3x6yy1";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoSha256 = "0ChfW8vaqC2kCp4lpS0HOvhuihPw9G5TOmgwKzVDfws=";

     

       23
       23
       -
       

     

       24
       24
       -
         # Fix Cargo.lock version. Remove with the next release.

     

       25
       25
       -
         cargoPatches = [

     

       26
       26
       -
           ./fix-Cargo.lock.patch

     

       27
       27
       -
         ];

     

       22
       22
       +
         cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1";

     

       28
       23
        
       

     

       29
       24
        
         cargoBuildFlags = lib.optionals stdenv.isLinux [ "--features=desktop-notifications" ];

     

       30
       25
        
       

     
···

       34
       29
        
         meta = with lib; {

     

       35
       30
        
           description = "A console IRC client";

     

       36
       31
        
           homepage = "https://github.com/osa1/tiny";

     

       37
       37
       -
           changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md";

     

       32
       32
       +
           changelog = "https://github.com/osa1/tiny/raw/v${version}/CHANGELOG.md";

     

       38
       33
        
           license = licenses.mit;

     

       39
       34
        
           maintainers = with maintainers; [ Br1ght0ne vyp ];

     

       40
       35
        
         };

-13

pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch

···

       1
       1
       -
       diff --git a/Cargo.lock b/Cargo.lock

     

       2
       2
       -
       index 3a184dc..0e58cb1 100644

     

       3
       3
       -
       --- a/Cargo.lock

     

       4
       4
       -
       +++ b/Cargo.lock

     

       5
       5
       -
       @@ -1023,7 +1023,7 @@ dependencies = [

     

       6
       6
       -
        

     

       7
       7
       -
        [[package]]

     

       8
       8
       -
        name = "tiny"

     

       9
       9
       -
       -version = "0.8.0"

     

       10
       10
       -
       +version = "0.9.0"

     

       11
       11
       -
        dependencies = [

     

       12
       12
       -
         "clap",

     

       13
       13
       -
         "dirs 3.0.1",

+2 -2

pkgs/applications/networking/mailreaders/notmuch/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "notmuch";

     

       14
       14
       -
         version = "0.34";

     

       14
       14
       +
         version = "0.34.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";

     

       18
       18
       -
           sha256 = "1dk16xa9q7adp1jaswxvw4p92f4h5mg0zkrh3zv8gqxn88amisc3";

     

       18
       18
       +
           sha256 = "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages

     

       2
       2
        
       , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook

     

       3
       3
       -
       , fmt, graphviz, llvmPackages, z3

     

       3
       3
       +
       , graphviz, llvmPackages, z3

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ cmake ninja pkg-config ];

     

       25
       25
       -
         buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook z3 ]

     

       25
       25
       +
         buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ]

     

       26
       26
        
           ++ (with python3Packages; [ python pybind11 ])

     

       27
       27
        
           ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;

     

       28
       28

+1 -2

pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "vowpal-wabbit";

     
···

       16
       16
        
         buildInputs = [

     

       17
       17
        
           boost

     

       18
       18
        
           flatbuffers

     

       19
       19
       -
           fmt

     

       20
       19
        
           rapidjson

     

       21
       20
        
           spdlog

     

       22
       21
        
           zlib

+2 -2

pkgs/applications/video/kodi/unwrapped.nix

···

       16
       16
        
       , libcec, libcec_platform, dcadec, libuuid

     

       17
       17
        
       , libcrossguid, libmicrohttpd

     

       18
       18
        
       , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1

     

       19
       19
       -
       , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson

     

       19
       19
       +
       , libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson

     

       20
       20
        
       , lirc

     

       21
       21
        
       , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp

     

       22
       22
        
       , dbusSupport ? true, dbus

     
···

       125
       125
        
             libgcrypt libgpg-error libunistring

     

       126
       126
        
             libcrossguid libplist

     

       127
       127
        
             bluez giflib glib harfbuzz lcms2 libpthreadstubs

     

       128
       128
       -
             ffmpeg flatbuffers fmt fstrcmp rapidjson

     

       128
       128
       +
             ffmpeg flatbuffers fstrcmp rapidjson

     

       129
       129
        
             lirc

     

       130
       130
        
             mesa # for libEGL

     

       131
       131
        
           ]

+68

pkgs/data/themes/ayu-theme-gtk/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , autoreconfHook

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , gnome

     

       5
       5
       +
       , gtk-engine-murrine

     

       6
       6
       +
       , gtk3

     

       7
       7
       +
       , inkscape

     

       8
       8
       +
       , lib

     

       9
       9
       +
       , optipng

     

       10
       10
       +
       , pkg-config

     

       11
       11
       +
       , sassc

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       stdenv.mkDerivation rec {

     

       15
       15
       +
         pname = "ayu-theme-gtk";

     

       16
       16
       +
         version = "unstable-2017-05-12";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "dnordstrom";

     

       20
       20
       +
           repo = "ayu-theme";

     

       21
       21
       +
           rev = "cc6f3d3b72897c304e2f00afcaf51df863155e35";

     

       22
       22
       +
           sha256 = "sha256-1EhTfPhYl+4IootTCCE04y6V7nW1/eWdHarfF7/j1U0=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         postPatch = ''

     

       26
       26
       +
           ln -sn 3.20 common/gtk-3.0/3.24

     

       27
       27
       +
           ln -sn 3.18 common/gnome-shell/3.24

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         nativeBuildInputs = [

     

       31
       31
       +
           autoreconfHook

     

       32
       32
       +
           gtk3

     

       33
       33
       +
           inkscape

     

       34
       34
       +
           optipng

     

       35
       35
       +
           pkg-config

     

       36
       36
       +
           sassc

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         propagatedUserEnvPkgs = [

     

       40
       40
       +
           gnome.gnome-themes-extra

     

       41
       41
       +
           gtk-engine-murrine

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         enableParallelBuilding = true;

     

       45
       45
       +
       

     

       46
       46
       +
         preBuild = ''

     

       47
       47
       +
           # Shut up inkscape's warnings about creating profile directory

     

       48
       48
       +
           export HOME="$NIX_BUILD_ROOT"

     

       49
       49
       +
         '';

     

       50
       50
       +
       

     

       51
       51
       +
         configureFlags = [

     

       52
       52
       +
           "--with-gnome-shell=${gnome.gnome-shell.version}"

     

       53
       53
       +
           "--disable-unity"

     

       54
       54
       +
         ];

     

       55
       55
       +
       

     

       56
       56
       +
         postInstall = ''

     

       57
       57
       +
           install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md

     

       58
       58
       +
         '';

     

       59
       59
       +
       

     

       60
       60
       +
         meta = with lib; {

     

       61
       61
       +
           description = "Ayu colored GTK and Kvantum themes based on Arc";

     

       62
       62
       +
           homepage = "https://github.com/dnordstrom/ayu-theme/";

     

       63
       63
       +
           license = licenses.gpl3;

     

       64
       64
       +
           platforms = platforms.linux;

     

       65
       65
       +
           maintainers = with maintainers; [ lovesegfault ];

     

       66
       66
       +
         };

     

       67
       67
       +
       }

     

       68
       68
       +

+4 -4

pkgs/development/libraries/spdlog/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, fmt }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, fmt_8 }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         generic = { version, sha256 }:

     
···

       15
       15
        
       

     

       16
       16
        
             nativeBuildInputs = [ cmake ];

     

       17
       17
        
             # spdlog <1.3 uses a bundled version of fmt

     

       18
       18
       -
             propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt;

     

       18
       18
       +
             propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8;

     

       19
       19
        
       

     

       20
       20
        
             cmakeFlags = [

     

       21
       21
        
               "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"

     
···

       49
       49
        
       in

     

       50
       50
        
       {

     

       51
       51
        
         spdlog_1 = generic {

     

       52
       52
       -
           version = "1.8.5";

     

       53
       53
       -
           sha256 = "sha256-D29jvDZQhPscaOHlrzGN1s7/mXlcsovjbqYpXd7OM50=";

     

       52
       52
       +
           version = "1.9.2";

     

       53
       53
       +
           sha256 = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y=";

     

       54
       54
        
         };

     

       55
       55
        
       

     

       56
       56
        
         spdlog_0 = generic {

+2 -2

pkgs/development/python-modules/pyemby/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "pyemby";

     

       10
       10
       -
         version = "1.7";

     

       10
       10
       +
         version = "1.8";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "mezz64";

     

       14
       14
        
           repo = pname;

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           sha256 = "04fvpv3fz4q160s4ikldwxflxl1zbxgfgy9qs6grgpnd23p0ylk8";

     

       16
       16
       +
           sha256 = "sha256-EpmXdyKtfb/M8rTv6YrfNCpDmKei2AD5DBcdVvqCVWw=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

-2

pkgs/development/python-modules/qiskit-aer/default.nix

···

       8
       8
        
       , catch2

     

       9
       9
        
       , cmake

     

       10
       10
        
       , cython

     

       11
       11
       -
       , fmt

     

       12
       11
        
       , muparserx

     

       13
       12
        
       , ninja

     

       14
       13
        
       , nlohmann_json

     
···

       66
       65
        
         buildInputs = [

     

       67
       66
        
           blas

     

       68
       67
        
           catch2

     

       69
       69
       -
           fmt

     

       70
       68
        
           muparserx

     

       71
       69
        
           nlohmann_json

     

       72
       70
        
           spdlog

-2

pkgs/development/tools/build-managers/bear/default.nix

···

       7
       7
        
       , openssl

     

       8
       8
        
       , nlohmann_json

     

       9
       9
        
       , gtest

     

       10
       10
       -
       , fmt

     

       11
       10
        
       , spdlog

     

       12
       11
        
       , c-ares

     

       13
       12
        
       , abseil-cpp

     
···

       35
       34
        
           openssl

     

       36
       35
        
           nlohmann_json

     

       37
       36
        
           gtest

     

       38
       38
       -
           fmt

     

       39
       37
        
           spdlog

     

       40
       38
        
           c-ares

     

       41
       39
        
           abseil-cpp

-2

pkgs/servers/gerbera/default.nix

···

       4
       4
        
       , cmake

     

       5
       5
        
       , pkg-config

     

       6
       6
        
         # required

     

       7
       7
       -
       , fmt

     

       8
       7
        
       , libiconv

     

       9
       8
        
       , libupnp

     

       10
       9
        
       , libuuid

     
···

       88
       87
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       89
       88
        
       

     

       90
       89
        
         buildInputs = [

     

       91
       91
       -
           fmt

     

       92
       90
        
           libiconv

     

       93
       91
        
           libupnp'

     

       94
       92
        
           libuuid

+1 -2

pkgs/tools/filesystems/lizardfs/default.nix

···

       17
       17
        
       , judy

     

       18
       18
        
       , pam

     

       19
       19
        
       , spdlog

     

       20
       20
       -
       , fmt

     

       21
       20
        
       , systemdMinimal

     

       22
       21
        
       , zlib # optional

     

       23
       22
        
       }:

     
···

       37
       36
        
       

     

       38
       37
        
         buildInputs = [

     

       39
       38
        
           db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl

     

       40
       40
       -
           zlib boost judy pam spdlog fmt python3 systemdMinimal

     

       39
       39
       +
           zlib boost judy pam spdlog python3 systemdMinimal

     

       41
       40
        
         ];

     

       42
       41
        
       

     

       43
       42
        
         meta = with lib; {

+2

pkgs/top-level/all-packages.nix

···

       22774
       22774
        
       

     

       22775
       22775
        
         aurulent-sans = callPackage ../data/fonts/aurulent-sans { };

     

       22776
       22776
        
       

     

       22777
       22777
       +
         ayu-theme-gtk = callPackage ../data/themes/ayu-theme-gtk { };

     

       22778
       22778
       +
       

     

       22777
       22779
        
         b612  = callPackage ../data/fonts/b612 { };

     

       22778
       22780
        
       

     

       22779
       22781
        
         babelstone-han = callPackage ../data/fonts/babelstone-han { };