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: 823c7b37308e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 83992fd7c6f9
Choose a head ref
  • 1 commit
  • 3 files changed
  • 2 contributors

Commits on Nov 11, 2020

  1. bisoncpp: init (#103316) 

    * bobcat: 4.08.03 -> 5.05.00; switch homepage

* bisoncpp: init at 6.04.00

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
    @7c6f434c @SuperSandro2000
    7c6f434c and SuperSandro2000 authored Nov 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    kurtmckee Kurt McKee
    GPG key ID: 64713C0B5BA8E1C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    83992fd View commit details
Showing with 64 additions and 5 deletions.
  1. +6 −5 pkgs/development/libraries/bobcat/default.nix
  2. +56 −0 pkgs/development/tools/parsing/bisonc++/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
11 changes: 6 additions & 5 deletions pkgs/development/libraries/bobcat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub, icmake
{ stdenv, fetchFromGitLab, icmake
, libmilter, libX11, openssl, readline
, utillinux, yodl }:

stdenv.mkDerivation rec {
pname = "bobcat";
version = "4.08.03";
version = "5.05.00";

src = fetchFromGitHub {
sha256 = "163mdl8hxids7123bjxmqhcaqyc1dv7hv8k33s713ac6lzawarq2";
src = fetchFromGitLab {
sha256 = "sha256:14lvxzkxmkk54s97ah996m6s1wbw1g3iwawbhsf8qw7sf75vlp1h";
domain = "gitlab.com";
rev = version;
repo = "bobcat";
owner = "fbb-git";
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "Brokken's Own Base Classes And Templates";
homepage = "https://fbb-git.github.io/bobcat/";
homepage = "https://fbb-git.gitlab.io/bobcat/";
license = licenses.gpl3;
platforms = platforms.linux;
};
56 changes: 56 additions & 0 deletions pkgs/development/tools/parsing/bisonc++/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{stdenv, fetchurl, fetchFromGitLab
, yodl, icmake, flexcpp, bobcat
}:
stdenv.mkDerivation rec {
pname = "bisonc++";
version = "6.04.00";

src = fetchFromGitLab {
domain = "gitlab.com";
owner = "fbb-git";
repo = "bisoncpp";
rev = "6.04.00";
sha256 = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl";
};

buildInputs = [ bobcat ];

nativeBuildInputs = [ yodl icmake flexcpp ];

setSourceRoot = ''
sourceRoot="$(echo */bisonc++)"
'';

gpl = fetchurl {
url = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt";
sha256 = "sha256:0hq6i0dm4420825fdm0lnnppbil6z67ls67n5kgjcd912dszjxw1";
};

postPatch = ''
substituteInPlace INSTALL.im --replace /usr $out
patchShebangs .
for file in $(find documentation -type f); do
substituteInPlace "$file" --replace /usr/share/common-licenses/GPL ${gpl}
substituteInPlace "$file" --replace /usr $out
done
'';

buildPhase = ''
./build program
./build man
./build manual
'';

installPhase = ''
./build install x
'';

meta = with stdenv.lib; {
inherit version;
description = "A parser generator like bison, but it generates C++ code";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
homepage = "https://fbb-git.gitlab.io/bisoncpp/";
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -10910,6 +10910,8 @@ in
};
});

bisoncpp = callPackage ../development/tools/parsing/bisonc++ { };

black = with python3Packages; toPythonApplication black;

blackfire = callPackage ../development/tools/misc/blackfire { };