commit fea28489588598d0ad7490afeac6493b80607c6b · pyrox.dev/nixpkgs

+2 -2

pkgs/applications/audio/mympd/default.nix

···

       15
        
       

     

       16
        
       stdenv.mkDerivation rec {

     

       17
        
         pname = "mympd";

     

       18
       -
         version = "9.5.2";

     

       19
        
       

     

       20
        
         src = fetchFromGitHub {

     

       21
        
           owner = "jcorporation";

     

       22
        
           repo = "myMPD";

     

       23
        
           rev = "v${version}";

     

       24
       -
           sha256 = "sha256-WmGaZXITvrp7ml7s7FPyp3Q3072KU/P6UombBj99fX0=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         nativeBuildInputs = [

···

       15
        
       

     

       16
        
       stdenv.mkDerivation rec {

     

       17
        
         pname = "mympd";

     

       18
       +
         version = "9.5.3";

     

       19
        
       

     

       20
        
         src = fetchFromGitHub {

     

       21
        
           owner = "jcorporation";

     

       22
        
           repo = "myMPD";

     

       23
        
           rev = "v${version}";

     

       24
       +
           sha256 = "sha256-0plbOBTrEOjfVbyfrQ8mNByJb6XygIPTrwGfY6+0DHo=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         nativeBuildInputs = [

+3 -3

pkgs/applications/networking/cluster/arkade/default.nix

···

       7
        
       

     

       8
        
       buildGoModule rec {

     

       9
        
         pname = "arkade";

     

       10
       -
         version = "0.8.36";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "alexellis";

     

       14
        
           repo = "arkade";

     

       15
        
           rev = version;

     

       16
       -
           sha256 = "sha256-+666KfOK2yxkADw+EvKlXAAsz2Aw+EmRXGAqNMfBsj8=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         CGO_ENABLED = 0;

     

       20
        
       

     

       21
        
         nativeBuildInputs = [ installShellFiles ];

     

       22
        
       

     

       23
       -
         vendorSha256 = "sha256-6EnhO4zYYdsTKvNQApZxXo8x6oFKsmuMvOI3zPHAQLs=";

     

       24
        
       

     

       25
        
         # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true

     

       26
        
         subPackages = [

···

       7
        
       

     

       8
        
       buildGoModule rec {

     

       9
        
         pname = "arkade";

     

       10
       +
         version = "0.8.38";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "alexellis";

     

       14
        
           repo = "arkade";

     

       15
        
           rev = version;

     

       16
       +
           sha256 = "sha256-8C7aQCQ6kqHCGSktYS3djTlEuPyRnzb9LrXkqgfzDyY=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         CGO_ENABLED = 0;

     

       20
        
       

     

       21
        
         nativeBuildInputs = [ installShellFiles ];

     

       22
        
       

     

       23
       +
         vendorSha256 = "sha256-ok8NuqVFZtzjSLpgxQI03ISojfKdHPHWyikqwtceMlo=";

     

       24
        
       

     

       25
        
         # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true

     

       26
        
         subPackages = [

+1 -1

pkgs/development/ocaml-modules/angstrom/default.nix

···

       17
        
         checkInputs = [ alcotest ppx_let ];

     

       18
        
         buildInputs = [ ocaml-syntax-shims ];

     

       19
        
         propagatedBuildInputs = [ bigstringaf result ];

     

       20
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       21
        
       

     

       22
        
         meta = {

     

       23
        
           homepage = "https://github.com/inhabitedtype/angstrom";

···

       17
        
         checkInputs = [ alcotest ppx_let ];

     

       18
        
         buildInputs = [ ocaml-syntax-shims ];

     

       19
        
         propagatedBuildInputs = [ bigstringaf result ];

     

       20
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       21
        
       

     

       22
        
         meta = {

     

       23
        
           homepage = "https://github.com/inhabitedtype/angstrom";

+1 -1

pkgs/development/ocaml-modules/base64/default.nix

···

       14
        
         };

     

       15
        
       

     

       16
        
         # otherwise fmt breaks evaluation

     

       17
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       18
        
         checkInputs = [ alcotest bos rresult ];

     

       19
        
       

     

       20
        
         meta = {

···

       14
        
         };

     

       15
        
       

     

       16
        
         # otherwise fmt breaks evaluation

     

       17
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       18
        
         checkInputs = [ alcotest bos rresult ];

     

       19
        
       

     

       20
        
         meta = {

+2 -2

pkgs/development/ocaml-modules/bigarray-overlap/default.nix

···

       1
       -
       { lib, buildDunePackage, fetchurl

     

       2
        
       , bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config

     

       3
        
       }:

     

       4
        
       

     
···

       20
        
       

     

       21
        
         nativeBuildInputs = [ findlib pkg-config ];

     

       22
        
         checkInputs = [ alcotest astring fpath bos ];

     

       23
       -
         doCheck = true;

     

       24
        
       

     

       25
        
         meta = with lib; {

     

       26
        
           homepage = "https://github.com/dinosaure/overlap";

···

       1
       +
       { lib, buildDunePackage, ocaml, fetchurl

     

       2
        
       , bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config

     

       3
        
       }:

     

       4
        
       

     
···

       20
        
       

     

       21
        
         nativeBuildInputs = [ findlib pkg-config ];

     

       22
        
         checkInputs = [ alcotest astring fpath bos ];

     

       23
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       24
        
       

     

       25
        
         meta = with lib; {

     

       26
        
           homepage = "https://github.com/dinosaure/overlap";

+1 -1

pkgs/development/ocaml-modules/bigstringaf/default.nix

···

       21
        
         nativeBuildInputs = [ pkg-config ];

     

       22
        
         checkInputs = [ alcotest ];

     

       23
        
         propagatedBuildInputs = [ bigarray-compat ];

     

       24
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       25
        
       

     

       26
        
         meta = {

     

       27
        
           description = "Bigstring intrinsics and fast blits based on memcpy/memmove";

···

       21
        
         nativeBuildInputs = [ pkg-config ];

     

       22
        
         checkInputs = [ alcotest ];

     

       23
        
         propagatedBuildInputs = [ bigarray-compat ];

     

       24
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       25
        
       

     

       26
        
         meta = {

     

       27
        
           description = "Bigstring intrinsics and fast blits based on memcpy/memmove";

+2 -2

pkgs/development/ocaml-modules/callipyge/default.nix

···

       23
        
       

     

       24
        
         propagatedBuildInputs = [ fmt eqaf ];

     

       25
        
       

     

       26
       -
         # alcotest isn't available for OCaml < 4.05 due to fmt

     

       27
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       28
        
         checkInputs = [ alcotest ];

     

       29
        
       

     

       30
        
         meta = {

···

       23
        
       

     

       24
        
         propagatedBuildInputs = [ fmt eqaf ];

     

       25
        
       

     

       26
       +
         # alcotest isn't available for OCaml < 4.08 due to fmt

     

       27
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       28
        
         checkInputs = [ alcotest ];

     

       29
        
       

     

       30
        
         meta = {

+2 -2

pkgs/development/ocaml-modules/caqti/default.nix

···

       1
       -
       { lib, fetchFromGitHub, buildDunePackage

     

       2
        
       , cppo, logs, ptime, uri, bigstringaf

     

       3
        
       , re, cmdliner, alcotest }:

     

       4
        
       

     
···

       20
        
         propagatedBuildInputs = [ logs ptime uri bigstringaf ];

     

       21
        
         checkInputs = [ re cmdliner alcotest ];

     

       22
        
       

     

       23
       -
         doCheck = true;

     

       24
        
       

     

       25
        
         meta = {

     

       26
        
           description = "Unified interface to relational database libraries";

···

       1
       +
       { lib, fetchFromGitHub, buildDunePackage, ocaml

     

       2
        
       , cppo, logs, ptime, uri, bigstringaf

     

       3
        
       , re, cmdliner, alcotest }:

     

       4
        
       

     
···

       20
        
         propagatedBuildInputs = [ logs ptime uri bigstringaf ];

     

       21
        
         checkInputs = [ re cmdliner alcotest ];

     

       22
        
       

     

       23
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       24
        
       

     

       25
        
         meta = {

     

       26
        
           description = "Unified interface to relational database libraries";

+2 -2

pkgs/development/ocaml-modules/checkseum/default.nix

···

       1
       -
       { lib, fetchurl, buildDunePackage, dune-configurator, pkg-config

     

       2
        
       , bigarray-compat, optint

     

       3
        
       , fmt, rresult, bos, fpath, astring, alcotest

     

       4
        
       , withFreestanding ? false

     
···

       36
        
           rresult

     

       37
        
         ];

     

       38
        
       

     

       39
       -
         doCheck = true;

     

       40
        
       

     

       41
        
         meta = {

     

       42
        
           description = "ADLER-32 and CRC32C Cyclic Redundancy Check";

···

       1
       +
       { lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config

     

       2
        
       , bigarray-compat, optint

     

       3
        
       , fmt, rresult, bos, fpath, astring, alcotest

     

       4
        
       , withFreestanding ? false

     
···

       36
        
           rresult

     

       37
        
         ];

     

       38
        
       

     

       39
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       40
        
       

     

       41
        
         meta = {

     

       42
        
           description = "ADLER-32 and CRC32C Cyclic Redundancy Check";

+2 -2

pkgs/development/ocaml-modules/cow/default.nix

···

       1
       -
       { lib, fetchurl, buildDunePackage, alcotest

     

       2
        
       , uri, xmlm, omd, ezjsonm }:

     

       3
        
       

     

       4
        
       buildDunePackage rec {

     
···

       15
        
       

     

       16
        
         propagatedBuildInputs = [ xmlm uri ezjsonm omd ];

     

       17
        
         checkInputs = [ alcotest ];

     

       18
       -
         doCheck = true;

     

       19
        
       

     

       20
        
         meta = with lib; {

     

       21
        
           description = "Caml on the Web";

···

       1
       +
       { lib, fetchurl, buildDunePackage, ocaml, alcotest

     

       2
        
       , uri, xmlm, omd, ezjsonm }:

     

       3
        
       

     

       4
        
       buildDunePackage rec {

     
···

       15
        
       

     

       16
        
         propagatedBuildInputs = [ xmlm uri ezjsonm omd ];

     

       17
        
         checkInputs = [ alcotest ];

     

       18
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       19
        
       

     

       20
        
         meta = with lib; {

     

       21
        
           description = "Caml on the Web";

+2 -2

pkgs/development/ocaml-modules/cstruct/default.nix

···

       15
        
       

     

       16
        
         propagatedBuildInputs = [ bigarray-compat ];

     

       17
        
       

     

       18
       -
         # alcotest isn't available for OCaml < 4.05 due to fmt

     

       19
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       20
        
         checkInputs = [ alcotest ];

     

       21
        
       

     

       22
        
         meta = {

···

       15
        
       

     

       16
        
         propagatedBuildInputs = [ bigarray-compat ];

     

       17
        
       

     

       18
       +
         # alcotest isn't available for OCaml < 4.08 due to fmt

     

       19
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       20
        
         checkInputs = [ alcotest ];

     

       21
        
       

     

       22
        
         meta = {

+2 -2

pkgs/development/ocaml-modules/cstruct/sexp.nix

···

       10
        
       

     

       11
        
         minimumOCamlVersion = "4.03";

     

       12
        
       

     

       13
       -
         # alcotest is only available on OCaml >= 4.05 due to fmt

     

       14
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       15
        
         checkInputs = [ alcotest ];

     

       16
        
       

     

       17
        
         propagatedBuildInputs = [ cstruct sexplib ];

···

       10
        
       

     

       11
        
         minimumOCamlVersion = "4.03";

     

       12
        
       

     

       13
       +
         # alcotest is only available on OCaml >= 4.08 due to fmt

     

       14
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       15
        
         checkInputs = [ alcotest ];

     

       16
        
       

     

       17
        
         propagatedBuildInputs = [ cstruct sexplib ];

+2 -2

pkgs/development/ocaml-modules/decompress/default.nix

···

       1
       -
       { lib, fetchurl, buildDunePackage

     

       2
        
       , checkseum, bigarray-compat, optint, cmdliner

     

       3
        
       , bigstringaf, alcotest, camlzip, base64, ctypes, fmt

     

       4
        
       }:

     
···

       19
        
         buildInputs = [ cmdliner ];

     

       20
        
         propagatedBuildInputs = [ optint bigarray-compat checkseum ];

     

       21
        
         checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];

     

       22
       -
         doCheck = true;

     

       23
        
       

     

       24
        
         meta = {

     

       25
        
           description = "Pure OCaml implementation of Zlib";

···

       1
       +
       { lib, fetchurl, buildDunePackage, ocaml

     

       2
        
       , checkseum, bigarray-compat, optint, cmdliner

     

       3
        
       , bigstringaf, alcotest, camlzip, base64, ctypes, fmt

     

       4
        
       }:

     
···

       19
        
         buildInputs = [ cmdliner ];

     

       20
        
         propagatedBuildInputs = [ optint bigarray-compat checkseum ];

     

       21
        
         checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];

     

       22
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       23
        
       

     

       24
        
         meta = {

     

       25
        
           description = "Pure OCaml implementation of Zlib";

+1 -1

pkgs/development/ocaml-modules/dispatch/default.nix

···

       17
        
       

     

       18
        
         checkInputs = [ alcotest ];

     

       19
        
       

     

       20
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       21
        
       

     

       22
        
         meta = {

     

       23
        
           inherit (src.meta) homepage;

···

       17
        
       

     

       18
        
         checkInputs = [ alcotest ];

     

       19
        
       

     

       20
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       21
        
       

     

       22
        
         meta = {

     

       23
        
           inherit (src.meta) homepage;

+1 -1

pkgs/development/ocaml-modules/domain-name/default.nix

···

       15
        
       

     

       16
        
         checkInputs = [ alcotest ];

     

       17
        
       

     

       18
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       19
        
       

     

       20
        
         meta = {

     

       21
        
           homepage = "https://github.com/hannesm/domain-name";

···

       15
        
       

     

       16
        
         checkInputs = [ alcotest ];

     

       17
        
       

     

       18
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       19
        
       

     

       20
        
         meta = {

     

       21
        
           homepage = "https://github.com/hannesm/domain-name";

+1 -1

pkgs/development/ocaml-modules/duration/default.nix

···

       11
        
           sha256 = "sha256-rRT7daWm9z//fvFyEXiSXuVVzw8jsj46sykYS8DBzmk=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       15
        
         checkInputs = [ alcotest ];

     

       16
        
       

     

       17
        
         meta = {

···

       11
        
           sha256 = "sha256-rRT7daWm9z//fvFyEXiSXuVVzw8jsj46sykYS8DBzmk=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       15
        
         checkInputs = [ alcotest ];

     

       16
        
       

     

       17
        
         meta = {

+3 -3

pkgs/development/ocaml-modules/emile/default.nix

···

       25
        
         ];

     

       26
        
       

     

       27
        
         # technically emile is available for ocaml >= 4.03, but alcotest

     

       28
       -
         # and angstrom (fmt) are only available for >= 4.05. Disabling

     

       29
       -
         # tests for < 4.05 at least improves the error message

     

       30
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       31
        
         checkInputs = [ alcotest ];

     

       32
        
       

     

       33
        
         meta = with lib; {

···

       25
        
         ];

     

       26
        
       

     

       27
        
         # technically emile is available for ocaml >= 4.03, but alcotest

     

       28
       +
         # and angstrom (fmt) are only available for >= 4.08. Disabling

     

       29
       +
         # tests for < 4.08 at least improves the error message

     

       30
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       31
        
         checkInputs = [ alcotest ];

     

       32
        
       

     

       33
        
         meta = with lib; {

+1 -1

pkgs/development/ocaml-modules/faraday/default.nix

···

       17
        
       

     

       18
        
         checkInputs = [ alcotest ];

     

       19
        
         propagatedBuildInputs = [ bigstringaf ];

     

       20
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       21
        
       

     

       22
        
         meta = {

     

       23
        
           description = "Serialization library built for speed and memory efficiency";

···

       17
        
       

     

       18
        
         checkInputs = [ alcotest ];

     

       19
        
         propagatedBuildInputs = [ bigstringaf ];

     

       20
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       21
        
       

     

       22
        
         meta = {

     

       23
        
           description = "Serialization library built for speed and memory efficiency";

+2 -2

pkgs/development/ocaml-modules/ff/default.nix

···

       1
       -
       { lib, fetchFromGitLab, buildDunePackage, zarith, alcotest }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "ff";

     
···

       21
        
           alcotest

     

       22
        
         ];

     

       23
        
       

     

       24
       -
         doCheck = true;

     

       25
        
       

     

       26
        
         meta = {

     

       27
        
           homepage = "https://gitlab.com/dannywillems/ocaml-ff";

···

       1
       +
       { lib, fetchFromGitLab, buildDunePackage, ocaml, zarith, alcotest }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "ff";

     
···

       21
        
           alcotest

     

       22
        
         ];

     

       23
        
       

     

       24
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       25
        
       

     

       26
        
         meta = {

     

       27
        
           homepage = "https://gitlab.com/dannywillems/ocaml-ff";

+4 -5

pkgs/development/ocaml-modules/fmt/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }:

     

       2
        
       

     

       3
       -
       if lib.versionOlder ocaml.version "4.05"

     

       4
        
       then throw "fmt is not available for OCaml ${ocaml.version}"

     

       5
        
       else

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
       -
         version = "0.8.9";

     

       9
        
         pname = "ocaml${ocaml.version}-fmt";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
        
           url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz";

     

       13
       -
           sha256 = "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

     

       17
        
         buildInputs = [ cmdliner topkg ];

     

       18
       -
         propagatedBuildInputs = [ seq stdlib-shims ];

     

       19
        
       

     

       20
        
         strictDeps = true;

     

       21

···

       1
       +
       { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }:

     

       2
        
       

     

       3
       +
       if lib.versionOlder ocaml.version "4.08"

     

       4
        
       then throw "fmt is not available for OCaml ${ocaml.version}"

     

       5
        
       else

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
       +
         version = "0.9.0";

     

       9
        
         pname = "ocaml${ocaml.version}-fmt";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
        
           url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz";

     

       13
       +
           sha256 = "sha256-8fsggFoi3XWhN9cnBKNw53ic9r32OUjmgX0cImwUEmE=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

     

       17
        
         buildInputs = [ cmdliner topkg ];

     

       0
        
       
     

       18
        
       

     

       19
        
         strictDeps = true;

     

       20

+1 -1

pkgs/development/ocaml-modules/gmap/default.nix

···

       15
        
       

     

       16
        
         checkInputs = [ alcotest ];

     

       17
        
       

     

       18
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       19
        
       

     

       20
        
         meta = {

     

       21
        
           description = "Heterogenous maps over a GADT";

···

       15
        
       

     

       16
        
         checkInputs = [ alcotest ];

     

       17
        
       

     

       18
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       19
        
       

     

       20
        
         meta = {

     

       21
        
           description = "Heterogenous maps over a GADT";

+3 -3

pkgs/development/ocaml-modules/graphql/parser.nix

···

       1
       -
       { lib, buildDunePackage, ocaml, fetchurl, alcotest, fmt, menhir, re }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "graphql_parser";

     

       5
        
         version = "0.14.0";

     

       6
        
       

     

       7
       -
         minimalOCamlVersion = "4.05";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz";

     
···

       16
        
       

     

       17
        
         checkInputs = [ alcotest ];

     

       18
        
       

     

       19
       -
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       20
        
       

     

       21
        
         meta = {

     

       22
        
           homepage = "https://github.com/andreas/ocaml-graphql-server";

···

       1
       +
       { lib, buildDunePackage, fetchurl, alcotest, fmt, menhir, re }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "graphql_parser";

     

       5
        
         version = "0.14.0";

     

       6
        
       

     

       7
       +
         minimalOCamlVersion = "4.08";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz";

     
···

       16
        
       

     

       17
        
         checkInputs = [ alcotest ];

     

       18
        
       

     

       19
       +
         doCheck = true;

     

       20
        
       

     

       21
        
         meta = {

     

       22
        
           homepage = "https://github.com/andreas/ocaml-graphql-server";

+1 -1

pkgs/development/ocaml-modules/h2/default.nix

···

       43
        
         ];

     

       44
        
       

     

       45
        
         # Tests fail with 4.06

     

       46
       -
         doCheck = lib.versionAtLeast ocaml.version "4.07";

     

       47
        
         preCheck = ''

     

       48
        
           ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case

     

       49
        
         '';

···

       43
        
         ];

     

       44
        
       

     

       45
        
         # Tests fail with 4.06

     

       46
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       47
        
         preCheck = ''

     

       48
        
           ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case

     

       49
        
         '';

+2 -2

pkgs/development/ocaml-modules/httpaf/default.nix

···

       1
       -
       { lib, fetchFromGitHub, fetchpatch, buildDunePackage

     

       2
        
       , angstrom, faraday, alcotest

     

       3
        
       }:

     

       4
        
       

     
···

       17
        
       

     

       18
        
         checkInputs = [ alcotest ];

     

       19
        
         propagatedBuildInputs = [ angstrom faraday ];

     

       20
       -
         doCheck = true;

     

       21
        
       

     

       22
        
         meta = {

     

       23
        
           description = "A high-performance, memory-efficient, and scalable web server for OCaml";

···

       1
       +
       { lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml

     

       2
        
       , angstrom, faraday, alcotest

     

       3
        
       }:

     

       4
        
       

     
···

       17
        
       

     

       18
        
         checkInputs = [ alcotest ];

     

       19
        
         propagatedBuildInputs = [ angstrom faraday ];

     

       20
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       21
        
       

     

       22
        
         meta = {

     

       23
        
           description = "A high-performance, memory-efficient, and scalable web server for OCaml";

+2 -2

pkgs/development/ocaml-modules/imagelib/default.nix

···

       1
       -
       { lib, fetchurl, buildDunePackage

     

       2
        
       , decompress, stdlib-shims, alcotest

     

       3
        
       }:

     

       4
        
       

     
···

       16
        
       

     

       17
        
         propagatedBuildInputs = [ decompress stdlib-shims ];

     

       18
        
       

     

       19
       -
         doCheck = true;

     

       20
        
         checkInputs = [ alcotest ];

     

       21
        
       

     

       22
        
         meta = {

···

       1
       +
       { lib, fetchurl, buildDunePackage, ocaml

     

       2
        
       , decompress, stdlib-shims, alcotest

     

       3
        
       }:

     

       4
        
       

     
···

       16
        
       

     

       17
        
         propagatedBuildInputs = [ decompress stdlib-shims ];

     

       18
        
       

     

       19
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       20
        
         checkInputs = [ alcotest ];

     

       21
        
       

     

       22
        
         meta = {

+4 -2

pkgs/development/ocaml-modules/logs/default.nix

···

       1
        
       { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild

     

       2
        
       , topkg, result, lwt, cmdliner, fmt

     

       0
        
       
     

       3
        
       , js_of_ocaml

     

       4
        
       , jsooSupport ? true

     

       5
        
       }:

     
···

       22
        
         };

     

       23
        
       

     

       24
        
         nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

     

       25
       -
         buildInputs = [ fmt cmdliner lwt topkg ]

     

       0
        
       
     

       26
        
           ++ lib.optional jsooSupport js_of_ocaml;

     

       27
        
         propagatedBuildInputs = [ result ];

     

       28
        
       

     

       29
        
         strictDeps = true;

     

       30
        
       

     

       31
       -
         buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}";

     

       32
        
       

     

       33
        
         inherit (topkg) installPhase;

     

       34

···

       1
        
       { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild

     

       2
        
       , topkg, result, lwt, cmdliner, fmt

     

       3
       +
       , fmtSupport ? lib.versionAtLeast ocaml.version "4.08"

     

       4
        
       , js_of_ocaml

     

       5
        
       , jsooSupport ? true

     

       6
        
       }:

     
···

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

     

       26
       +
         buildInputs = [ cmdliner lwt topkg ]

     

       27
       +
           ++ lib.optional fmtSupport fmt

     

       28
        
           ++ lib.optional jsooSupport js_of_ocaml;

     

       29
        
         propagatedBuildInputs = [ result ];

     

       30
        
       

     

       31
        
         strictDeps = true;

     

       32
        
       

     

       33
       +
         buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport} --with-fmt ${lib.boolToString fmtSupport}";

     

       34
        
       

     

       35
        
         inherit (topkg) installPhase;

     

       36

+2 -2

pkgs/development/ocaml-modules/luv/default.nix

···

       1
       -
       { lib, buildDunePackage, fetchurl

     

       2
        
       , ctypes, result

     

       3
        
       , alcotest

     

       4
        
       , file

     
···

       23
        
         nativeBuildInputs = [ file ];

     

       24
        
         propagatedBuildInputs = [ ctypes result ];

     

       25
        
         checkInputs = [ alcotest ];

     

       26
       -
         doCheck = true;

     

       27
        
       

     

       28
        
         meta = with lib; {

     

       29
        
           homepage = "https://github.com/aantron/luv";

···

       1
       +
       { lib, buildDunePackage, ocaml, fetchurl

     

       2
        
       , ctypes, result

     

       3
        
       , alcotest

     

       4
        
       , file

     
···

       23
        
         nativeBuildInputs = [ file ];

     

       24
        
         propagatedBuildInputs = [ ctypes result ];

     

       25
        
         checkInputs = [ alcotest ];

     

       26
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       27
        
       

     

       28
        
         meta = with lib; {

     

       29
        
           homepage = "https://github.com/aantron/luv";

+1 -1

pkgs/development/ocaml-modules/ppx_blob/default.nix

···

       13
        
       

     

       14
        
         checkInputs = [ alcotest ];

     

       15
        
         propagatedBuildInputs = [ ppxlib ];

     

       16
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       17
        
       

     

       18
        
         meta = with lib; {

     

       19
        
           homepage = "https://github.com/johnwhitington/ppx_blob";

···

       13
        
       

     

       14
        
         checkInputs = [ alcotest ];

     

       15
        
         propagatedBuildInputs = [ ppxlib ];

     

       16
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       17
        
       

     

       18
        
         meta = with lib; {

     

       19
        
           homepage = "https://github.com/johnwhitington/ppx_blob";

+2 -2

pkgs/development/ocaml-modules/rpclib/default.nix

···

       1
       -
       { lib, fetchurl, buildDunePackage

     

       2
        
       , alcotest

     

       3
        
       , base64, cmdliner, rresult, xmlm, yojson

     

       4
        
       }:

     
···

       18
        
         propagatedBuildInputs = [ base64 rresult xmlm ];

     

       19
        
         checkInputs = [ alcotest ];

     

       20
        
       

     

       21
       -
         doCheck = true;

     

       22
        
       

     

       23
        
         meta = with lib; {

     

       24
        
           homepage = "https://github.com/mirage/ocaml-rpc";

···

       1
       +
       { lib, fetchurl, buildDunePackage, ocaml

     

       2
        
       , alcotest

     

       3
        
       , base64, cmdliner, rresult, xmlm, yojson

     

       4
        
       }:

     
···

       18
        
         propagatedBuildInputs = [ base64 rresult xmlm ];

     

       19
        
         checkInputs = [ alcotest ];

     

       20
        
       

     

       21
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       22
        
       

     

       23
        
         meta = with lib; {

     

       24
        
           homepage = "https://github.com/mirage/ocaml-rpc";

+1 -1

pkgs/development/ocaml-modules/ssl/default.nix

···

       23
        
         buildInputs = [ dune-configurator ];

     

       24
        
         propagatedBuildInputs = [ openssl ];

     

       25
        
       

     

       26
       -
         doCheck = lib.versionAtLeast ocaml.version "4.06";

     

       27
        
         checkInputs = [ alcotest ];

     

       28
        
         preCheck = ''

     

       29
        
           mkdir -p _build/default/tests/

···

       23
        
         buildInputs = [ dune-configurator ];

     

       24
        
         propagatedBuildInputs = [ openssl ];

     

       25
        
       

     

       26
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       27
        
         checkInputs = [ alcotest ];

     

       28
        
         preCheck = ''

     

       29
        
           mkdir -p _build/default/tests/

+1 -1

pkgs/development/ocaml-modules/terminal/default.nix

···

       17
        
       

     

       18
        
         propagatedBuildInputs = [ stdlib-shims uutf uucp ];

     

       19
        
       

     

       20
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       21
        
         checkInputs = [ alcotest fmt ];

     

       22
        
       

     

       23
        
         meta = with lib; {

···

       17
        
       

     

       18
        
         propagatedBuildInputs = [ stdlib-shims uutf uucp ];

     

       19
        
       

     

       20
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       21
        
         checkInputs = [ alcotest fmt ];

     

       22
        
       

     

       23
        
         meta = with lib; {

+2 -2

pkgs/development/ocaml-modules/terminal_size/default.nix

···

       1
       -
       { lib, buildDunePackage, fetchurl, alcotest }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "terminal_size";

     
···

       12
        
         };

     

       13
        
       

     

       14
        
         checkInputs = [ alcotest ];

     

       15
       -
         doCheck = true;

     

       16
        
       

     

       17
        
         meta = with lib; {

     

       18
        
           description = "Get the dimensions of the terminal";

···

       1
       +
       { lib, buildDunePackage, ocaml, fetchurl, alcotest }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "terminal_size";

     
···

       12
        
         };

     

       13
        
       

     

       14
        
         checkInputs = [ alcotest ];

     

       15
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       16
        
       

     

       17
        
         meta = with lib; {

     

       18
        
           description = "Get the dimensions of the terminal";

+2 -2

pkgs/development/ocaml-modules/uecc/default.nix

···

       1
       -
       { lib, fetchFromGitLab, buildDunePackage, bigstring, alcotest, cstruct, hex }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "uecc";

     
···

       23
        
           hex

     

       24
        
         ];

     

       25
        
       

     

       26
       -
         doCheck = true;

     

       27
        
       

     

       28
        
         meta = {

     

       29
        
           description = "Bindings for ECDH and ECDSA for 8-bit, 32-bit, and 64-bit processors";

···

       1
       +
       { lib, fetchFromGitLab, buildDunePackage, ocaml, bigstring, alcotest, cstruct, hex }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "uecc";

     
···

       23
        
           hex

     

       24
        
         ];

     

       25
        
       

     

       26
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       27
        
       

     

       28
        
         meta = {

     

       29
        
           description = "Bindings for ECDH and ECDSA for 8-bit, 32-bit, and 64-bit processors";

+4 -1

pkgs/development/ocaml-modules/yuscii/default.nix

···

       1
        
       { alcotest

     

       2
        
       , buildDunePackage

     

       0
        
       
     

       3
        
       , fetchzip

     

       4
        
       , gcc

     

       5
        
       , fmt

     
···

       10
        
       buildDunePackage rec {

     

       11
        
         pname = "yuscii";

     

       12
        
         version = "0.3.0";

     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         src = fetchzip {

     

       15
        
           url = "https://github.com/mirage/yuscii/releases/download/v${version}/yuscii-v${version}.tbz";

     
···

       24
        
           fmt

     

       25
        
           uutf

     

       26
        
         ];

     

       27
       -
         doCheck = true;

     

       28
        
       

     

       29
        
         meta = {

     

       30
        
           description = "A simple mapper between UTF-7 to Unicode according RFC2152";

···

       1
        
       { alcotest

     

       2
        
       , buildDunePackage

     

       3
       +
       , ocaml

     

       4
        
       , fetchzip

     

       5
        
       , gcc

     

       6
        
       , fmt

     
···

       11
        
       buildDunePackage rec {

     

       12
        
         pname = "yuscii";

     

       13
        
         version = "0.3.0";

     

       14
       +
       

     

       15
       +
         minimalOCamlVersion = "4.03";

     

       16
        
       

     

       17
        
         src = fetchzip {

     

       18
        
           url = "https://github.com/mirage/yuscii/releases/download/v${version}/yuscii-v${version}.tbz";

     
···

       27
        
           fmt

     

       28
        
           uutf

     

       29
        
         ];

     

       30
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       31
        
       

     

       32
        
         meta = {

     

       33
        
           description = "A simple mapper between UTF-7 to Unicode according RFC2152";

+2 -2

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

···

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
        
         pname = "pylibmc";

     

       12
       -
         version = "1.6.2";

     

       13
        
         format = "setuptools";

     

       14
        
       

     

       15
        
         disabled = pythonOlder "3.7";

     

       16
        
       

     

       17
        
         src = fetchPypi {

     

       18
        
           inherit pname version;

     

       19
       -
           hash = "sha256-QatJ05VAdnN0iRvvC+tSkcqXvrcEi3r3dSEGSVPATcA=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         buildInputs = [

···

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
        
         pname = "pylibmc";

     

       12
       +
         version = "1.6.3";

     

       13
        
         format = "setuptools";

     

       14
        
       

     

       15
        
         disabled = pythonOlder "3.7";

     

       16
        
       

     

       17
        
         src = fetchPypi {

     

       18
        
           inherit pname version;

     

       19
       +
           hash = "sha256-7vpGEVU3q61l++LgMqzRs0Y9m/njNa9LCRbfTk0yBuA=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         buildInputs = [

+2 -2

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

···

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
        
         pname = "sorl-thumbnail";

     

       10
       -
         version = "12.8.0";

     

       11
        
         disabled = isPy27;

     

       12
        
       

     

       13
        
         src = fetchPypi {

     

       14
        
           inherit pname version;

     

       15
       -
           sha256 = "sha256-7io8nwuInlmRk4PTeB8TF9ycSSf7RLIvsUN/b+cFS5Y=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         nativeBuildInputs = [ setuptools-scm ];

···

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
        
         pname = "sorl-thumbnail";

     

       10
       +
         version = "12.9.0";

     

       11
        
         disabled = isPy27;

     

       12
        
       

     

       13
        
         src = fetchPypi {

     

       14
        
           inherit pname version;

     

       15
       +
           sha256 = "sha256-DLwvUhUufyJm48LLSuXYOv0ulv1eHELlZnNiuqo9LbM=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         nativeBuildInputs = [ setuptools-scm ];

+2 -2

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

···

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "telethon";

     

       5
       -
         version = "1.24.0";

     

       6
        
       

     

       7
        
         src = fetchPypi {

     

       8
        
           inherit version;

     

       9
        
           pname = "Telethon";

     

       10
       -
           sha256 = "818cb61281ed3f75ba4da9b68cb69486bed9474d2db4e0aa16e482053117452c";

     

       11
        
         };

     

       12
        
       

     

       13
        
         patchPhase = ''

···

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "telethon";

     

       5
       +
         version = "1.25.0";

     

       6
        
       

     

       7
        
         src = fetchPypi {

     

       8
        
           inherit version;

     

       9
        
           pname = "Telethon";

     

       10
       +
           sha256 = "sha256-Z22XuSbm0w2+0x1sbmYRzeyfyCdZeFzqVcR3C3RhQpA=";

     

       11
        
         };

     

       12
        
       

     

       13
        
         patchPhase = ''

+2 -2

pkgs/development/python-modules/types-redis/default.nix

···

       5
        
       

     

       6
        
       buildPythonPackage rec {

     

       7
        
         pname = "types-redis";

     

       8
       -
         version = "4.3.18";

     

       9
        
         format = "setuptools";

     

       10
        
       

     

       11
        
         src = fetchPypi {

     

       12
        
           inherit pname version;

     

       13
       -
           sha256 = "sha256-ImBTLBV9T2T24mbeZ7CqoZec+5aeQJoWRF7Gl2xKHeY=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         # Module doesn't have tests

···

       5
        
       

     

       6
        
       buildPythonPackage rec {

     

       7
        
         pname = "types-redis";

     

       8
       +
         version = "4.3.19";

     

       9
        
         format = "setuptools";

     

       10
        
       

     

       11
        
         src = fetchPypi {

     

       12
        
           inherit pname version;

     

       13
       +
           sha256 = "sha256-yIH/uUvUfcoh7VAzKFRKVrsxWFFXXuuyf7Nxv/c1hEo=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         # Module doesn't have tests

+7 -9

pkgs/development/tools/misc/cvise/default.nix

···

       3
        
       , fetchFromGitHub

     

       4
        
       , bash

     

       5
        
       , cmake

     

       0
        
       
     

       6
        
       , flex

     

       7
        
       , libclang

     

       8
        
       , llvm

     
···

       15
        
       

     

       16
        
       buildPythonApplication rec {

     

       17
        
         pname = "cvise";

     

       18
       -
         version = "2.4.0";

     

       19
        
       

     

       20
        
         src = fetchFromGitHub {

     

       21
        
           owner = "marxin";

     

       22
        
           repo = "cvise";

     

       23
       -
           rev = "v${version}";

     

       24
       -
           sha256 = "0cfzikkhp91hjgxjk3izzczb8d9p8v9zsfyk6iklk92n5qf1aakq";

     

       25
        
         };

     

       26
        
       

     

       27
        
         patches = [

     
···

       34
        
           substituteInPlace cvise.py \

     

       35
        
             --replace "#!/bin/bash" "#!${bash}/bin/bash"

     

       36
        
       

     

       37
       -
           substituteInPlace setup.cfg \

     

       38
       -
             --replace "--flake8" ""

     

       0
        
       
     

       39
        
         '';

     

       40
        
       

     

       41
        
         nativeBuildInputs = [

     
···

       61
        
           pytestCheckHook

     

       62
        
           unifdef

     

       63
        
         ];

     

       64
       -
       

     

       65
       -
         preCheck = ''

     

       66
       -
           patchShebangs cvise.py

     

       67
       -
         '';

     

       68
        
       

     

       69
        
         disabledTests = [

     

       70
        
           # Needs gcc, fails when run noninteractively (without tty).

···

       3
        
       , fetchFromGitHub

     

       4
        
       , bash

     

       5
        
       , cmake

     

       6
       +
       , colordiff

     

       7
        
       , flex

     

       8
        
       , libclang

     

       9
        
       , llvm

     
···

       16
        
       

     

       17
        
       buildPythonApplication rec {

     

       18
        
         pname = "cvise";

     

       19
       +
         version = "2.5.0";

     

       20
        
       

     

       21
        
         src = fetchFromGitHub {

     

       22
        
           owner = "marxin";

     

       23
        
           repo = "cvise";

     

       24
       +
           rev = "refs/tags/v${version}";

     

       25
       +
           sha256 = "sha256-Nt6Zs3FxO8Ti+ikVPVaMCejzBIuUxrzG4VLhChCSJQw=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         patches = [

     
···

       35
        
           substituteInPlace cvise.py \

     

       36
        
             --replace "#!/bin/bash" "#!${bash}/bin/bash"

     

       37
        
       

     

       38
       +
           substituteInPlace cvise/utils/testing.py \

     

       39
       +
             --replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \

     

       40
       +
             --replace "'colordiff'" "'${colordiff}/bin/colordiff'"

     

       41
        
         '';

     

       42
        
       

     

       43
        
         nativeBuildInputs = [

     
···

       63
        
           pytestCheckHook

     

       64
        
           unifdef

     

       65
        
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       66
        
       

     

       67
        
         disabledTests = [

     

       68
        
           # Needs gcc, fails when run noninteractively (without tty).

+2 -2

pkgs/development/tools/oh-my-posh/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "oh-my-posh";

     

       5
       -
         version = "8.36.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "jandedobbeleer";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-/l2tekp3kke4soyBOmNEqh0Jxbpk2qK4vYrOfc+pw1o=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "oh-my-posh";

     

       5
       +
         version = "8.36.4";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "jandedobbeleer";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-aTpAFERzNKezZU3+B5Ni4qasqJrpOwNBbZ5zeJLwGUM=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";

+3 -3

pkgs/development/tools/regclient/default.nix

···

       4
        
       

     

       5
        
       buildGoModule rec {

     

       6
        
         pname = "regclient";

     

       7
       -
         version = "0.4.2";

     

       8
        
         tag = "v${version}";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "regclient";

     

       12
        
           repo = "regclient";

     

       13
        
           rev = tag;

     

       14
       -
           sha256 = "sha256-lx2IQ3NpFuVr4Vb7vFcp/QVZBlLzi4VXFE7Sw3LKIXE=";

     

       15
        
         };

     

       16
       -
         vendorSha256 = "sha256-7kDl7gyKFM2gErDhOBCo6T4etwsAJnRpVtaJgv6BefM=";

     

       17
        
       

     

       18
        
         outputs = [ "out" ] ++ bins;

     

       19

···

       4
        
       

     

       5
        
       buildGoModule rec {

     

       6
        
         pname = "regclient";

     

       7
       +
         version = "0.4.4";

     

       8
        
         tag = "v${version}";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "regclient";

     

       12
        
           repo = "regclient";

     

       13
        
           rev = tag;

     

       14
       +
           sha256 = "sha256-jIdbSDUpSKlb6RES6hx+r+vZyny56aWyjAurCI3mywk=";

     

       15
        
         };

     

       16
       +
         vendorSha256 = "sha256-QTeVgvjRw2wBd8QGoVpRVTTh+Wwu2NEZYR1Z9R52/p0=";

     

       17
        
       

     

       18
        
         outputs = [ "out" ] ++ bins;

     

       19

+41

pkgs/development/tools/rust/cargo-semver-checks/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 = "cargo-semver-checks";

     

       13
       +
         version = "0.9.2";

     

       14
       +
       

     

       15
       +
         src = fetchFromGitHub {

     

       16
       +
           owner = "obi1kenobi";

     

       17
       +
           repo = "cargo-semver-check";

     

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

     

       19
       +
           sha256 = "0w5qmbjkbd7ss2a3xhx186bykb3ghk6z0dmbz5i06k3acdv52gi7";

     

       20
       +
         };

     

       21
       +
       

     

       22
       +
         cargoSha256 = "sha256-RDFKI++5274bquh4bao10PQbdTOoCWcmueajIm8SvTw=";

     

       23
       +
       

     

       24
       +
         nativeBuildInputs = [ pkg-config ];

     

       25
       +
       

     

       26
       +
         buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [

     

       27
       +
           Security

     

       28
       +
         ];

     

       29
       +
       

     

       30
       +
         checkFlags = [

     

       31
       +
           # requires nightly version of cargo-rustdoc

     

       32
       +
           "--skip=adapter::tests"

     

       33
       +
         ];

     

       34
       +
       

     

       35
       +
         meta = with lib; {

     

       36
       +
           description = "A tool to scan your Rust crate for semver violations";

     

       37
       +
           homepage = "https://github.com/obi1kenobi/cargo-semver-check";

     

       38
       +
           license = licenses.asl20;

     

       39
       +
           maintainers = with maintainers; [ figsoda ];

     

       40
       +
         };

     

       41
       +
       }

-28

pkgs/development/tools/taplo-lsp/default.nix

···

       1
       -
       { fetchCrate, lib, openssl, pkg-config, rustPlatform, stdenv, Security }:

     

       2
       -
       

     

       3
       -
       rustPlatform.buildRustPackage rec {

     

       4
       -
         pname = "taplo-lsp";

     

       5
       -
         version = "0.2.6";

     

       6
       -
       

     

       7
       -
         src = fetchCrate {

     

       8
       -
           inherit pname version;

     

       9
       -
           sha256 = "sha256-jd4l9iTCeHnUa/GC13paD3zDiCZBk9VgEbCDsOs/Xq4=";

     

       10
       -
         };

     

       11
       -
       

     

       12
       -
         cargoSha256 = "sha256-zQ303JFqnbulkWL4t5+fRWijaY9zd9tLKvrvdUEvKpY=";

     

       13
       -
       

     

       14
       -
         # excludes test_tcp since it fails

     

       15
       -
         cargoTestFlags = [ "test_stdio" ];

     

       16
       -
       

     

       17
       -
         nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;

     

       18
       -
       

     

       19
       -
         buildInputs = lib.optional stdenv.isLinux openssl

     

       20
       -
           ++ lib.optional stdenv.isDarwin Security;

     

       21
       -
       

     

       22
       -
         meta = with lib; {

     

       23
       -
           description = "A TOML toolkit written in Rust";

     

       24
       -
           homepage = "https://taplo.tamasfe.dev";

     

       25
       -
           license = licenses.mit;

     

       26
       -
           maintainers = with maintainers; [ figsoda ];

     

       27
       -
         };

     

       28
       -
       }

+11 -5

pkgs/tools/misc/yubikey-manager/default.nix

···

       1
       -
       { python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps }:

     

       0
        
       
     

       2
        
       

     

       3
        
       python3Packages.buildPythonPackage rec {

     

       4
        
         pname = "yubikey-manager";

     
···

       12
        
           sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";

     

       13
        
         };

     

       14
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
         postPatch = ''

     

       16
        
           substituteInPlace pyproject.toml \

     

       17
        
             --replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"'

     

       18
        
           substituteInPlace "ykman/pcsc/__init__.py" \

     

       19
       -
             --replace 'pkill' '${procps}/bin/pkill'

     

       20
        
         '';

     

       21
        
       

     

       22
        
         nativeBuildInputs = with python3Packages; [ poetry-core ];

     

       23
        
       

     

       24
        
         propagatedBuildInputs =

     

       25
       -
           with python3Packages; [

     

       26
        
             click

     

       27
        
             cryptography

     

       28
        
             pyscard

     

       29
        
             pyusb

     

       30
       -
             pyopenssl

     

       31
        
             six

     

       32
        
             fido2

     

       33
       -
           ] ++ [

     

       0
        
       
     

       0
        
       
     

       34
        
             libu2f-host

     

       35
        
             libusb1

     

       36
        
             yubikey-personalization

···

       1
       +
       { python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps

     

       2
       +
       , stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }:

     

       3
        
       

     

       4
        
       python3Packages.buildPythonPackage rec {

     

       5
        
         pname = "yubikey-manager";

     
···

       13
        
           sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";

     

       14
        
         };

     

       15
        
       

     

       16
       +
         patches = lib.optionals (!pyOpenSSLSupport) [

     

       17
       +
           ./remove-pyopenssl-tests.patch

     

       18
       +
         ];

     

       19
       +
       

     

       20
        
         postPatch = ''

     

       21
        
           substituteInPlace pyproject.toml \

     

       22
        
             --replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"'

     

       23
        
           substituteInPlace "ykman/pcsc/__init__.py" \

     

       24
       +
             --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill'

     

       25
        
         '';

     

       26
        
       

     

       27
        
         nativeBuildInputs = with python3Packages; [ poetry-core ];

     

       28
        
       

     

       29
        
         propagatedBuildInputs =

     

       30
       +
           with python3Packages; ([

     

       31
        
             click

     

       32
        
             cryptography

     

       33
        
             pyscard

     

       34
        
             pyusb

     

       0
        
       
     

       35
        
             six

     

       36
        
             fido2

     

       37
       +
           ] ++ lib.optionals pyOpenSSLSupport [

     

       38
       +
             pyopenssl

     

       39
       +
           ]) ++ [

     

       40
        
             libu2f-host

     

       41
        
             libusb1

     

       42
        
             yubikey-personalization

+41

pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch

···

       1
       +
       diff --git a/pyproject.toml b/pyproject.toml

     

       2
       +
       index 65a5943..e6932e0 100644

     

       3
       +
       --- a/pyproject.toml

     

       4
       +
       +++ b/pyproject.toml

     

       5
       +
       @@ -30,7 +30,6 @@ packages = [

     

       6
       +
        python = "^3.6"

     

       7
       +
        dataclasses = {version = "^0.8", python = "<3.7"}

     

       8
       +
        cryptography = ">=2.1, <39"

     

       9
       +
       -pyOpenSSL = {version = ">=0.15.1", optional = true}

     

       10
       +
        pyscard = "^1.9 || ^2.0"

     

       11
       +
        fido2 = ">=0.9, <2.0"

     

       12
       +
        click = "^7.0 || ^8.0"

     

       13
       +
       diff --git a/tests/test_util.py b/tests/test_util.py

     

       14
       +
       index 6ccda6c..b4460e4 100644

     

       15
       +
       --- a/tests/test_util.py

     

       16
       +
       +++ b/tests/test_util.py

     

       17
       +
       @@ -8,7 +8,6 @@ from ykman.util import _parse_pkcs12_pyopenssl, _parse_pkcs12_cryptography

     

       18
       +
        from ykman.otp import format_oath_code, generate_static_pw, time_challenge

     

       19
       +
        from .util import open_file

     

       20
       +
        from cryptography.hazmat.primitives.serialization import pkcs12

     

       21
       +
       -from OpenSSL import crypto

     

       22
       +
        

     

       23
       +
        import unittest

     

       24
       +
        

     

       25
       +
       @@ -114,16 +113,6 @@ class TestUtilityFunctions(unittest.TestCase):

     

       26
       +
                ) as rsa_2048_key_cert_encrypted_pfx:

     

       27
       +
                    self.assertTrue(is_pkcs12(rsa_2048_key_cert_encrypted_pfx.read()))

     

       28
       +
        

     

       29
       +
       -    def test_parse_pkcs12(self):

     

       30
       +
       -        with open_file("rsa_2048_key_cert.pfx") as rsa_2048_key_cert_pfx:

     

       31
       +
       -            data = rsa_2048_key_cert_pfx.read()

     

       32
       +
       -

     

       33
       +
       -        key1, certs1 = _parse_pkcs12_cryptography(pkcs12, data, None)

     

       34
       +
       -        key2, certs2 = _parse_pkcs12_pyopenssl(crypto, data, None)

     

       35
       +
       -        self.assertEqual(key1.private_numbers(), key2.private_numbers())

     

       36
       +
       -        self.assertEqual(1, len(certs1))

     

       37
       +
       -        self.assertEqual(certs1, certs2)

     

       38
       +
       -

     

       39
       +
            def test_is_pem(self):

     

       40
       +
                self.assertFalse(is_pem(b"just a byte string"))

     

       41
       +
                self.assertFalse(is_pem(None))

+3

pkgs/top-level/all-packages.nix

···

       14502
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       14503
        
         };

     

       14504
        
         cargo-readme = callPackage ../development/tools/rust/cargo-readme {};

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14505
        
         cargo-sort = callPackage ../development/tools/rust/cargo-sort { };

     

       14506
        
         cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck {

     

       14507
        
           inherit (darwin.apple_sdk.frameworks) Security;

···

       14502
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       14503
        
         };

     

       14504
        
         cargo-readme = callPackage ../development/tools/rust/cargo-readme {};

     

       14505
       +
         cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks {

     

       14506
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       14507
       +
         };

     

       14508
        
         cargo-sort = callPackage ../development/tools/rust/cargo-sort { };

     

       14509
        
         cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck {

     

       14510
        
           inherit (darwin.apple_sdk.frameworks) Security;