Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
9905c2647a
73 changed files with 10054 additions and 617 deletions
|
|
@ -1382,6 +1382,12 @@
|
|||
githubId = 28444296;
|
||||
name = "Benjamin Hougland";
|
||||
};
|
||||
billewanick = {
|
||||
email = "bill@ewanick.com";
|
||||
github = "billewanick";
|
||||
githubId = 13324165;
|
||||
name = "Bill Ewanick";
|
||||
};
|
||||
binarin = {
|
||||
email = "binarin@binarin.ru";
|
||||
github = "binarin";
|
||||
|
|
|
|||
|
|
@ -163,11 +163,11 @@ in
|
|||
description = ''
|
||||
Whether to install documentation targeted at developers.
|
||||
<itemizedlist>
|
||||
<listitem><para>This includes man pages targeted at developers if <option>man.enable</option> is
|
||||
<listitem><para>This includes man pages targeted at developers if <option>documentation.man.enable</option> is
|
||||
set (this also includes "devman" outputs).</para></listitem>
|
||||
<listitem><para>This includes info pages targeted at developers if <option>info.enable</option>
|
||||
<listitem><para>This includes info pages targeted at developers if <option>documentation.info.enable</option>
|
||||
is set (this also includes "devinfo" outputs).</para></listitem>
|
||||
<listitem><para>This includes other pages targeted at developers if <option>doc.enable</option>
|
||||
<listitem><para>This includes other pages targeted at developers if <option>documentation.doc.enable</option>
|
||||
is set (this also includes "devdoc" outputs).</para></listitem>
|
||||
</itemizedlist>
|
||||
'';
|
||||
|
|
@ -181,10 +181,10 @@ in
|
|||
<itemizedlist>
|
||||
<listitem><para>This includes man pages like
|
||||
<citerefentry><refentrytitle>configuration.nix</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry> if <option>man.enable</option> is
|
||||
<manvolnum>5</manvolnum></citerefentry> if <option>documentation.man.enable</option> is
|
||||
set.</para></listitem>
|
||||
<listitem><para>This includes the HTML manual and the <command>nixos-help</command> command if
|
||||
<option>doc.enable</option> is set.</para></listitem>
|
||||
<option>documentation.doc.enable</option> is set.</para></listitem>
|
||||
</itemizedlist>
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
{ trivialBuild
|
||||
, haskellPackages
|
||||
}
|
||||
|
||||
trivialBuild {
|
||||
pname = "agda-input";
|
||||
|
||||
inherit (haskellPackages.Agda) src version;
|
||||
|
||||
postUnpack = ''
|
||||
mv $sourceRoot/src/data/emacs-mode/agda-input.el $sourceRoot
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (haskellPackages.Agda.meta) homepage license;
|
||||
description = "Standalone package providing the agda-input method without building Agda.";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ trivialBuild
|
||||
, haskellPackages
|
||||
}:
|
||||
|
||||
trivialBuild rec {
|
||||
pname = "agda-mode";
|
||||
version = pkgs.haskellPackages.Agda.version;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
# already byte-compiled by Agda builder
|
||||
buildPhase = ''
|
||||
agda=`${pkgs.haskellPackages.Agda}/bin/agda-mode locate`
|
||||
cp `dirname $agda`/*.el* .
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (pkgs.haskellPackages.Agda.meta) homepage license;
|
||||
description = "Agda2-mode for Emacs extracted from Agda package";
|
||||
longDescription = ''
|
||||
Wrapper packages that liberates init.el from `agda-mode locate` magic.
|
||||
Simply add this to user profile or systemPackages and do `(require
|
||||
'agda2)` in init.el.
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
trivialBuild rec {
|
||||
pname = "apheleia";
|
||||
version = "0.0.0+unstable=2021-08-08";
|
||||
|
||||
|
|
@ -19,19 +20,6 @@ stdenv.mkDerivation rec {
|
|||
emacs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el *.elc $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/raxod502/apheleia";
|
||||
description = "Asynchronous buffer reformat";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
pname = "bqn-mode";
|
||||
version = "0.0.0+unstable=-2021-09-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlochbaum";
|
||||
repo = "BQN";
|
||||
rev = "fb6ec1d8b083cd2b335828ae22e978b1b13986fa";
|
||||
hash = "sha256-57ryT5gb7hToAJOiGjjgU87rmlswjPK9tV1iQzJ4C0Y=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
sourceRoot="$sourceRoot/editors/emacs"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mlochbaum.github.io/BQN/editors/index.html";
|
||||
description = "Emacs mode for BQN";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +1,33 @@
|
|||
{ stdenv, cedille, emacs }:
|
||||
{ stdenv
|
||||
, cedille
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cedille-mode";
|
||||
version = cedille.version;
|
||||
|
||||
src = cedille.src;
|
||||
inherit (cedille) version src;
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install se-mode/*.el se-mode/*.elc $out/share/emacs/site-lisp
|
||||
install cedille-mode/*.el cedille-mode/*.elc $out/share/emacs/site-lisp
|
||||
install *.el *.elc $out/share/emacs/site-lisp
|
||||
substituteInPlace $out/share/emacs/site-lisp/cedille-mode.el \
|
||||
--replace /usr/bin/cedille ${cedille}/bin/cedille \
|
||||
--replace /usr/bin/cedille ${cedille}/bin/cedille
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (cedille.meta)
|
||||
homepage license maintainers platforms;
|
||||
description = "Emacs major mode for Cedille";
|
||||
homepage = cedille.meta.homepage;
|
||||
license = cedille.meta.license ;
|
||||
platforms = cedille.meta.platforms;
|
||||
maintainers = cedille.meta.maintainers;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,38 @@
|
|||
{lib, stdenv, fetchzip, emacs, color-theme}:
|
||||
let
|
||||
commit = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "color-theme-solarized-1.0.0";
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
, color-theme
|
||||
}:
|
||||
|
||||
src = fetchzip {
|
||||
trivialBuild {
|
||||
pname = "color-theme-solarized";
|
||||
version = "0.0.0+unstable=2017-10-24";
|
||||
|
||||
url = "https://github.com/sellout/emacs-color-theme-solarized/archive/${commit}.zip";
|
||||
sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sellout";
|
||||
repo = "emacs-color-theme-solarized";
|
||||
rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee";
|
||||
hash = "sha256-oxX0lo6sxotEiR3nPrKPE9H01HKB3ohB/p8eEHFTp5k=";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
propagatedUserEnvPkgs = [ color-theme ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs -L . -L ${color-theme}/share/emacs/site-lisp/elpa/color-theme-* --batch -f batch-byte-compile *.el
|
||||
'';
|
||||
runHook preBuild
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install *.el* $out/share/emacs/site-lisp
|
||||
emacs -L . -L ${color-theme}/share/emacs/site-lisp/elpa/color-theme-* \
|
||||
--batch -f batch-byte-compile *.el
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Precision colors for machines and people";
|
||||
homepage = "http://ethanschoonover.com/solarized";
|
||||
maintainers = [ maintainers.samuelrivas ];
|
||||
description = "Precision colors for machines and people; Emacs implementation";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ samuelrivas AndersonTorres ];
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,33 @@
|
|||
{ stdenv, fetchurl, makeWrapper, emacs, tcl, tclx, espeak-ng, lib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, emacs
|
||||
, tcl
|
||||
, tclx
|
||||
, espeak-ng
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emacspeak";
|
||||
version = "54.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tvraman/emacspeak/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-wsIqiW4UtgdAhqPqgCKgF37+hAtmAelAEnme1W9PKes=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tvraman";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash= "sha256-aOZ8PmkASJKETPhXhE9WQXyJS7SPe+d97fK/piqqzqc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper emacs ];
|
||||
buildInputs = [ tcl tclx espeak-ng ];
|
||||
nativeBuildInputs = [
|
||||
emacs
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
espeak-ng
|
||||
tcl
|
||||
tclx
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
make config
|
||||
|
|
@ -32,11 +49,11 @@ stdenv.mkDerivation rec {
|
|||
--add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tvraman/emacspeak/";
|
||||
description = "Emacs extension that provides spoken output";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
{ lib, stdenv, fetchgit }:
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ess-R-object-popup-20130302";
|
||||
trivialBuild rec {
|
||||
pname = "ess-R-object-popup";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/myuhe/ess-R-object-popup.el.git";
|
||||
rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948";
|
||||
sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "myuhe";
|
||||
repo = "ess-R-object-popup.el";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YN8ZLXEbwTFdFfovkV2IXV9v6y/PTgCdiRQqbpRaF2E=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
cp *.el *.elc $out/share/emacs/site-lisp/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Popup descriptions of R objects";
|
||||
homepage = "https://github.com/myuhe/ess-R-object-popup.el";
|
||||
platforms = lib.platforms.all;
|
||||
description = "Popup descriptions of R objects";
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,46 +1,35 @@
|
|||
{ stdenv, fetchFromGitHub, emacs, emacsPackages, lib }:
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
, emacsPackages
|
||||
}:
|
||||
|
||||
let
|
||||
runtimeDeps = with emacsPackages; [
|
||||
evil
|
||||
markdown-mode
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
trivialBuild rec {
|
||||
pname = "evil-markdown";
|
||||
version = "2020-06-01";
|
||||
version = "0.0.0+unstable=2021-07-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Somelauw";
|
||||
repo = "evil-markdown";
|
||||
rev = "064fe9b4767470472356d20bdd08e2f30ebbc9ac";
|
||||
sha256 = "sha256-Kt2wxG1XCFowavVWtj0urM/yURKegonpZcxTy/+CrJY=";
|
||||
rev = "8e6cc68af83914b2fa9fd3a3b8472573dbcef477";
|
||||
hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
emacs
|
||||
] ++ runtimeDeps;
|
||||
] ++ propagatedUserEnvPkgs;
|
||||
|
||||
propagatedUserEnvPkgs = runtimeDeps;
|
||||
propagatedUserEnvPkgs = with emacsPackages; [
|
||||
evil
|
||||
markdown-mode
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el *.elc $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Vim-like keybindings for markdown-mode";
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Somelauw/evil-markdown";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ leungbk ];
|
||||
platforms = emacs.meta.platforms;
|
||||
description = "Integrates Emacs evil and markdown";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ leungbk ];
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,22 @@
|
|||
{ fetchurl, lib, trivialBuild, writeText }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, trivialBuild
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
pname = "font-lock+";
|
||||
version = "20180101.25";
|
||||
pname = "font-lock-plus";
|
||||
version = "208+unstable=2018-01-01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.emacswiki.org/emacs/download/font-lock%2b.el?revision=25";
|
||||
sha256 = "0197yzn4hbjmw5h3m08264b7zymw63pdafph5f3yzfm50q8p7kp4";
|
||||
name = "font-lock+.el";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacsmirror";
|
||||
repo = "font-lock-plus";
|
||||
rev = "f2c1ddcd4c9d581bd32be88fad026b49f98b6541";
|
||||
hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/font-lock+";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/emacsmirror/font-lock-plus";
|
||||
description = "Enhancements to standard library font-lock.el";
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
trivialBuild {
|
||||
pname = "git-undo";
|
||||
version = "0.0.0+unstable=2019-12-21";
|
||||
|
||||
|
|
@ -15,28 +15,11 @@ stdenv.mkDerivation {
|
|||
sha256 = "sha256-cVkK9EF6qQyVV3uVqnBEjF8e9nEx/8ixnM8PvxqCyYE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
emacs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el *.elc $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jwiegley/git-undo-el";
|
||||
description = "Revert region to most recent Git-historical version";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ leungbk ];
|
||||
platforms = emacs.meta.platforms;
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,28 @@
|
|||
{ lib, stdenv, fetchgit }:
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, dictionary
|
||||
, emacs
|
||||
, helm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "helm-words-20190917";
|
||||
trivialBuild rec {
|
||||
pname = "helm-words";
|
||||
version = "0.0.0+unstable=2019-03-12";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/pronobis/helm-words.git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacsmirror";
|
||||
repo = pname;
|
||||
rev = "e6387ece1940a06695b9d910de3d90252efb8d29";
|
||||
sha256 = "1ly0mbzlgc26fqvf7rxpmy698g0cf9qldrwrx022ar6r68l1h7xf";
|
||||
hash = "sha256-rh8YKDLZZCUE6JnnRnFyDDyUjK+35+M2dkawR/+qwNM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
cp *.el *.elc $out/share/emacs/site-lisp/
|
||||
'';
|
||||
packageRequires = [ helm dictionary ];
|
||||
|
||||
meta = {
|
||||
description = "Emacs major mode for jade and stylus";
|
||||
homepage = "https://github.com/brianc/helm-words";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.all;
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/emacsmirror/helm-words";
|
||||
description = "Helm extension for looking up words in dictionaries and thesauri";
|
||||
license = licenses.gpl3Plus;
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, emacs }:
|
||||
|
||||
let
|
||||
version = "3.6-4-gb659bf8";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ido-ubiquitous";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarwinAwardWinner";
|
||||
repo = "ido-ubiquitous";
|
||||
rev = version;
|
||||
sha256 = "06r8qpfr60gc673w881m0nplj91b6bfw77bxgl6irz1z9bp7cc4y";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el *.elc $out/share/emacs/site-lisp
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
trivialBuild {
|
||||
pname = "isearch-plus";
|
||||
version = "3434+unstable=2021-08-23";
|
||||
|
||||
|
|
@ -15,28 +15,11 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
emacs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el *.elc $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.emacswiki.org/emacs/IsearchPlus";
|
||||
description = "Extensions to isearch";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ leungbk AndersonTorres ];
|
||||
platforms = emacs.meta.platforms;
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, trivialBuild
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
trivialBuild {
|
||||
pname = "isearch-prop";
|
||||
version = "0.0.0+unstable=2019-05-01";
|
||||
|
||||
|
|
@ -15,28 +15,11 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
emacs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el *.elc $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.emacswiki.org/emacs/IsearchPlus";
|
||||
description = "Search text- or overlay-property contexts";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ leungbk ];
|
||||
platforms = emacs.meta.platforms;
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,23 @@
|
|||
{ trivialBuild, lib, fetchurl }:
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
trivialBuild rec {
|
||||
pname = "jam-mode";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.gentoo.org/~ulm/distfiles/jam-mode-${version}.el.xz";
|
||||
sha256 = "1jchgiy2rgvnb3swr6ar72yas6pj4inpgpcq78q01q6snflmi2fh";
|
||||
url = "https://dev.gentoo.org/~ulm/distfiles/${pname}-${version}.el.xz";
|
||||
hash = "sha256-0IlYqbPa4AAwOpjdd20k8hqtvDhZmcz1WHa/LHx8kMk=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
xz -cd $src > jam-mode.el
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
{ trivialBuild
|
||||
, llvmPackages
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
pname = "llvm-mode";
|
||||
inherit (llvmPackages.llvm) src version;
|
||||
|
||||
postUnpack = ''
|
||||
sourceRoot="$sourceRoot/utils/emacs"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (llvmPackages.llvm.meta) homepage license;
|
||||
description = "Major mode for the LLVM assembler language";
|
||||
};
|
||||
}
|
||||
|
|
@ -42,67 +42,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
agda2-mode = trivialBuild {
|
||||
pname = "agda-mode";
|
||||
version = pkgs.haskellPackages.Agda.version;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
# already byte-compiled by Agda builder
|
||||
buildPhase = ''
|
||||
agda=`${pkgs.haskellPackages.Agda}/bin/agda-mode locate`
|
||||
cp `dirname $agda`/*.el* .
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Agda2-mode for Emacs extracted from Agda package";
|
||||
longDescription = ''
|
||||
Wrapper packages that liberates init.el from `agda-mode locate` magic.
|
||||
Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el.
|
||||
'';
|
||||
homepage = pkgs.haskellPackages.Agda.meta.homepage;
|
||||
license = pkgs.haskellPackages.Agda.meta.license;
|
||||
};
|
||||
};
|
||||
|
||||
agda-input = self.trivialBuild {
|
||||
pname = "agda-input";
|
||||
|
||||
inherit (pkgs.haskellPackages.Agda) src version;
|
||||
|
||||
postUnpack = "mv $sourceRoot/src/data/emacs-mode/agda-input.el $sourceRoot";
|
||||
|
||||
meta = {
|
||||
description = "Standalone package providing the agda-input method without building Agda.";
|
||||
inherit (pkgs.haskellPackages.Agda.meta) homepage license;
|
||||
};
|
||||
};
|
||||
|
||||
# may be part of MELPA in the future, see
|
||||
# https://github.com/mlochbaum/BQN/issues/10#issuecomment-912982874
|
||||
bqn-mode = self.trivialBuild {
|
||||
pname = "bqn-mode";
|
||||
version = "unstable-2021-09-04";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "mlochbaum";
|
||||
repo = "BQN";
|
||||
rev = "e623a2fcafdf5fd6c8d31570175284805c4f34d9";
|
||||
sha256 = "1a2lpxy3bak4724r0ns4la5d0j6484ngi73kcwp82vgbbpk7lcrp";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
sourceRoot="$sourceRoot/editors/emacs"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Emacs mode for BQN";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
homepage = "https://mlochbaum.github.io/BQN/editors/index.html";
|
||||
};
|
||||
};
|
||||
|
||||
ghc-mod = melpaBuild {
|
||||
pname = "ghc";
|
||||
version = pkgs.haskellPackages.ghc-mod.version;
|
||||
|
|
@ -154,21 +93,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
llvm-mode = trivialBuild {
|
||||
pname = "llvm-mode";
|
||||
inherit (pkgs.llvmPackages.llvm) src version;
|
||||
|
||||
dontConfigure = true;
|
||||
buildPhase = ''
|
||||
cp utils/emacs/*.el .
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (pkgs.llvmPackages.llvm.meta) homepage license;
|
||||
description = "Major mode for the LLVM assembler language.";
|
||||
};
|
||||
};
|
||||
|
||||
matrix-client = let
|
||||
rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";
|
||||
in melpaBuild
|
||||
|
|
@ -224,37 +148,17 @@
|
|||
|
||||
};
|
||||
|
||||
ott-mode = self.trivialBuild {
|
||||
pname = "ott-mod";
|
||||
agda2-mode = callPackage ./agda2-mode { };
|
||||
|
||||
inherit (pkgs.ott) src version;
|
||||
agda-input = callPackage ./agda-input{ };
|
||||
|
||||
postUnpack = "mv $sourceRoot/emacs/ott-mode.el $sourceRoot";
|
||||
bqn-mode = callPackage ./bqn-mode { };
|
||||
|
||||
meta = {
|
||||
description = "Standalone package providing ott-mode without building ott and with compiled bytecode.";
|
||||
inherit (pkgs.haskellPackages.Agda.meta) homepage license;
|
||||
};
|
||||
};
|
||||
llvm-mode = callPackage ./llvm-mode { };
|
||||
|
||||
urweb-mode = self.trivialBuild {
|
||||
pname = "urweb-mode";
|
||||
ott-mode = callPackage ./ott-mode { };
|
||||
|
||||
inherit (pkgs.urweb) src version;
|
||||
|
||||
packageRequires = [
|
||||
self.cl-lib
|
||||
self.flycheck
|
||||
];
|
||||
|
||||
postUnpack = "sourceRoot=$sourceRoot/src/elisp";
|
||||
|
||||
meta = {
|
||||
description = "Major mode for editing Ur/Web";
|
||||
inherit (pkgs.urweb.meta) license homepage;
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
};
|
||||
};
|
||||
urweb-mode = callPackage ./urweb-mode { };
|
||||
|
||||
# Packages made the classical callPackage way
|
||||
|
||||
|
|
@ -262,6 +166,8 @@
|
|||
|
||||
ebuild-mode = callPackage ./ebuild-mode { };
|
||||
|
||||
evil-markdown = callPackage ./evil-markdown { };
|
||||
|
||||
emacspeak = callPackage ./emacspeak { };
|
||||
|
||||
ement = callPackage ./ement { };
|
||||
|
|
@ -282,8 +188,6 @@
|
|||
|
||||
nano-theme = callPackage ./nano-theme { };
|
||||
|
||||
org-mac-link = callPackage ./org-mac-link { };
|
||||
|
||||
perl-completion = callPackage ./perl-completion { };
|
||||
|
||||
plz = callPackage ./plz { };
|
||||
|
|
@ -302,15 +206,12 @@
|
|||
|
||||
youtube-dl = callPackage ./youtube-dl { };
|
||||
|
||||
zeitgeist = callPackage ./zeitgeist { };
|
||||
|
||||
# From old emacsPackages (pre emacsPackagesNg)
|
||||
cedet = callPackage ./cedet { };
|
||||
cedille = callPackage ./cedille { cedille = pkgs.cedille; };
|
||||
color-theme-solarized = callPackage ./color-theme-solarized { };
|
||||
session-management-for-emacs = callPackage ./session-management-for-emacs { };
|
||||
hsc3-mode = callPackage ./hsc3 { };
|
||||
ido-ubiquitous = callPackage ./ido-ubiquitous { };
|
||||
prolog-mode = callPackage ./prolog { };
|
||||
rect-mark = callPackage ./rect-mark { };
|
||||
sunrise-commander = callPackage ./sunrise-commander { };
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, emacs, lib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mu4e-patch";
|
||||
version = "2019-05-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seanfarley";
|
||||
repo = "mu4e-patch";
|
||||
rev = "522da46c1653b1cacc79cde91d6534da7ae9517d";
|
||||
sha256 = "sha256-1lV4dDuCdyCUXi/In2DzYJPEHuAc9Jfbz2ZecNZwn4I=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
emacs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el *.elc $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Colorize patch emails in mu4e";
|
||||
homepage = "https://github.com/seanfarley/mu4e-patch";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ leungbk ];
|
||||
platforms = emacs.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,27 +1,20 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
trivialBuild rec {
|
||||
pname = "nano-theme";
|
||||
version = "2021-06-05";
|
||||
version = "0.0.0+unstable=2021-06-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rougier";
|
||||
repo = pname;
|
||||
rev = "99ff1c5e78296a073c6e63b966045e0d83a136e7";
|
||||
hash = "sha256-IDVnl4J4hx2mlLaiA+tKxxRGcIyBULr2HBeY/GMHD90=";
|
||||
rev = "4a231787a32b3019f9f0abb3511a112fd54bf685";
|
||||
hash = "sha256-eco9BMKLhPuwFJb5QesbM6g3cZv3FdVvQ9fXq6D3Ifc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install *.el $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rougier/nano-theme";
|
||||
description = "GNU Emacs / N Λ N O Theme";
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "org-mac-link";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/stuartsierra/org-mode/master/contrib/lisp/org-mac-link.el";
|
||||
sha256 = "1gkzlfbhg289r1hbqd25szan1wizgk6s99h9xxjip5bjv0jywcx5";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
cp $src org-mac-link.el
|
||||
emacs --batch -f batch-byte-compile org-mac-link.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install org-mac-link.el $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Insert org-mode links to items selected in various Mac apps";
|
||||
homepage = "https://orgmode.org/worg/org-contrib/org-mac-link.html";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
{ trivialBuild
|
||||
, ott
|
||||
, haskellPackages
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
pname = "ott-mode";
|
||||
|
||||
inherit (ott) src version;
|
||||
|
||||
postUnpack = ''
|
||||
mv $sourceRoot/emacs/ott-mode.el $sourceRoot
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Emacs ott mode (from ott sources)";
|
||||
inherit (haskellPackages.Agda.meta) homepage license;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
trivialBuild rec {
|
||||
pname = "power-mode";
|
||||
version = "2021-06-06";
|
||||
version = "0.0.0+unstable=2021-06-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elizagamedev";
|
||||
|
|
@ -15,15 +15,8 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-Wy8o9QTWqvH9cP7xsTpF5QSd4mWNIPXJTadoADKeHWY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install *.el $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rougier/nano-theme";
|
||||
homepage = "https://github.com/elizagamedev/power-mode.el";
|
||||
description = "Imbue Emacs with power!";
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,22 +1,25 @@
|
|||
{ lib, stdenv, fetchgit }:
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "railgun-2012-10-17";
|
||||
trivialBuild {
|
||||
pname = "railgun";
|
||||
version= "0.0.0+unstable=2012-10-17";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mbriggs/railgun.el.git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbriggs";
|
||||
repo = "railgun.el";
|
||||
rev = "66aaa1b091baef53a69d0d7425f48d184b865fb8";
|
||||
sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh";
|
||||
hash = "sha256-0L+jFgrXEPMTptx53RDdyH4BiA+7uInHceXL0eROoAM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
cp *.el *.elc $out/share/emacs/site-lisp/
|
||||
'';
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
meta = {
|
||||
description = "Propel yourself through a rails project with the power of magnets";
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mbriggs/railgun.el";
|
||||
platforms = lib.platforms.all;
|
||||
description = "Propel yourself through a rails project with the power of magnets";
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +1,26 @@
|
|||
{ lib, stdenv, fetchurl, emacs }:
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
trivialBuild rec {
|
||||
pname = "rect-mark";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://emacswiki.org/emacs/download/rect-mark.el";
|
||||
sha256 = "0pyyg53z9irh5jdfvh2qp4pm8qrml9r7lh42wfmdw6c7f56qryh8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacsmirror";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
cp $src rect-mark.el
|
||||
emacs --batch -f batch-byte-compile rect-mark.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install rect-mark.el* $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Mark a rectangle of text with highlighting";
|
||||
meta = with lib; {
|
||||
homepage = "http://emacswiki.org/emacs/RectangleMark";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
description = "Mark a rectangle of text with highlighting";
|
||||
license = licenses.gpl2Plus;
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
trivialBuild rec {
|
||||
pname = "sunrise-commander";
|
||||
version = "0.0.0+unstable=2021-07-22";
|
||||
|
||||
|
|
@ -19,19 +19,6 @@ stdenv.mkDerivation rec {
|
|||
emacs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
emacs -q --no-splash --directory=. --batch --file=batch-byte-compile *.el
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install *.el* $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sunrise-commander/sunrise-commander/";
|
||||
description = "Orthodox (two-pane) file manager for Emacs";
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tramp";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/tramp/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-w+6HJA8kFb75Z+7vM1zDnzOnkSSIXKnLVyCcEh+nMGY=";
|
||||
hash = "sha256-+jjWBcj2dP9Xyj4dzpAX86KnajVa9eFDcjD9xTw6vks=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
|
|||
texinfo
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/tramp";
|
||||
description = "Transparently access remote files from Emacs. Newer versions than built-in.";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
description = "Transparently access remote files from Emacs (latest version)";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, trivialBuild
|
||||
, urweb
|
||||
, cl-lib
|
||||
, flycheck
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
pname = "urweb-mode";
|
||||
|
||||
inherit (urweb) src version;
|
||||
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
flycheck
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
sourceRoot=$sourceRoot/src/elisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Major mode for editing Ur/Web";
|
||||
inherit (urweb.meta) license homepage;
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,12 @@
|
|||
{ stdenv, fetchFromGitHub, emacs, lib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
trivialBuild {
|
||||
pname = "youtube-dl";
|
||||
version = "2018-10-12";
|
||||
version = "0.0.0+unstable=2018-10-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
|
|
@ -13,24 +17,11 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el *.elc $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Emacs frontend to the youtube-dl utility";
|
||||
meta = with lib; {
|
||||
description = "Emacs youtube-dl download manager";
|
||||
homepage = "https://github.com/skeeto/youtube-dl-emacs";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ leungbk ];
|
||||
platforms = emacs.meta.platforms;
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ leungbk ];
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "zeitgeist-20120221";
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/alexmurray/dotfiles/master/.emacs.d/vendor/zeitgeist.el";
|
||||
sha256 = "0fssx3lp8ar3b1ichbagir7z17habv367l7zz719ipycr24rf1nw";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
cp $src $out/share/emacs/site-lisp/zeitgeist.el
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Integreate Emacs with Zeitgeist";
|
||||
homepage = "http://zeitgeist-project.com/";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,6 +7,9 @@
|
|||
# Populate passthru.tests
|
||||
, tests
|
||||
|
||||
# needed to fix "Save as Root"
|
||||
, nodePackages, bash
|
||||
|
||||
# Attributes inherit from specific versions
|
||||
, version, src, meta, sourceRoot
|
||||
, executableName, longName, shortName, pname, updateScript
|
||||
|
|
@ -108,6 +111,21 @@ let
|
|||
)
|
||||
'';
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897
|
||||
postPatch = ''
|
||||
# this is a fix for "save as root" functionality
|
||||
packed="resources/app/node_modules.asar"
|
||||
unpacked="resources/app/node_modules"
|
||||
${nodePackages.asar}/bin/asar extract "$packed" "$unpacked"
|
||||
substituteInPlace $unpacked/sudo-prompt/index.js \
|
||||
--replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \
|
||||
--replace "/bin/bash" "${bash}/bin/bash"
|
||||
rm -rf "$packed"
|
||||
|
||||
# this fixes bundled ripgrep
|
||||
chmod +x resources/app/node_modules/vscode-ripgrep/bin/rg
|
||||
'';
|
||||
|
||||
inherit meta;
|
||||
};
|
||||
|
||||
|
|
|
|||
48
pkgs/applications/misc/ericw-tools/default.nix
Normal file
48
pkgs/applications/misc/ericw-tools/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, gtest, fmt
|
||||
, cmake, ninja, installShellFiles
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ericw-tools";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ericwa";
|
||||
repo = "ericw-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "11sap7qv0rlhw8q25azvhgjcwiql3zam09q0gim3i04cg6fkh0vp";
|
||||
};
|
||||
postUnpack = ''
|
||||
pushd source/3rdparty
|
||||
ln -s ${fmt.src} fmt
|
||||
ln -s ${gtest.src} googletest
|
||||
popd
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja installShellFiles ];
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
for TOOL in bspinfo bsputil light qbsp vis ; do
|
||||
cp -a $TOOL/$TOOL $out/bin/
|
||||
done
|
||||
|
||||
installManPage ../man/*.?
|
||||
|
||||
mkdir -p $doc/share/doc/ericw-tools
|
||||
cp -a ../README.md ../changelog.txt $doc/share/doc/ericw-tools/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ericwa.github.io/ericw-tools/";
|
||||
description = "Map compile tools for Quake and Hexen 2";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-drawer";
|
||||
version = "0.1.8";
|
||||
version = "0.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XEMD5Z0RejySamxmkGBDoAj0ARUyPm/31EPuf96Whlk=";
|
||||
sha256 = "sha256-aUn9zvlNUuvm7Uo0wyzbkSLXfUDcKn1uxAu3pVwq0FA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk=";
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taskwarrior-tui";
|
||||
version = "0.13.29";
|
||||
version = "0.13.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdheepak";
|
||||
repo = "taskwarrior-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-56+/WQESbf31UkJU4xONLY2T+WQVM0bI/x1yLZr3elI=";
|
||||
sha256 = "sha256-vKmVScXQLDjhNJEzlhqiyhRZjR26xjrT1LijxzZK8Cg=";
|
||||
};
|
||||
|
||||
# Because there's a test that requires terminal access
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "sha256-8am66wP2751AAMbWDBKZ89mAgr2poq3CU+aJF+I8/fs=";
|
||||
cargoSha256 = "sha256-0E4nk8WLprumHKQjpdn+U36z7mdgFb7g/i7egLk4Jcs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal user interface for taskwarrior ";
|
||||
|
|
|
|||
65
pkgs/applications/misc/trenchbroom/default.nix
Normal file
65
pkgs/applications/misc/trenchbroom/default.nix
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, ninja, git, pandoc
|
||||
, libGL, libGLU, libXxf86vm, freeimage
|
||||
, qtbase, wrapQtAppsHook
|
||||
, copyDesktopItems, makeDesktopItem
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "TrenchBroom";
|
||||
version = "2021.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TrenchBroom";
|
||||
repo = "TrenchBroom";
|
||||
rev = "v${version}";
|
||||
sha256 = "06j68kp7g57hclyp8ilh2wd4vr5w8r718cicdp1cap48fcxlqfxv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace common/src/Version.h.in \
|
||||
--subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \
|
||||
--subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \
|
||||
--subst-var-by GIT_DESCRIBE v${version}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems ];
|
||||
buildInputs = [ libGL libGLU libXxf86vm freeimage qtbase ];
|
||||
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
QT_QPA_PLATFORM = "offscreen";
|
||||
ninjaFlags = [
|
||||
"TrenchBroom"
|
||||
];
|
||||
preBuild = "export HOME=$(mktemp -d)";
|
||||
|
||||
postInstall = ''
|
||||
pushd $out/share/TrenchBroom/icons
|
||||
|
||||
for F in icon_*.png; do
|
||||
SIZE=$(echo $F|sed -e s/icon_// -e s/.png//)
|
||||
DIR=$out/share/icons/hicolor/$SIZE"x"$SIZE/apps
|
||||
mkdir -p $DIR
|
||||
ln -s ../../../../TrenchBroom/icons/$F $DIR/trenchbroom.png
|
||||
done
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "TrenchBroom";
|
||||
desktopName = "TrenchBroom level editor";
|
||||
icon = "trenchbroom";
|
||||
comment = meta.description;
|
||||
categories = "Development";
|
||||
exec = "trenchbroom";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://trenchbroom.github.io/";
|
||||
description = "Level editor for Quake-engine based games";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkYarnPackage rec {
|
||||
pname = "vieb";
|
||||
version = "5.3.0";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jelmerro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NKWqSnUO8SScEodHYSptRHwVNOa5C4M61ac85d+wYK0=";
|
||||
sha256 = "sha256-3mX6z/CRUQdyQxYK50yqCZIrhPgitsyus4oLkbPqNvM=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qbec";
|
||||
version = "0.14.6";
|
||||
version = "0.14.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "splunk";
|
||||
repo = "qbec";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zsabEYmbWW6lwqyqpPIgCmA4PE6F5Byb8KT/PlLSlvY=";
|
||||
sha256 = "sha256-awuYmazBx7zv/WuDsePzdWNRcpAzLK7lf4L2W2Jbt3A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VOBRQJzATaY9DNRhZvYTRpoISikbzUAwS/1hUfce/44=";
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ let
|
|||
};
|
||||
|
||||
"2.12" = {
|
||||
version = "2.12.14";
|
||||
sha256 = "/X4+QDIogBOinAoUR8WX+vew5Jl2LA2YHbIQmel4BCY=";
|
||||
version = "2.12.15";
|
||||
sha256 = "F5RePKlHjQaoQ2BWqsa5r99g3q/cPjgsbAi2A5IberY=";
|
||||
pname = "scala_2_12";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -187,6 +187,8 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS";
|
||||
description = "A set of libraries for development of security-enabled client and server applications";
|
||||
|
|
|
|||
10
pkgs/development/libraries/nss/update.sh
Executable file
10
pkgs/development/libraries/nss/update.sh
Executable file
|
|
@ -0,0 +1,10 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep gnused coreutils common-updater-scripts
|
||||
|
||||
set -x
|
||||
|
||||
base_url="https://ftp.mozilla.org/pub/security/nss/releases/"
|
||||
|
||||
version="$(curl -sSL ${base_url} | grep 'RTM' | grep -v WITH_CKBI | sed 's|.*>\(NSS_[0-9]*_[0-9]*_*[0-9]*_*[0-9]*_RTM\)/.*|\1|g' | sed 's|NSS_||g' | sed 's|_RTM||g' | sed 's|_|.|g' | sort -V | tail -1)"
|
||||
hash="$(nix-hash --type sha256 --base32 ${base_url}/NSS_${version/\./_}_RTM/src/nss-${version}.tar.gz)"
|
||||
update-source-version nss "${version}" "${hash}"
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "tcltls";
|
||||
version = "1.7.21";
|
||||
version = "1.7.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${version}.tar.gz";
|
||||
sha256 = "0xf1rfsnn4k9j1bd2a1p8ir0xr4a3phgr9lcgbazh4084l2y8sl0";
|
||||
sha256 = "sha256-6E4reideyCxKqp0bH5eG2+Q1jIFekXU5/+f2Z/9Lw7Q=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mat2";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
owner = "jvoisin";
|
||||
repo = "mat2";
|
||||
rev = version;
|
||||
sha256 = "sha256-TxHelOr7ygp4R+dW+oJ034l2w9zrB4gn0QLs5Pa4EFE=";
|
||||
sha256 = "sha256-KaHdBmTeBlCRaVkG3WsfDtFo45s/X69x7VGDYY7W5O8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -50,18 +50,6 @@ buildPythonPackage rec {
|
|||
./executable-name.patch
|
||||
# hardcode path to mat2 executable
|
||||
./tests.patch
|
||||
# remove for next release
|
||||
(fetchpatch {
|
||||
name = "fix-tests-ffmpeg-4.4.patch";
|
||||
url = "https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578.patch";
|
||||
sha256 = "0895dkv6575ps3drdfnli15cggx27n9irjx0axigrm4ql4ma0648";
|
||||
})
|
||||
# fix white space error in the tests for exiftool, remove for next release
|
||||
(fetchpatch {
|
||||
name = "fix-tests-exiftool.patch";
|
||||
url = "https://0xacab.org/jvoisin/mat2/-/commit/6df615281b2a649b85ff7670f6d87d3beed0b977.patch";
|
||||
sha256 = "1gix63n0mzavnqjq5ll0v210z4vdz4f93aq03bfzlgifxcd9vl1x";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,15 +1,17 @@
|
|||
diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop
|
||||
index e623962..5d69ae2 100644
|
||||
index d365bc5..56313e2 100644
|
||||
--- a/dolphin/mat2.desktop
|
||||
+++ b/dolphin/mat2.desktop
|
||||
@@ -7,5 +7,5 @@ Type=Service
|
||||
[Desktop Action cleanMetadata]
|
||||
@@ -8,6 +8,6 @@ Type=Service
|
||||
Name=Clean metadata
|
||||
Name[de]=Metadaten löschen
|
||||
Name[es]=Limpiar metadatos
|
||||
-Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg
|
||||
-Exec=kdialog --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U
|
||||
-Exec[de]=kdialog --yesno "$( mat2 -s %U )" --title "Metadaten löschen?" && mat2 %U
|
||||
+Icon=@mat2svg@
|
||||
+Exec=@kdialog@ --yesno "$( @mat2@ -s %U )" --title "Clean Metadata?" && @mat2@ %U
|
||||
+Exec=@kdialog@ --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U
|
||||
+Exec[de]=@kdialog@ --yesno "$( mat2 -s %U )" --title "Metadaten löschen?" && mat2 %U
|
||||
diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py
|
||||
index 970d5dd..5d3c0b7 100644
|
||||
--- a/libmat2/bubblewrap.py
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymavlink";
|
||||
version = "2.4.15";
|
||||
version = "2.4.16";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "106va20k0ahy0l2qvxf8k5pvqkgdmxbgzd9kij9fkrahlba5mx3v";
|
||||
sha256 = "99b77fdc1389dea7c9dbbfb70143fed707238e00c961ada73b79bcf15b21ca19";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future lxml ];
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@ buildPythonPackage rec {
|
|||
sha256 = "0xbwkjxxysfpqz72qn6n4a0zr2h6sprbcal8j7kzymh7swjy117w";
|
||||
};
|
||||
|
||||
# Backport from the 2.0.0 alpha releases of PySCF.
|
||||
# H5Py > 3.3 deprecates the file modes, that PySCF sets.
|
||||
patches = [ ./h5py.patch ];
|
||||
|
||||
buildInputs = [
|
||||
libcint
|
||||
libxc
|
||||
|
|
|
|||
13
pkgs/development/python-modules/pyscf/h5py.patch
Normal file
13
pkgs/development/python-modules/pyscf/h5py.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/pyscf/lib/misc.py b/pyscf/lib/misc.py
|
||||
index ed43689ff..a8a0d0e20 100644
|
||||
--- a/pyscf/lib/misc.py
|
||||
+++ b/pyscf/lib/misc.py
|
||||
@@ -42,8 +42,6 @@ if h5py.version.version[:4] == '2.2.':
|
||||
sys.stderr.write('h5py-%s is found in your environment. '
|
||||
'h5py-%s has bug in threading mode.\n'
|
||||
'Async-IO is disabled.\n' % ((h5py.version.version,)*2))
|
||||
-if h5py.version.version[:2] == '3.':
|
||||
- h5py.get_config().default_file_mode = 'a'
|
||||
|
||||
c_double_p = ctypes.POINTER(ctypes.c_double)
|
||||
c_int_p = ctypes.POINTER(ctypes.c_int)
|
||||
|
|
@ -34,13 +34,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-runner";
|
||||
version = "2.282.0";
|
||||
version = "2.282.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-381xqBuysT5OR+SDhtSNCz0fOsDM7zC50EatAiXmpHU=";
|
||||
sha256 = "sha256-aDt+8vYR8bnaCmWUo3dqzVIekIr460/JzJkrpiPdIRw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "delve";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
goPackagePath = "github.com/go-delve/delve";
|
||||
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
|
||||
|
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
owner = "go-delve";
|
||||
repo = "delve";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RfBDeBuI/Yk24Q2jX/Re7fvx1bhYWJjqLhRkNHCaM9k=";
|
||||
sha256 = "sha256-dnmV7LZjq86AwLWXfWBGm1pmFM0uipv1FwR6EhV8CZQ=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/dlv" ];
|
||||
|
|
|
|||
|
|
@ -60,12 +60,18 @@ let ccache = stdenv.mkDerivation rec {
|
|||
bashInteractive
|
||||
] ++ lib.optional stdenv.isDarwin xcodebuild;
|
||||
|
||||
checkPhase = ''
|
||||
checkPhase = let
|
||||
badTests = [
|
||||
"test.trim_dir" # flaky on hydra (possibly filesystem-specific?)
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"test.basedir"
|
||||
"test.multi_arch"
|
||||
"test.nocpp2"
|
||||
];
|
||||
in ''
|
||||
runHook preCheck
|
||||
export HOME=$(mktemp -d)
|
||||
ctest --output-on-failure ${lib.optionalString stdenv.isDarwin ''
|
||||
-E '^(test.nocpp2|test.basedir|test.multi_arch|test.trim_dir)$'
|
||||
''}
|
||||
ctest --output-on-failure -E '^(${lib.concatStringsSep "|" badTests})$'
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "skaffold";
|
||||
version = "1.30.0";
|
||||
version = "1.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "skaffold";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-25qUVTHE2bj92cEYziqL2Ih6n7SXCPX/LAc6uvvS1ns=";
|
||||
sha256 = "sha256-j7e+zwt6CxYndwhv1CsUU0qcLkzyBts+k8K0/CqbktQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-mN2H9ohf/IiCSh+pppa3p67MoFPJyJPhtDkLOV2L7pc=";
|
||||
vendorSha256 = "sha256-9/MlQ18c12Jp0f/pGPUAUY5aWY8tRZTHWZEMbaOl6mI=";
|
||||
|
||||
subPackages = ["cmd/skaffold"];
|
||||
|
||||
|
|
|
|||
|
|
@ -680,6 +680,16 @@ let
|
|||
};
|
||||
|
||||
github = {
|
||||
copilot = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
version = "1.4.2678";
|
||||
sha256 = "sha256-NryXLuMIZJngp2dBsGbNhBiblEthckw1Zk2vqMXIzFM=";
|
||||
};
|
||||
meta = { license = lib.licenses.unfree; };
|
||||
};
|
||||
|
||||
github-vscode-theme = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "github-vscode-theme";
|
||||
|
|
|
|||
|
|
@ -13,26 +13,26 @@
|
|||
},
|
||||
"5.10": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.63-hardened1.patch",
|
||||
"sha256": "1v1w6ybfkgqisdprny9bb658443hbld86r96cvzqdkmd8wfh4513",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.63-hardened1/linux-hardened-5.10.63-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.65-hardened1.patch",
|
||||
"sha256": "0zc9amnjfn4dqdn0vagxqpymgmnpqb0h04i0zyc2zr5q33kgqwy9",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.65-hardened1/linux-hardened-5.10.65-hardened1.patch"
|
||||
},
|
||||
"5.13": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.13.15-hardened1.patch",
|
||||
"sha256": "1g75jh5j9qbh4wbiy2wnc982i2gld2845ai47rczcj7ciycba8n7",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.15-hardened1/linux-hardened-5.13.15-hardened1.patch"
|
||||
"name": "linux-hardened-5.13.17-hardened1.patch",
|
||||
"sha256": "18pqc53ny2bpipgcdar8kwnzcm8al1bfa249ydkrmqn7a94nh2p2",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.17-hardened1/linux-hardened-5.13.17-hardened1.patch"
|
||||
},
|
||||
"5.14": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.14.2-hardened1.patch",
|
||||
"sha256": "0hcw61bavhyr9v621ajsrl2zgz7kc0z8r7p5kzm37dnlggwl4qh3",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.2-hardened1/linux-hardened-5.14.2-hardened1.patch"
|
||||
"name": "linux-hardened-5.14.4-hardened1.patch",
|
||||
"sha256": "05izlhlbh867cjxsag4hr9x18zhqnh9mkj3abx9rpqg6fm6qqis6",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.4-hardened1/linux-hardened-5.14.4-hardened1.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.144-hardened1.patch",
|
||||
"sha256": "1vm19d5cwxw3l2s4h7sbzrhk60m24nhbjdlpqd1bkbm8x8zcp9f3",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.144-hardened1/linux-hardened-5.4.144-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.146-hardened1.patch",
|
||||
"sha256": "1bckgkd1cn5qjdq3finz3jfdn9gb18ypvibg3il4aj0a7jay5zra",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.146-hardened1/linux-hardened-5.4.146-hardened1.patch"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.64";
|
||||
version = "5.10.66";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "02p36mf41nsa4bamw18vhgbca094q2blbqqljdsb9qid9b94pf1y";
|
||||
sha256 = "19y8zh6wvjzj55kynfpgm3zbapyhwsqkgilycvmbjr6ipfxhdyjx";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.13.16";
|
||||
version = "5.13.18";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1ljigvcg4q6ckr8kna3q5iyjsy7x5mrf1ycqfy0ibbhn9hbqjna9";
|
||||
sha256 = "0iqz34yjbk5zg8wc9majq7afg34nsgi0yxn0j4k3xrn22kyl2dm2";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.14.3";
|
||||
version = "5.14.5";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1n5808v3vb2c27pv4f8r4avqzqp20dylclbc83cj2872d6z41hy6";
|
||||
sha256 = "1zbcai5q1b5hjc3xhg05pghj5iyb0xsvrqyrazzmhrfbsqf8s5k5";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.145";
|
||||
version = "5.4.147";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1yb8vk5sbnyswylkpqw5i4n9cmnmlrfmbrnmy3nif579q8p7ixsw";
|
||||
sha256 = "07242nlxf4s73ffdir3dsi37cjmm6bw9w7kac0j7x1s1j8sh9h7n";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.14.3";
|
||||
version = "5.14.4";
|
||||
release = "1";
|
||||
suffix = "xanmod${release}-cacule";
|
||||
in
|
||||
|
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
|||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-nl8DktW2TsV20ii/f41TsSotE/yBRBH3SYlWKLsfT50=";
|
||||
sha256 = "sha256-cRm5LVAIKQalcJS00ZM4cQHAiStGOQC+IfWsuPNi4UY=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "heisenbridge";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hifi";
|
||||
repo = "heisenbridge";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PaLOFZTeX7HxBiOc94x5sHuJYKRF1fR9ShmQN7IPuuo=";
|
||||
sha256 = "sha256-7B4orrANb4hTXJ4cFYxhmrOgEIoU3TPmsR239JhIrTw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
113
pkgs/servers/web-apps/lemmy/package.json
Normal file
113
pkgs/servers/web-apps/lemmy/package.json
Normal file
|
|
@ -0,0 +1,113 @@
|
|||
{
|
||||
"name": "lemmy-ui",
|
||||
"version": "0.12.2",
|
||||
"description": "An isomorphic UI for lemmy",
|
||||
"author": "Dessalines <tyhou13@gmx.com>",
|
||||
"license": "AGPL-3.0",
|
||||
"scripts": {
|
||||
"build:dev": "webpack --mode=development",
|
||||
"build:prod": "webpack --mode=production",
|
||||
"clean": "yarn run rimraf dist",
|
||||
"dev": "yarn start",
|
||||
"lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src",
|
||||
"prebuild:dev": "yarn clean && node generate_translations.js",
|
||||
"prebuild:prod": "yarn clean && node generate_translations.js",
|
||||
"start": "yarn build:dev --watch"
|
||||
},
|
||||
"repository": "https://github.com/LemmyNet/lemmy-ui",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/parser": "^4.28.3",
|
||||
"autosize": "^5.0.1",
|
||||
"choices.js": "^9.0.1",
|
||||
"emoji-short-name": "^1.0.0",
|
||||
"express": "~4.17.1",
|
||||
"i18next": "^20.3.3",
|
||||
"inferno": "^7.4.9",
|
||||
"inferno-create-element": "^7.4.9",
|
||||
"inferno-helmet": "^5.2.1",
|
||||
"inferno-hydrate": "^7.4.9",
|
||||
"inferno-i18next": "github:nimbusec-oss/inferno-i18next#semver:^7.4.2",
|
||||
"inferno-router": "^7.4.9",
|
||||
"inferno-server": "^7.4.9",
|
||||
"isomorphic-cookie": "^1.2.4",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"markdown-it": "^12.1.0",
|
||||
"markdown-it-container": "^3.0.0",
|
||||
"markdown-it-sub": "^1.0.0",
|
||||
"markdown-it-sup": "^1.0.0",
|
||||
"moment": "^2.29.1",
|
||||
"reconnecting-websocket": "^4.4.0",
|
||||
"register-service-worker": "^1.7.2",
|
||||
"rxjs": "^7.2.0",
|
||||
"serialize-javascript": "^6.0.0",
|
||||
"tippy.js": "^6.3.1",
|
||||
"toastify-js": "^1.11.1",
|
||||
"tributejs": "^5.1.3",
|
||||
"ws": "^8.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.14.6",
|
||||
"@babel/plugin-transform-runtime": "^7.14.5",
|
||||
"@babel/plugin-transform-typescript": "^7.14.6",
|
||||
"@babel/preset-env": "7.15.0",
|
||||
"@babel/preset-typescript": "^7.14.5",
|
||||
"@babel/runtime": "^7.14.6",
|
||||
"@types/autosize": "^4.0.0",
|
||||
"@types/express": "^4.17.13",
|
||||
"@types/node": "^16.7.1",
|
||||
"@types/node-fetch": "^2.5.11",
|
||||
"@types/serialize-javascript": "^5.0.1",
|
||||
"@typescript-eslint/eslint-plugin": "^4.28.3",
|
||||
"babel-loader": "^8.2.2",
|
||||
"babel-plugin-inferno": "^6.3.0",
|
||||
"bootstrap": "^5.0.2",
|
||||
"bootswatch": "^5.0.2",
|
||||
"clean-webpack-plugin": "^4.0.0-alpha.0",
|
||||
"copy-webpack-plugin": "^9.0.1",
|
||||
"css-loader": "^6.0.0",
|
||||
"eslint": "^7.30.0",
|
||||
"eslint-plugin-prettier": "^3.4.1",
|
||||
"husky": "^7.0.1",
|
||||
"import-sort-style-module": "^6.0.0",
|
||||
"iso-639-1": "^2.1.9",
|
||||
"lemmy-js-client": "0.12.0",
|
||||
"lint-staged": "^11.0.1",
|
||||
"mini-css-extract-plugin": "^2.1.0",
|
||||
"node-fetch": "^2.6.1",
|
||||
"node-sass": "^6.0.1",
|
||||
"prettier": "^2.3.2",
|
||||
"prettier-plugin-import-sort": "^0.0.7",
|
||||
"prettier-plugin-organize-imports": "^2.2.0",
|
||||
"prettier-plugin-packagejson": "^2.2.11",
|
||||
"rimraf": "^3.0.2",
|
||||
"run-node-webpack-plugin": "^1.3.0",
|
||||
"sass-loader": "^12.1.0",
|
||||
"sortpack": "^2.2.0",
|
||||
"style-loader": "^3.1.0",
|
||||
"terser": "^5.7.1",
|
||||
"typescript": "^4.3.5",
|
||||
"webpack": "5.51.1",
|
||||
"webpack-cli": "^4.7.2",
|
||||
"webpack-dev-server": "4.0.0",
|
||||
"webpack-node-externals": "^3.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.9.0"
|
||||
},
|
||||
"engineStrict": true,
|
||||
"lint-staged": {
|
||||
"*.{ts,tsx,js}": [
|
||||
"prettier --write",
|
||||
"eslint --fix"
|
||||
],
|
||||
"package.json": [
|
||||
"sortpack"
|
||||
]
|
||||
},
|
||||
"importSort": {
|
||||
".js, .jsx, .ts, .tsx": {
|
||||
"style": "module",
|
||||
"parser": "typescript"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lemmy-server";
|
||||
version = "0.11.3";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LemmyNet";
|
||||
repo = "lemmy";
|
||||
rev = version;
|
||||
sha256 = "sha256-AFVipxzKwNiillVmMA+Q7nMKajN9mzw37mBpqzf+XpM=";
|
||||
sha256 = "sha256-jhUpQ2f+b0BEXVfQOIujxam2PQA44wluUraJVJxL6LU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-nxuynzQRUqne1KZIvP152afWbG2Zb9zyCqy7Bx4PeJ8=";
|
||||
cargoSha256 = "sha256-2i8zCwd33LtUKxOChx/SLP9sWMRmxGkKK8xzaJImMHM=";
|
||||
|
||||
buildInputs = [ postgresql ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
74
pkgs/servers/web-apps/lemmy/ui.nix
Normal file
74
pkgs/servers/web-apps/lemmy/ui.nix
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
{ lib
|
||||
, mkYarnPackage
|
||||
, libsass
|
||||
, nodejs
|
||||
, python3
|
||||
, pkg-config
|
||||
, writeShellScriptBin
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let
|
||||
pkgConfig = {
|
||||
node-sass = {
|
||||
nativeBuildInputs = [ ];
|
||||
buildInputs = [ libsass pkg-config python3 ];
|
||||
postInstall = ''
|
||||
LIBSASS_EXT=auto yarn --offline run build
|
||||
rm build/config.gypi
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
name = "lemmy-ui";
|
||||
version = "0.12.2";
|
||||
unwrapped = mkYarnPackage {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LemmyNet";
|
||||
repo = name;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-iFLJqUnz4m9/JTSaJSUugzY5KkiKtH0sMYY4ALm2Ebk=";
|
||||
};
|
||||
|
||||
inherit pkgConfig name version;
|
||||
|
||||
extraBuildInputs = [ libsass ];
|
||||
|
||||
yarnNix = ./yarn.nix;
|
||||
|
||||
# Fails mysteriously on source/package.json
|
||||
# Upstream package.json is missing a newline at the end
|
||||
packageJSON = ./package.json;
|
||||
|
||||
yarnPreBuild = ''
|
||||
export npm_config_nodedir=${nodejs}
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
# Yarn writes cache directories etc to $HOME.
|
||||
export HOME=$PWD/yarn_home
|
||||
|
||||
ln -sf $PWD/node_modules $PWD/deps/lemmy-ui/
|
||||
|
||||
yarn --offline build:prod
|
||||
'';
|
||||
|
||||
distPhase = "true";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Building a federated alternative to reddit in rust";
|
||||
homepage = "https://join-lemmy.org/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ happysalada billewanick ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
in
|
||||
(writeShellScriptBin "lemmy-ui" ''
|
||||
${nodejs}/bin/node ${unwrapped}/libexec/lemmy-ui/node_modules/lemmy-ui/dist/js/server.js
|
||||
'').overrideAttrs (oldAttrs: {
|
||||
passthru = { inherit unwrapped; };
|
||||
})
|
||||
|
||||
9221
pkgs/servers/web-apps/lemmy/yarn.nix
Normal file
9221
pkgs/servers/web-apps/lemmy/yarn.nix
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -7,13 +7,13 @@
|
|||
buildPythonApplication rec {
|
||||
|
||||
pname = "catcli";
|
||||
version = "0.7.0";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deadc0de6";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1r30345wzpg8yk542fmgh3khdb91s4sr9hnqxh1s71ifjsrgmpph";
|
||||
sha256 = "12928pvwd6jr4x81nxi5691axianm4vz5gql1jazlij0ahc2f905";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docopt anytree ];
|
||||
|
|
|
|||
|
|
@ -1,29 +1,35 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }:
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, libiconv
|
||||
, rustPlatform
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fclones";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkolaczk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ni5amy903cy822yhw070bcrrixrw2m1vr66q1h32bc98pyv4w05";
|
||||
sha256 = "sha256-8NUneKJpnBjC4OcAABEpI9p+saBqAk+l43FS8/tIYjc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1gcb46k7bwdfsf6hyvmi6dna1nf6myzy63bhjfp0wy7c8g4m2mg8";
|
||||
cargoSha256 = "sha256-5qX45FJFaiE1vTXjllM9U1w57MX18GgKEFOEBMc64Jk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
libiconv
|
||||
];
|
||||
|
||||
# tests in dedupe.rs fail due to
|
||||
# "creation time is not available for the filesystem"
|
||||
doCheck = false;
|
||||
# device::test_physical_device_name test fails on Darwin
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Efficient Duplicate File Finder and Remover";
|
||||
homepage = "https://github.com/pkolaczk/fclones";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cyounkins ];
|
||||
maintainers = with maintainers; [ cyounkins msfjarvis ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gobgp";
|
||||
version = "2.30.0";
|
||||
version = "2.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osrg";
|
||||
repo = "gobgp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YerInFAUHFGEU0XSYeqKly9EiCq/uSjtMLnzI/ekSJ4=";
|
||||
sha256 = "sha256-Q55BA5iMZP5D8lLfJn82fsxQ0SP5e4OdXtGly4j3dXU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY=";
|
||||
vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw=";
|
||||
|
||||
postConfigure = ''
|
||||
export CGO_ENABLED=0
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
buildGoModule rec {
|
||||
pname = "kapp";
|
||||
version = "0.39.0";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-kapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IIm9sIbAXfKkpXZqK17bBimJqQvLkLsnxg1N4kO4W8k=";
|
||||
sha256 = "sha256-9nvYxLE35IwmVB1Dzw7t3DZw4/kSiMPIqzl2PUKODtU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "termshark";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gcla";
|
||||
repo = "termshark";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vS6j8Mcri3SI/6HqtFX/EzVl8S0lx8fWU+0ddjzJz8g=";
|
||||
sha256 = "sha256-ekIxKBnqGTIXncvSTItBL43WN5mdX5dxROWHXUtH3o8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ wireshark-cli ];
|
||||
|
||||
vendorSha256 = "sha256-md9HHiYOsBimCBjD1FyjTqnskCZksQiEggWd5UW0RPM=";
|
||||
vendorSha256 = "sha256-16JPVgo3heJMjOHNOP13kyhRveQjF9h9kRznhSZM+ik=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tunnelto";
|
||||
version = "0.1.12";
|
||||
version = "0.1.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agrinman";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1vvb619cq3n88y2s8lncwcyrhb5s4gpjfiyia91pilcpnfdb04y2";
|
||||
sha256 = "sha256-dCHl5EXjUagOKeHxqb3GlAoSDw0u3tQ4GKEtbFF8OSs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1pjd62yz7pavcinc96g2x0f5giadl9aqvz1i5vhfanh6mj6mrbl1";
|
||||
cargoSha256 = "sha256-6HU1w69cJj+tE1IUUNoxh0cHEwlRKF5qWx7FiOHeUNk=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
buildInputs = [ ]
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fio";
|
||||
version = "3.27";
|
||||
version = "3.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axboe";
|
||||
repo = "fio";
|
||||
rev = "fio-${version}";
|
||||
sha256 = "sha256-/VzqmDbCTOOwFBMDj9nYuAW7ZJNM8B2LQ3QxReWG+iw=";
|
||||
sha256 = "sha256-8F31tyZ4/Qk14uwkg0DRPMdSaZGRVnI1dUDOITWhYAA=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 zlib ]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mark";
|
||||
version = "6.2";
|
||||
version = "6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovetskiy";
|
||||
repo = "mark";
|
||||
rev = version;
|
||||
sha256 = "sha256-Nk7DbZdz8BbsZO/Sx36ALNXRtSUju3X6S8M0yFs+Yz0=";
|
||||
sha256 = "sha256-HKP8ZYhYDJizZ91q4MRwS00YIMvgB6EJ3au5rMg02hg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0=";
|
||||
|
|
|
|||
|
|
@ -4714,6 +4714,8 @@ with pkgs;
|
|||
|
||||
endlessh = callPackage ../servers/endlessh { };
|
||||
|
||||
ericw-tools = callPackage ../applications/misc/ericw-tools { };
|
||||
|
||||
cryfs = callPackage ../tools/filesystems/cryfs { };
|
||||
|
||||
encfs = callPackage ../tools/filesystems/encfs {
|
||||
|
|
@ -9712,6 +9714,10 @@ with pkgs;
|
|||
|
||||
trebleshot = libsForQt5.callPackage ../applications/networking/trebleshot { };
|
||||
|
||||
trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom {
|
||||
inherit (xorg) libXxf86vm;
|
||||
};
|
||||
|
||||
trickle = callPackage ../tools/networking/trickle {};
|
||||
|
||||
inherit (nodePackages) triton;
|
||||
|
|
@ -20131,10 +20137,12 @@ with pkgs;
|
|||
|
||||
leafnode = callPackage ../servers/news/leafnode { };
|
||||
|
||||
lemmy = callPackage ../servers/web-apps/lemmy {
|
||||
lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { };
|
||||
|
||||
lighttpd = callPackage ../servers/http/lighttpd { };
|
||||
|
||||
livepeer = callPackage ../servers/livepeer { };
|
||||
|
|
@ -24313,7 +24321,9 @@ with pkgs;
|
|||
|
||||
fbida = callPackage ../applications/graphics/fbida { };
|
||||
|
||||
fclones = callPackage ../tools/misc/fclones { };
|
||||
fclones = callPackage ../tools/misc/fclones {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
|
||||
fcp = callPackage ../tools/misc/fcp { };
|
||||
|
||||
|
|
@ -27011,7 +27021,7 @@ with pkgs;
|
|||
|
||||
rsclock = callPackage ../applications/misc/rsclock { };
|
||||
|
||||
rstudio = libsForQt514.callPackage ../applications/editors/rstudio {
|
||||
rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
|
||||
boost = boost166;
|
||||
llvmPackages = llvmPackages_7;
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
|
|
|
|||
Loading…
Reference in a new issue