lol

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
848091ac bcf3e3f1

+189 -38
+6
maintainers/maintainer-list.nix
··· 10498 githubId = 40720523; 10499 name = "MangoIV"; 10500 }; 10501 manojkarthick = { 10502 email = "smanojkarthick@gmail.com"; 10503 github = "manojkarthick";
··· 10498 githubId = 40720523; 10499 name = "MangoIV"; 10500 }; 10501 + manipuladordedados = { 10502 + email = "manipuladordedados@gmail.com"; 10503 + github = "manipuladordedados"; 10504 + githubId = 1189862; 10505 + name = "Valter Nazianzeno"; 10506 + }; 10507 manojkarthick = { 10508 email = "smanojkarthick@gmail.com"; 10509 github = "manojkarthick";
+2
pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix
··· 8 hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4="; 9 }; 10 11 meta = { 12 description = "Like caps-lock, but for your control key. Give your pinky a rest!"; 13 homepage = "https://www.emacswiki.org/emacs/control-lock.el";
··· 8 hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4="; 9 }; 10 11 + version = "1.1.2"; 12 + 13 meta = { 14 description = "Like caps-lock, but for your control key. Give your pinky a rest!"; 15 homepage = "https://www.emacswiki.org/emacs/control-lock.el";
+2
pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix
··· 10 sha256 = "0x6qsgs4hm87k0z9q3g4p6508kc3y123j5jayll3jf3lcl2vm6ks"; 11 }; 12 13 meta = { 14 broken = true; 15 description = "Minor mode provides useful features for editing perl codes";
··· 10 sha256 = "0x6qsgs4hm87k0z9q3g4p6508kc3y123j5jayll3jf3lcl2vm6ks"; 11 }; 12 13 + version = "1.10"; 14 + 15 meta = { 16 broken = true; 17 description = "Minor mode provides useful features for editing perl codes";
+23 -10
pkgs/applications/editors/focuswriter/default.nix
··· 1 - { lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: 2 3 - mkDerivation rec { 4 pname = "focuswriter"; 5 - version = "1.7.6"; 6 7 - src = fetchurl { 8 - url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; 9 - sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l"; 10 }; 11 12 - nativeBuildInputs = [ pkg-config qmake qttools ]; 13 - buildInputs = [ hunspell qtbase qtmultimedia ]; 14 15 - qmakeFlags = [ "PREFIX=/" ]; 16 installFlags = [ "INSTALL_ROOT=$(out)" ]; 17 18 meta = with lib; { 19 description = "Simple, distraction-free writing environment"; 20 license = licenses.gpl3Plus; 21 - maintainers = with maintainers; [ madjar ]; 22 platforms = platforms.linux; 23 homepage = "https://gottcode.org/focuswriter/"; 24 };
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , pkg-config 5 + , cmake 6 + , hunspell 7 + , qtbase 8 + , qtmultimedia 9 + , qttools 10 + , qt5compat 11 + , qtwayland 12 + , wrapQtAppsHook 13 + }: 14 15 + stdenv.mkDerivation rec { 16 pname = "focuswriter"; 17 + version = "1.8.5"; 18 19 + src = fetchFromGitHub { 20 + owner = "gottcode"; 21 + repo = "focuswriter"; 22 + rev = "v${version}"; 23 + hash = "sha256-6wvTlC/NCCcN2jpwqtoOsCln3ViY/vj7NpMsbYHBGiI="; 24 }; 25 26 + nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; 27 + buildInputs = [ hunspell qtbase qtmultimedia qt5compat qtwayland ]; 28 29 installFlags = [ "INSTALL_ROOT=$(out)" ]; 30 31 meta = with lib; { 32 description = "Simple, distraction-free writing environment"; 33 license = licenses.gpl3Plus; 34 + maintainers = with maintainers; [ madjar kashw2 ]; 35 platforms = platforms.linux; 36 homepage = "https://gottcode.org/focuswriter/"; 37 };
+3 -3
pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
··· 8 owner = "hypnoglow"; 9 repo = pname; 10 rev = "v${version}"; 11 - sha256 = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk="; 12 }; 13 14 - vendorSha256 = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8="; 15 16 # NOTE: Remove the install and upgrade hooks. 17 postPatch = '' ··· 34 ''; 35 36 meta = with lib; { 37 - description = "A Helm plugin that shows a diff"; 38 homepage = "https://github.com/hypnoglow/helm-s3"; 39 license = licenses.mit; 40 maintainers = with maintainers; [ yurrriq ];
··· 8 owner = "hypnoglow"; 9 repo = pname; 10 rev = "v${version}"; 11 + hash = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk="; 12 }; 13 14 + vendorHash = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8="; 15 16 # NOTE: Remove the install and upgrade hooks. 17 postPatch = '' ··· 34 ''; 35 36 meta = with lib; { 37 + description = "A Helm plugin that allows to set up a chart repository using AWS S3"; 38 homepage = "https://github.com/hypnoglow/helm-s3"; 39 license = licenses.mit; 40 maintainers = with maintainers; [ yurrriq ];
+4 -4
pkgs/build-support/emacs/generic.nix
··· 3 { lib, stdenv, emacs, texinfo, writeText, gcc, ... }: 4 5 { pname 6 - , version ? null 7 , buildInputs ? [] 8 , packageRequires ? [] 9 , meta ? {} ··· 19 }; 20 in 21 22 - stdenv.mkDerivation ({ 23 - name = "emacs-${pname}${lib.optionalString (version != null) "-${version}"}"; 24 25 unpackCmd = '' 26 case "$curSrc" in ··· 83 ''; 84 } 85 86 - // removeAttrs args [ "buildInputs" "packageRequires" "meta" ])
··· 3 { lib, stdenv, emacs, texinfo, writeText, gcc, ... }: 4 5 { pname 6 + , version 7 , buildInputs ? [] 8 , packageRequires ? [] 9 , meta ? {} ··· 19 }; 20 in 21 22 + stdenv.mkDerivation (finalAttrs: ({ 23 + name = "emacs-${pname}-${finalAttrs.version}"; 24 25 unpackCmd = '' 26 case "$curSrc" in ··· 83 ''; 84 } 85 86 + // removeAttrs args [ "buildInputs" "packageRequires" "meta" ]))
+32
pkgs/development/compilers/coffeescript/default.nix
···
··· 1 + { lib 2 + , buildNpmPackage 3 + , fetchFromGitHub 4 + }: 5 + 6 + buildNpmPackage rec { 7 + pname = "coffeescript"; 8 + version = "2.7.0"; 9 + 10 + src = fetchFromGitHub { 11 + owner = "jashkenas"; 12 + repo = "coffeescript"; 13 + rev = version; 14 + hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0="; 15 + }; 16 + 17 + npmDepsHash = "sha256-mCm31OwI3wjq8taKRQuEj4+IWVZO9Z5KuIDBf39lYoQ="; 18 + 19 + env = { 20 + PUPPETEER_SKIP_DOWNLOAD = true; 21 + }; 22 + 23 + dontNpmBuild = true; 24 + 25 + meta = { 26 + description = "A little language that compiles into JavaScript"; 27 + homepage = "https://github.com/jashkenas/coffeescript"; 28 + license = lib.licenses.mit; 29 + mainProgram = "coffee"; 30 + maintainers = with lib.maintainers; [ cdmistman ]; 31 + }; 32 + }
+111
pkgs/development/interpreters/emilua/default.nix
···
··· 1 + { lib 2 + , stdenv 3 + , meson 4 + , ninja 5 + , fetchFromGitHub 6 + , fetchFromGitLab 7 + , re2c 8 + , gperf 9 + , gawk 10 + , xxd 11 + , pkg-config 12 + , boost182 13 + , fmt 14 + , luajit_openresty 15 + , ncurses 16 + , serd 17 + , sord 18 + , libcap 19 + , liburing 20 + , openssl 21 + , asciidoctor 22 + }: 23 + 24 + let 25 + emilua-http-wrap = fetchFromGitHub { 26 + owner = "BoostGSoC14"; 27 + repo = "boost.http"; 28 + rev = "93ae527c89ffc517862e1f5f54c8a257278f1195"; 29 + name = "emilua-http"; 30 + hash = "sha256-MN29YwkTi0TJ2V+vRI9nUIxvJKsG+j3nT3o0yQB3p0o="; 31 + }; 32 + 33 + trial-protocol-wrap = fetchFromGitHub { 34 + owner = "breese"; 35 + repo = "trial.protocol"; 36 + rev = "79149f604a49b8dfec57857ca28aaf508069b669"; 37 + name = "trial-protocol"; 38 + hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw="; 39 + }; 40 + in 41 + stdenv.mkDerivation rec { 42 + pname = "emilua"; 43 + version = "0.4.3"; 44 + 45 + src = fetchFromGitLab { 46 + owner = "emilua"; 47 + repo = "emilua"; 48 + rev = "v${version}"; 49 + hash = "sha256-vZITPQ1qUHhw24c0HKdR6VenviOc6JizQQ8w7K94irc="; 50 + }; 51 + 52 + buildInputs = [ 53 + luajit_openresty 54 + boost182 55 + fmt 56 + ncurses 57 + serd 58 + sord 59 + libcap 60 + liburing 61 + openssl 62 + ]; 63 + 64 + nativeBuildInputs = [ 65 + re2c 66 + gperf 67 + gawk 68 + xxd 69 + pkg-config 70 + asciidoctor 71 + meson 72 + ninja 73 + ]; 74 + 75 + # Meson is no longer able to pick up Boost automatically. 76 + # https://github.com/NixOS/nixpkgs/issues/86131 77 + env = { 78 + BOOST_INCLUDEDIR = "${lib.getDev boost182}/include"; 79 + BOOST_LIBRARYDIR = "${lib.getLib boost182}/lib"; 80 + }; 81 + 82 + mesonFlags = [ 83 + "-Dversion_suffix=-nixpkgs1" 84 + "-Denable_http=true" 85 + "-Denable_file_io=true" 86 + "-Denable_io_uring=true" 87 + "-Denable_linux_namespaces=true" 88 + "-Denable_tests=true" 89 + "-Denable_manpages=true" 90 + ]; 91 + 92 + postPatch = '' 93 + pushd subprojects 94 + cp -r ${emilua-http-wrap} emilua-http 95 + cp -r ${trial-protocol-wrap} trial-protocol 96 + chmod +w emilua-http trial-protocol 97 + cp "packagefiles/emilua-http/meson.build" "emilua-http/" 98 + cp "packagefiles/trial.protocol/meson.build" "trial-protocol/" 99 + popd 100 + 101 + substituteInPlace src/emilua_gperf.awk --replace '#!/usr/bin/env -S gawk --file' '#!${gawk}/bin/gawk -f' 102 + ''; 103 + 104 + meta = with lib; { 105 + description = "Lua execution engine"; 106 + homepage = "https://emilua.org/"; 107 + license = licenses.boost; 108 + maintainers = with maintainers; [ manipuladordedados ]; 109 + platforms = platforms.linux; 110 + }; 111 + }
+1
pkgs/development/node-packages/aliases.nix
··· 58 castnow = pkgs.castnow; # added 2023-07-30 59 inherit (pkgs) clean-css-cli; # added 2023-08-18 60 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 61 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 62 inherit (pkgs) cordova; # added 2023-08-18 63 dat = throw "dat was removed because it was broken"; # added 2023-08-21
··· 58 castnow = pkgs.castnow; # added 2023-07-30 59 inherit (pkgs) clean-css-cli; # added 2023-08-18 60 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 61 + coffee-script = pkgs.coffeescript; # added 2023-08-18 62 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 63 inherit (pkgs) cordova; # added 2023-08-18 64 dat = throw "dat was removed because it was broken"; # added 2023-08-21
-1
pkgs/development/node-packages/main-programs.nix
··· 5 "@electron-forge/cli" = "electron-forge"; 6 "@microsoft/rush" = "rush"; 7 "@webassemblyjs/cli-1.11.1" = "wasm2wast"; 8 - coffee-script = "coffee"; 9 "@withgraphite/graphite-cli" = "gt"; 10 11 # Packages that provide a single executable.
··· 5 "@electron-forge/cli" = "electron-forge"; 6 "@microsoft/rush" = "rush"; 7 "@webassemblyjs/cli-1.11.1" = "wasm2wast"; 8 "@withgraphite/graphite-cli" = "gt"; 9 10 # Packages that provide a single executable.
-1
pkgs/development/node-packages/node-packages.json
··· 89 , "coc-yaml" 90 , "coc-yank" 91 , "code-theme-converter" 92 - , "coffee-script" 93 , "coinmon" 94 , "concurrently" 95 , "conventional-changelog-cli"
··· 89 , "coc-yaml" 90 , "coc-yank" 91 , "code-theme-converter" 92 , "coinmon" 93 , "concurrently" 94 , "conventional-changelog-cli"
-18
pkgs/development/node-packages/node-packages.nix
··· 80103 bypassCache = true; 80104 reconstructLock = true; 80105 }; 80106 - coffee-script = nodeEnv.buildNodePackage { 80107 - name = "coffee-script"; 80108 - packageName = "coffee-script"; 80109 - version = "1.12.7"; 80110 - src = fetchurl { 80111 - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; 80112 - sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="; 80113 - }; 80114 - buildInputs = globalBuildInputs; 80115 - meta = { 80116 - description = "Unfancy JavaScript"; 80117 - homepage = "http://coffeescript.org"; 80118 - license = "MIT"; 80119 - }; 80120 - production = true; 80121 - bypassCache = true; 80122 - reconstructLock = true; 80123 - }; 80124 coinmon = nodeEnv.buildNodePackage { 80125 name = "coinmon"; 80126 packageName = "coinmon";
··· 80103 bypassCache = true; 80104 reconstructLock = true; 80105 }; 80106 coinmon = nodeEnv.buildNodePackage { 80107 name = "coinmon"; 80108 packageName = "coinmon";
+5 -1
pkgs/top-level/all-packages.nix
··· 15678 15679 cmdstan = callPackage ../development/compilers/cmdstan { }; 15680 15681 comby = callPackage ../development/tools/comby { }; 15682 15683 inherit (coqPackages) compcert; ··· 17885 zuo = callPackage ../development/interpreters/zuo { }; 17886 17887 ### LUA interpreters 17888 luaInterpreters = callPackage ./../development/interpreters/lua-5 { }; 17889 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; 17890 ··· 31734 31735 focus-stack = callPackage ../applications/graphics/focus-stack { }; 31736 31737 - focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; 31738 31739 foliate = callPackage ../applications/office/foliate { }; 31740
··· 15678 15679 cmdstan = callPackage ../development/compilers/cmdstan { }; 15680 15681 + coffeescript = callPackage ../development/compilers/coffeescript { }; 15682 + 15683 comby = callPackage ../development/tools/comby { }; 15684 15685 inherit (coqPackages) compcert; ··· 17887 zuo = callPackage ../development/interpreters/zuo { }; 17888 17889 ### LUA interpreters 17890 + emilua = callPackage ../development/interpreters/emilua { }; 17891 + 17892 luaInterpreters = callPackage ./../development/interpreters/lua-5 { }; 17893 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; 17894 ··· 31738 31739 focus-stack = callPackage ../applications/graphics/focus-stack { }; 31740 31741 + focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { }; 31742 31743 foliate = callPackage ../applications/office/foliate { }; 31744