Skip to content

Commit

Permalink
vendor: 2.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
inclyc committed Jun 18, 2024
1 parent 271307d commit 6fc32fe
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 57 deletions.
27 changes: 14 additions & 13 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ lib
, stdenv
, boost182
, gtest
, lit
, llvmPackages
, meson
, ninja
, nix
, nixpkgs-fmt
, pkg-config
, nlohmann_json
{
lib,
stdenv,
boost182,
gtest,
lit,
llvmPackages,
meson,
ninja,
nix,
nixpkgs-fmt,
pkg-config,
nlohmann_json,
}:

stdenv.mkDerivation {
pname = "nixd";
version = "2.1.0";
version = "2.2.1";

src = ./.;

Expand Down
30 changes: 17 additions & 13 deletions libnixf/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
{ lib
, stdenv
, meson
, ninja
, pkg-config
, lit
, nixpkgs-fmt
, gtest
, boost182
, nlohmann_json
{
lib,
stdenv,
meson,
ninja,
pkg-config,
lit,
nixpkgs-fmt,
gtest,
boost182,
nlohmann_json,
}:

stdenv.mkDerivation {
pname = "nixf";
version = "2.2.0";
version = "2.2.1";

src = ../.;

outputs = [ "out" "bin" "dev" ];
outputs = [
"out"
"bin"
"dev"
];

mesonBuildType = "release";

Expand All @@ -41,7 +46,6 @@ stdenv.mkDerivation {
nlohmann_json
];


meta = {
mainProgram = "nixf";
description = "Nix language frontend, parser & semantic analysis";
Expand Down
2 changes: 1 addition & 1 deletion libnixf/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project( 'nixf'
, ['c', 'cpp']
, default_options : ['cpp_std=gnu++20']
, version: '2.2.0'
, version: '2.2.1'
)

nlohmann_json = dependency('nlohmann_json')
Expand Down
2 changes: 1 addition & 1 deletion libnixf/src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ libnixf = library(

pkgconfig.generate(
name: 'nixf',
version: '2.2.0',
version: '2.2.1',
description: 'libnixf',
libraries: libnixf
)
Expand Down
25 changes: 14 additions & 11 deletions libnixt/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
{ lib
, stdenv
, meson
, ninja
, pkg-config
, nix
, gtest
, boost182
{
lib,
stdenv,
meson,
ninja,
pkg-config,
nix,
gtest,
boost182,
}:

stdenv.mkDerivation {
pname = "nixt";
version = "2.2.0";
version = "2.2.1";

src = ../.;

outputs = [ "out" "dev" ];
outputs = [
"out"
"dev"
];

mesonBuildType = "release";

Expand All @@ -36,7 +40,6 @@ stdenv.mkDerivation {

env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";


meta = {
mainProgram = "nixt";
description = "Nix language frontend, parser & semantic analysis";
Expand Down
2 changes: 1 addition & 1 deletion libnixt/lib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ libnixt = library('nixt',
)

pkgconfig.generate(name: 'nixt',
version: '2.2.0',
version: '2.2.1',
description: 'nix compatible layer',
subdirs: [ 'nixt' ],
libraries: libnixt,
Expand Down
2 changes: 1 addition & 1 deletion libnixt/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project( 'nixt'
, ['c', 'cpp']
, default_options : ['cpp_std=gnu++20']
, version: '2.2.0'
, version: '2.2.1'
)

boost = dependency('boost')
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project( 'nixd'
, ['c', 'cpp']
, default_options : ['cpp_std=gnu++20']
, version: '2.1.0'
, version: '2.2.1'
)

config_h = configuration_data()
Expand Down
31 changes: 17 additions & 14 deletions nixd/default.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
{ lib
, stdenv
, meson
, ninja
, pkg-config
, nix
, nixf
, nixt
, llvmPackages
, gtest
, boost182
{
lib,
stdenv,
meson,
ninja,
pkg-config,
nix,
nixf,
nixt,
llvmPackages,
gtest,
boost182,
}:

let
pname = "nixd";
in
stdenv.mkDerivation {
inherit pname;
version = "2.2.0";
version = "2.2.1";

src = ../.;

outputs = [ "out" "dev" ];
outputs = [
"out"
"dev"
];

mesonBuildType = "release";

Expand All @@ -45,7 +49,6 @@ stdenv.mkDerivation {

env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";


meta = {
mainProgram = "nixd";
description = "Nix language server";
Expand Down
2 changes: 1 addition & 1 deletion nixd/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project( 'nixd'
, ['c', 'cpp']
, default_options : ['cpp_std=gnu++20']
, version: '2.2.0'
, version: '2.2.1'
)

config_h = configuration_data()
Expand Down

0 comments on commit 6fc32fe

Please sign in to comment.