Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5a4b2057d6c2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9488fe009c59
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Oct 9, 2019

  1. maintainers: add Yumasi

    Signed-off-by: Guillaume Pagnoux <gpagnoux@gmail.com>
    Yumasi committed Oct 9, 2019
    Copy the full SHA
    e2c8c1a View commit details
  2. boxfort: init at unstable-2019-09-19

    Signed-off-by: Guillaume Pagnoux <gpagnoux@gmail.com>
    Yumasi committed Oct 9, 2019
    Copy the full SHA
    b76e290 View commit details
  3. criterion: init at 2.3.3

    Signed-off-by: Guillaume Pagnoux <gpagnoux@gmail.com>
    Yumasi committed Oct 9, 2019
    Copy the full SHA
    b76cfaf View commit details

Commits on Nov 7, 2019

  1. Merge pull request #70403 from Yumasi/criterion

    criterion: init at 2.3.3
    matthewbauer authored Nov 7, 2019
    Copy the full SHA
    9488fe0 View commit details
Showing with 110 additions and 0 deletions.
  1. +10 −0 maintainers/maintainer-list.nix
  2. +47 −0 pkgs/development/libraries/boxfort/default.nix
  3. +49 −0 pkgs/development/libraries/criterion/default.nix
  4. +4 −0 pkgs/top-level/all-packages.nix
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -7324,6 +7324,16 @@
githubId = 1866448;
name = "Eric Bailey";
};
Yumasi = {
email = "gpagnoux@gmail.com";
github = "Yumasi";
githubId = 24368641;
name = "Guillaume Pagnoux";
keys = [{
longkeyid = "rsa4096/0xEC5065899AEAAF4C";
fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C";
}];
};
yvt = {
email = "i@yvt.jp";
github = "yvt";
47 changes: 47 additions & 0 deletions pkgs/development/libraries/boxfort/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{ stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libcsptr, dyncall
, nanomsg, python37Packages }:

stdenv.mkDerivation rec {
version = "unstable-2019-09-19";
pname = "boxfort";

src = fetchFromGitHub {
owner = "Snaipe";
repo = "BoxFort";
rev = "926bd4ce968592dbbba97ec1bb9aeca3edf29b0d";
sha256 = "0mzy4f8qij6ckn5578y3l4rni2470pdkjy5xww7ak99l1kh3p3v6";
};

enableParallelBuilding = true;

nativeBuildInputs = [ cmake pkg-config ];

buildInputs = [
dyncall
gettext
libcsptr
nanomsg
];

checkInputs = with python37Packages; [ cram ];

cmakeFlags = [ "-DBXF_FORK_RESILIENCE=OFF" ];

doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
'';

outputs = [ "dev" "out" ];

meta = with stdenv.lib; {
description = "Convenient & cross-platform sandboxing C library";
homepage = "https://github.com/Snaipe/BoxFort";
license = licenses.mit;
maintainers = with maintainers; [
thesola10
Yumasi
];
platforms = platforms.unix;
};
}
49 changes: 49 additions & 0 deletions pkgs/development/libraries/criterion/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{ stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext
, dyncall , nanomsg, python37Packages }:

stdenv.mkDerivation rec {
version = "2.3.3";
pname = "criterion";

src = fetchFromGitHub {
owner = "Snaipe";
repo = "Criterion";
rev = "v${version}";
sha256 = "0y1ay8is54k3y82vagdy0jsa3nfkczpvnqfcjm5n9iarayaxaq8p";
fetchSubmodules = true;
};

enableParallelBuilding = true;

nativeBuildInputs = [ cmake pkg-config ];

buildInputs = [
boxfort.dev
dyncall
gettext
libcsptr
nanomsg
];

checkInputs = with python37Packages; [ cram ];

cmakeFlags = [ "-DCTESTS=ON" ];
doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
'';
checkTarget = "criterion_tests test";

outputs = [ "dev" "out" ];

meta = with stdenv.lib; {
description = "A cross-platform C and C++ unit testing framework for the 21th century";
homepage = "https://github.com/Snaipe/Criterion";
license = licenses.mit;
maintainers = with maintainers; [
thesola10
Yumasi
];
platforms = platforms.unix;
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -10625,6 +10625,8 @@ in

box2d = callPackage ../development/libraries/box2d { };

boxfort = callPackage ../development/libraries/boxfort { };

buddy = callPackage ../development/libraries/buddy { };

bulletml = callPackage ../development/libraries/bulletml { };
@@ -10772,6 +10774,8 @@ in

cre2 = callPackage ../development/libraries/cre2 { };

criterion = callPackage ../development/libraries/criterion { };

croaring = callPackage ../development/libraries/croaring { };

cryptopp = callPackage ../development/libraries/crypto++ { };