Skip to content

Commit

Permalink
Merge master into staging-next
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Mar 19, 2023
2 parents c70342c + 5a05160 commit 4d82a45
Show file tree
Hide file tree
Showing 38 changed files with 731 additions and 280 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/editors/your-editor/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "your-editor";
version = "1504";
version = "1505";

src = fetchFromGitHub {
owner = "your-editor";
repo = "yed";
rev = version;
sha256 = "sha256-EUDkuCMhBz/Gs4DW3V6fqU583MzqXy1r08WDnUN76cw=";
sha256 = "sha256-4HPrBr1M8J484qu1cXpZyVdLu3+/IYoNnNV9vSd4SlY=";
};

installPhase = ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@
"vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M="
},
"argocd": {
"hash": "sha256-FDI/kmgTWVhxJcy3ss8VABntOXJAIDIcz4cB6WtJd2Y=",
"hash": "sha256-nxNZ0W8tcnnUhqf2S8tM6CvupYS4ALamYg3zYZQScA8=",
"homepage": "https://registry.terraform.io/providers/oboukili/argocd",
"owner": "oboukili",
"repo": "terraform-provider-argocd",
"rev": "v4.3.0",
"rev": "v5.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ="
"vendorHash": "sha256-KgEX0h+WgcVjMMgNb5QJJNQjqAxQ8ATolVXZBro+adQ="
},
"auth0": {
"hash": "sha256-y2pjk+rSLAM7H4XjwvwZSNFW4+9EhN3fb01cml6RTb0=",
Expand Down Expand Up @@ -901,13 +901,13 @@
"vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs="
},
"postgresql": {
"hash": "sha256-6QqXp0riYy6pJPmESrUv3J9BDY9Sl44/U2sIB663Gfw=",
"hash": "sha256-VQu0NrBbBx951V+H10Q1/pmYjtwg2vuFW25mNXZ3NoI=",
"homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql",
"owner": "cyrilgdn",
"repo": "terraform-provider-postgresql",
"rev": "v1.18.0",
"rev": "v1.19.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE="
"vendorHash": "sha256-JsKxNS2JlYIfTsiV/2WVB51i2OuZI1PNZDrxOuloaX0="
},
"powerdns": {
"hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=",
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/werf/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@

buildGoModule rec {
pname = "werf";
version = "1.2.207";
version = "1.2.212";

src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-qAptDffM4ZufEPmrhxlGgMyNoih7JYptUVnPfyXy7ok=";
hash = "sha256-P1cmimlSOHtBXOYW3uYbAQ6Jfh7huk121Jdz/5zp8PY=";
};

vendorHash = "sha256-QQ0CjyBz1gY6o2I45DA9iD7rrJGVTvWvl4u8ZHuHNeg=";
vendorHash = "sha256-YGC6+pJyohwiM8Bg+C5GrhaqsZeKE+gHOI21ot3xj14=";

proxyVendor = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

stdenv.mkDerivation rec {
pname = "obs-pipewire-audio-capture";
version = "1.0.5";
version = "1.1.0";

src = fetchFromGitHub {
owner = "dimtpap";
repo = pname;
rev = "${version}";
sha256 = "sha256-AXqBdwu5ayzQPIVOhqspDHnQo422y3WGA+kmW1DzoL0=";
sha256 = "sha256-gcOH8gJuP03MxhJbgl941yTtm2XIHmqHWVwkRCVATkQ=";
};

nativeBuildInputs = [ cmake ninja pkg-config ];
Expand Down
35 changes: 35 additions & 0 deletions pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ lib
, fetchFromGitHub
, stdenvNoCC
}:

stdenvNoCC.mkDerivation {
pname = "cbqn-bytecode";
version = "unstable-2023-01-27";

src = fetchFromGitHub {
owner = "dzaima";
repo = "cbqnBytecode";
rev = "b2f47806ea770451d06d04e20177baeaec92e6dd";
hash = "sha256-dukpEB5qg6jF4AIHKK+atTvCKZTVtJ1M/nw7+SNp250=";
};

dontConfigure = true;
dontBuild = true;

installPhase = ''
runHook preInstall
install -D $src/gen/{compiles,explain,formatter,runtime0,runtime1,src} -t $out/dev
runHook postInstall
'';

meta = with lib; {
homepage = "https://github.com/dzaima/cbqnBytecode";
description = "CBQN precompiled bytecode";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ];
platforms = platforms.all;
};
}
60 changes: 27 additions & 33 deletions pkgs/development/interpreters/bqn/cbqn/default.nix
Original file line number Diff line number Diff line change
@@ -1,44 +1,36 @@
{ lib
{ callPackage
, lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, genBytecode ? false
, bqn-path ? null
, mbqn-source ? null
, enableReplxx ? false
, enableSingeli ? stdenv.hostPlatform.avx2Support
# No support for macOS' .dylib on the CBQN side
, enableLibcbqn ? stdenv.hostPlatform.isLinux
, libffi
, pkg-config
}:

let
# TODO: these submodules should be separated libraries
cbqn-bytecode-files = fetchFromGitHub {
name = "cbqn-bytecode-files";
owner = "dzaima";
repo = "CBQN";
rev = "3df8ae563a626ff7ae0683643092f0c3bc2481e5";
hash = "sha256:0rh9qp1bdm9aa77l0kn9n4jdy08gl6l7898lncskxiq9id6xvyb8";
};
replxx-submodule = fetchFromGitHub {
name = "replxx-submodule";
owner = "dzaima";
repo = "replxx";
rev = "ba94c293caad52486df8712e808783df9a8f4501";
hash = "sha256-pMLvURksj/5k5b6BTwWxjomoROMOE5+GRjyaoqu/iYE=";
};
cbqn-bytecode-submodule =
callPackage ./cbqn-bytecode.nix { inherit lib fetchFromGitHub stdenvNoCC; };
replxx-submodule = callPackage ./replxx.nix { inherit lib fetchFromGitHub stdenvNoCC; };
singeli-submodule = callPackage ./singeli.nix { inherit lib fetchFromGitHub stdenvNoCC; };
in
assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));

