Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-09-06 06:00:55 +00:00 committed by GitHub
commit 82535bc9c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 189 additions and 38 deletions

View file

@ -10498,6 +10498,12 @@
githubId = 40720523;
name = "MangoIV";
};
manipuladordedados = {
email = "manipuladordedados@gmail.com";
github = "manipuladordedados";
githubId = 1189862;
name = "Valter Nazianzeno";
};
manojkarthick = {
email = "smanojkarthick@gmail.com";
github = "manojkarthick";

View file

@ -8,6 +8,8 @@ trivialBuild {
hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4=";
};
version = "1.1.2";
meta = {
description = "Like caps-lock, but for your control key. Give your pinky a rest!";
homepage = "https://www.emacswiki.org/emacs/control-lock.el";

View file

@ -10,6 +10,8 @@ trivialBuild {
sha256 = "0x6qsgs4hm87k0z9q3g4p6508kc3y123j5jayll3jf3lcl2vm6ks";
};
version = "1.10";
meta = {
broken = true;
description = "Minor mode provides useful features for editing perl codes";

View file

@ -1,24 +1,37 @@
{ lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }:
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, cmake
, hunspell
, qtbase
, qtmultimedia
, qttools
, qt5compat
, qtwayland
, wrapQtAppsHook
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "focuswriter";
version = "1.7.6";
version = "1.8.5";
src = fetchurl {
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l";
src = fetchFromGitHub {
owner = "gottcode";
repo = "focuswriter";
rev = "v${version}";
hash = "sha256-6wvTlC/NCCcN2jpwqtoOsCln3ViY/vj7NpMsbYHBGiI=";
};
nativeBuildInputs = [ pkg-config qmake qttools ];
buildInputs = [ hunspell qtbase qtmultimedia ];
nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ];
buildInputs = [ hunspell qtbase qtmultimedia qt5compat qtwayland ];
qmakeFlags = [ "PREFIX=/" ];
installFlags = [ "INSTALL_ROOT=$(out)" ];
meta = with lib; {
description = "Simple, distraction-free writing environment";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ madjar ];
maintainers = with maintainers; [ madjar kashw2 ];
platforms = platforms.linux;
homepage = "https://gottcode.org/focuswriter/";
};

View file

@ -8,10 +8,10 @@ buildGoModule rec {
owner = "hypnoglow";
repo = pname;
rev = "v${version}";
sha256 = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk=";
hash = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk=";
};
vendorSha256 = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8=";
vendorHash = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''
@ -34,7 +34,7 @@ buildGoModule rec {
'';
meta = with lib; {
description = "A Helm plugin that shows a diff";
description = "A Helm plugin that allows to set up a chart repository using AWS S3";
homepage = "https://github.com/hypnoglow/helm-s3";
license = licenses.mit;
maintainers = with maintainers; [ yurrriq ];

View file

@ -3,7 +3,7 @@
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
{ pname
, version ? null
, version
, buildInputs ? []
, packageRequires ? []
, meta ? {}
@ -19,8 +19,8 @@ let
};
in
stdenv.mkDerivation ({
name = "emacs-${pname}${lib.optionalString (version != null) "-${version}"}";
stdenv.mkDerivation (finalAttrs: ({
name = "emacs-${pname}-${finalAttrs.version}";
unpackCmd = ''
case "$curSrc" in
@ -83,4 +83,4 @@ stdenv.mkDerivation ({
'';
}
// removeAttrs args [ "buildInputs" "packageRequires" "meta" ])
// removeAttrs args [ "buildInputs" "packageRequires" "meta" ]))

View file

@ -0,0 +1,32 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
}:
buildNpmPackage rec {
pname = "coffeescript";
version = "2.7.0";
src = fetchFromGitHub {
owner = "jashkenas";
repo = "coffeescript";
rev = version;
hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0=";
};
npmDepsHash = "sha256-mCm31OwI3wjq8taKRQuEj4+IWVZO9Z5KuIDBf39lYoQ=";
env = {
PUPPETEER_SKIP_DOWNLOAD = true;
};
dontNpmBuild = true;
meta = {
description = "A little language that compiles into JavaScript";
homepage = "https://github.com/jashkenas/coffeescript";
license = lib.licenses.mit;
mainProgram = "coffee";
maintainers = with lib.maintainers; [ cdmistman ];
};
}

View file

@ -0,0 +1,111 @@
{ lib
, stdenv
, meson
, ninja
, fetchFromGitHub
, fetchFromGitLab
, re2c
, gperf
, gawk
, xxd
, pkg-config
, boost182
, fmt
, luajit_openresty
, ncurses
, serd
, sord
, libcap
, liburing
, openssl
, asciidoctor
}:
let
emilua-http-wrap = fetchFromGitHub {
owner = "BoostGSoC14";
repo = "boost.http";
rev = "93ae527c89ffc517862e1f5f54c8a257278f1195";
name = "emilua-http";
hash = "sha256-MN29YwkTi0TJ2V+vRI9nUIxvJKsG+j3nT3o0yQB3p0o=";
};
trial-protocol-wrap = fetchFromGitHub {
owner = "breese";
repo = "trial.protocol";
rev = "79149f604a49b8dfec57857ca28aaf508069b669";
name = "trial-protocol";
hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw=";
};
in
stdenv.mkDerivation rec {
pname = "emilua";
version = "0.4.3";
src = fetchFromGitLab {
owner = "emilua";
repo = "emilua";
rev = "v${version}";
hash = "sha256-vZITPQ1qUHhw24c0HKdR6VenviOc6JizQQ8w7K94irc=";
};
buildInputs = [
luajit_openresty
boost182
fmt
ncurses
serd
sord
libcap
liburing
openssl
];
nativeBuildInputs = [
re2c
gperf
gawk
xxd
pkg-config
asciidoctor
meson
ninja
];
# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
env = {
BOOST_INCLUDEDIR = "${lib.getDev boost182}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost182}/lib";
};
mesonFlags = [
"-Dversion_suffix=-nixpkgs1"
"-Denable_http=true"
"-Denable_file_io=true"
"-Denable_io_uring=true"
"-Denable_linux_namespaces=true"
"-Denable_tests=true"
"-Denable_manpages=true"
];
postPatch = ''
pushd subprojects
cp -r ${emilua-http-wrap} emilua-http
cp -r ${trial-protocol-wrap} trial-protocol
chmod +w emilua-http trial-protocol
cp "packagefiles/emilua-http/meson.build" "emilua-http/"
cp "packagefiles/trial.protocol/meson.build" "trial-protocol/"
popd
substituteInPlace src/emilua_gperf.awk --replace '#!/usr/bin/env -S gawk --file' '#!${gawk}/bin/gawk -f'
'';
meta = with lib; {
description = "Lua execution engine";
homepage = "https://emilua.org/";
license = licenses.boost;
maintainers = with maintainers; [ manipuladordedados ];
platforms = platforms.linux;
};
}

View file

@ -58,6 +58,7 @@ mapAliases {
castnow = pkgs.castnow; # added 2023-07-30
inherit (pkgs) clean-css-cli; # added 2023-08-18
coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
coffee-script = pkgs.coffeescript; # added 2023-08-18
inherit (pkgs) configurable-http-proxy; # added 2023-08-19
inherit (pkgs) cordova; # added 2023-08-18
dat = throw "dat was removed because it was broken"; # added 2023-08-21

View file

@ -5,7 +5,6 @@
"@electron-forge/cli" = "electron-forge";
"@microsoft/rush" = "rush";
"@webassemblyjs/cli-1.11.1" = "wasm2wast";
coffee-script = "coffee";
"@withgraphite/graphite-cli" = "gt";
# Packages that provide a single executable.

View file

@ -89,7 +89,6 @@
, "coc-yaml"
, "coc-yank"
, "code-theme-converter"
, "coffee-script"
, "coinmon"
, "concurrently"
, "conventional-changelog-cli"

View file

@ -80103,24 +80103,6 @@ in
bypassCache = true;
reconstructLock = true;
};
coffee-script = nodeEnv.buildNodePackage {
name = "coffee-script";
packageName = "coffee-script";
version = "1.12.7";
src = fetchurl {
url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==";
};
buildInputs = globalBuildInputs;
meta = {
description = "Unfancy JavaScript";
homepage = "http://coffeescript.org";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
coinmon = nodeEnv.buildNodePackage {
name = "coinmon";
packageName = "coinmon";

View file

@ -15668,6 +15668,8 @@ with pkgs;
cmdstan = callPackage ../development/compilers/cmdstan { };
coffeescript = callPackage ../development/compilers/coffeescript { };
comby = callPackage ../development/tools/comby { };
inherit (coqPackages) compcert;
@ -17875,6 +17877,8 @@ with pkgs;
zuo = callPackage ../development/interpreters/zuo { };
### LUA interpreters
emilua = callPackage ../development/interpreters/emilua { };
luaInterpreters = callPackage ./../development/interpreters/lua-5 { };
inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0 luajit_openresty;
@ -31724,7 +31728,7 @@ with pkgs;
focus-stack = callPackage ../applications/graphics/focus-stack { };
focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { };
focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { };
foliate = callPackage ../applications/office/foliate { };