stdenv.mkDerivation rec {
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
version = "0.pre+date=2022-11-27";
version = "unstable-2023-02-01";

src = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
rev = "49c0d9a355698f54fff2c0caa177e2b341fabb45";
hash = "sha256-jm2ZzFxhr9o4nFR2rjYJz/4GH+WFnfU4QDovrOPI3jQ=";
rev = "05c1270344908e98c9f2d06b3671c3646f8634c3";
hash = "sha256-wKeyYWMgTZPr+Ienz3xnsXeD67vwdK4sXbQlW+GpQho=";
};

nativeBuildInputs = [
Expand All @@ -62,7 +54,7 @@ stdenv.mkDerivation rec {

buildFlags = [
# interpreter binary
"o3"
(lib.flatten (if enableSingeli then ["o3n-singeli" "f='-mavx2'"] else ["o3"]))
] ++ lib.optionals enableLibcbqn [
# embeddable interpreter as a shared lib
"shared-o3"
Expand All @@ -74,11 +66,14 @@ stdenv.mkDerivation rec {
'' + (if genBytecode then ''
${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/
'' else ''
cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/
cp -r ${cbqn-bytecode-submodule}/dev/* build/bytecodeLocal/gen/
'')
+ lib.optionalString enableReplxx ''
cp -r ${replxx-submodule} build/replxxLocal/
'';
cp -r ${replxx-submodule}/dev/* build/replxxLocal/
''
+ lib.optionalString enableSingeli ''
cp -r ${singeli-submodule}/dev/* build/singeliLocal/
'';

outputs = [
"out"
Expand All @@ -88,20 +83,20 @@ stdenv.mkDerivation rec {
];

installPhase = ''
runHook preInstall
runHook preInstall
mkdir -p $out/bin/
cp BQN -t $out/bin/
# note guard condition for case-insensitive filesystems
[ -e $out/bin/bqn ] || ln -s $out/bin/BQN $out/bin/bqn
[ -e $out/bin/cbqn ] || ln -s $out/bin/BQN $out/bin/cbqn
mkdir -p $out/bin/
cp BQN -t $out/bin/
# note guard condition for case-insensitive filesystems
[ -e $out/bin/bqn ] || ln -s $out/bin/BQN $out/bin/bqn
[ -e $out/bin/cbqn ] || ln -s $out/bin/BQN $out/bin/cbqn
''
+ lib.optionalString enableLibcbqn ''
install -Dm644 include/bqnffi.h -t "$dev/include"
install -Dm755 libcbqn${stdenv.hostPlatform.extensions.sharedLibrary} -t "$lib/lib"
install -Dm644 include/bqnffi.h -t "$dev/include"
install -Dm755 libcbqn${stdenv.hostPlatform.extensions.sharedLibrary} -t "$lib/lib"
''
+ ''
runHook postInstall
runHook postInstall
'';

meta = with lib; {
Expand All @@ -112,5 +107,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
};
}
# TODO: version cbqn-bytecode-files
# TODO: test suite
37 changes: 37 additions & 0 deletions pkgs/development/interpreters/bqn/cbqn/replxx.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ lib
, fetchFromGitHub
, stdenvNoCC
}:

stdenvNoCC.mkDerivation {
pname = "replxx";
version = "unstable-2023-01-21";

src = fetchFromGitHub {
owner = "dzaima";
repo = "replxx";
rev = "eb6bcecff4ca6051120c99e9dd64c3bd20fcc42f";
hash = "sha256-cb486FGF+4sUxgBbRfnbTTnZn2WQ3p93fSwDRCEtFJg=";
};

dontConfigure = true;
# The CBQN derivation will build replxx, here we just provide the source files.
dontBuild = true;

installPhase = ''
runHook preInstall
mkdir -p $out/dev
cp -r $src $out/dev
runHook postInstall
'';

meta = with lib; {
homepage = "https://github.com/dzaima/replxx";
description = "A replxx fork for CBQN";
license = licenses.free;
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ];
platforms = platforms.all;
};
}
37 changes: 37 additions & 0 deletions pkgs/development/interpreters/bqn/cbqn/singeli.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ lib
, fetchFromGitHub
, stdenvNoCC
}:

stdenvNoCC.mkDerivation {
pname = "singeli";
version = "unstable-2023-01-23";

src = fetchFromGitHub {
owner = "mlochbaum";
repo = "Singeli";
rev = "0bc519ccbbe4051204d40bfc861a5bed7132e95f";
hash = "sha256-zo4yr9t3hp6BOX1ac3md6R/O+hl5MphZdCmI8nNP9Yc=";
};

dontConfigure = true;
# The CBQN derivation will build Singeli, here we just provide the source files.
dontBuild = true;

installPhase = ''
runHook preInstall
mkdir -p $out/dev
cp -r $src $out/dev
runHook postInstall
'';

meta = with lib; {
homepage = "https://github.com/mlochbaum/Singeli";
description = "A metaprogramming DSL for SIMD";
license = licenses.isc;
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ];
platforms = platforms.all;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/rakudo/zef.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "zef";
version = "0.18.0";
version = "0.18.1";

src = fetchFromGitHub {
owner = "ugexe";
repo = "zef";
rev = "v${version}";
sha256 = "sha256-u/K1R0ILoDvHvHb0QzGB4YHlIf70jVeVEmrquv2U0S8=";
sha256 = "sha256-F4q8cHM1CLp9FLZTo6WmxEiK2sqmAx3LOHevNXn2kOw=";
};

nativeBuildInputs = [ makeWrapper ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/cln/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, gmp }:
{ lib, gccStdenv, fetchurl, gmp }:

stdenv.mkDerivation rec {
gccStdenv.mkDerivation rec {
pname = "cln";
version = "1.3.6";

Expand Down
29 changes: 29 additions & 0 deletions pkgs/development/libraries/llhttp/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ lib, stdenv, fetchFromGitHub, cmake }:

stdenv.mkDerivation rec {
pname = "llhttp";
version = "8.1.0";

src = fetchFromGitHub {
owner = "nodejs";
repo = "llhttp";
rev = "release/v${version}";
hash = "sha256-pBGjcT5MiCSJI12TiH1XH5eAzIeylCdP/82L3o38BJo=";
};

nativeBuildInputs = [
cmake
];

cmakeFlags = [
"-DBUILD_STATIC_LIBS=ON"
];

meta = with lib; {
description = "Port of http_parser to llparse";
homepage = "https://llhttp.org/";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
platforms = platforms.all;
};
}
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/aardwolf/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib
, stdenv
, arc4
, asn1crypto
, asn1tools
Expand All @@ -7,6 +8,7 @@
, buildPythonPackage
, colorama
, fetchFromGitHub
, iconv
, minikerberos
, pillow
, pyperclip
Expand Down Expand Up @@ -62,6 +64,8 @@ buildPythonPackage rec {
tqdm
unicrypto
winsspi
] ++ lib.optionals (stdenv.isDarwin) [
iconv
];

# Module doesn't have tests
Expand Down
Loading

0 comments on commit 4d82a45

Please sign in to comment.