Merge remote-tracking branch 'origin/master' into haskell-updates.
This commit is contained in:
commit
734062ae56
@ -676,11 +676,19 @@ services.dokuwiki."mywiki" = {
|
||||
<listitem>
|
||||
<para>
|
||||
The <xref linkend="opt-services.postgresql.dataDir"/> option is now set to <literal>"/var/lib/postgresql/${cfg.package.psqlSchema}"</literal> regardless of your
|
||||
<xref linkend="opt-system.stateVersion"/>. Users with an existing postgresql install that have a <xref linkend="opt-system.stateVersion"/> of <literal>17.09</literal> or below
|
||||
<xref linkend="opt-system.stateVersion"/>. Users with an existing postgresql install that have a <xref linkend="opt-system.stateVersion"/> of <literal>17.03</literal> or below
|
||||
should double check what the value of their <xref linkend="opt-services.postgresql.dataDir"/> option is (<literal>/var/db/postgresql</literal>) and then explicitly
|
||||
set this value to maintain compatibility:
|
||||
<programlisting>
|
||||
services.postgresql.dataDir = "/var/db/postgresql";
|
||||
</programlisting>
|
||||
</para>
|
||||
<para>
|
||||
The postgresql module now expects there to be a database super user account called <literal>postgres</literal> regardless of your <xref linkend="opt-system.stateVersion"/>. Users
|
||||
with an existing postgresql install that have a <xref linkend="opt-system.stateVersion"/> of <literal>17.03</literal> or below should run the following SQL statements as a
|
||||
database super admin user before upgrading:
|
||||
<programlisting>
|
||||
CREATE ROLE postgres LOGIN SUPERUSER;
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
|
@ -190,13 +190,6 @@ let
|
||||
ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \
|
||||
$dst/
|
||||
|
||||
# update 51-local.conf path to look at local.conf
|
||||
rm $dst/51-local.conf
|
||||
|
||||
substitute ${pkg.out}/etc/fonts/conf.d/51-local.conf \
|
||||
$dst/51-local.conf \
|
||||
--replace local.conf /etc/fonts/${pkg.configVersion}/local.conf
|
||||
|
||||
# 00-nixos-cache.conf
|
||||
ln -s ${cacheConf} $dst/00-nixos-cache.conf
|
||||
|
||||
|
@ -225,14 +225,15 @@ in
|
||||
Contents of the <filename>recovery.conf</filename> file.
|
||||
'';
|
||||
};
|
||||
|
||||
superUser = mkOption {
|
||||
type = types.str;
|
||||
default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root";
|
||||
default = "postgres";
|
||||
internal = true;
|
||||
readOnly = true;
|
||||
description = ''
|
||||
NixOS traditionally used 'root' as superuser, most other distros use 'postgres'.
|
||||
From 17.09 we also try to follow this standard. Internal since changing this value
|
||||
would lead to breakage while setting up databases.
|
||||
PostgreSQL superuser account to use for various operations. Internal since changing
|
||||
this value would lead to breakage while setting up databases.
|
||||
'';
|
||||
};
|
||||
};
|
||||
@ -310,6 +311,35 @@ in
|
||||
''}
|
||||
'';
|
||||
|
||||
# Wait for PostgreSQL to be ready to accept connections.
|
||||
postStart =
|
||||
''
|
||||
PSQL="psql --port=${toString cfg.port}"
|
||||
|
||||
while ! $PSQL -d postgres -c "" 2> /dev/null; do
|
||||
if ! kill -0 "$MAINPID"; then exit 1; fi
|
||||
sleep 0.1
|
||||
done
|
||||
|
||||
if test -e "${cfg.dataDir}/.first_startup"; then
|
||||
${optionalString (cfg.initialScript != null) ''
|
||||
$PSQL -f "${cfg.initialScript}" -d postgres
|
||||
''}
|
||||
rm -f "${cfg.dataDir}/.first_startup"
|
||||
fi
|
||||
'' + optionalString (cfg.ensureDatabases != []) ''
|
||||
${concatMapStrings (database: ''
|
||||
$PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"'
|
||||
'') cfg.ensureDatabases}
|
||||
'' + ''
|
||||
${concatMapStrings (user: ''
|
||||
$PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
|
||||
${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
|
||||
$PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"'
|
||||
'') user.ensurePermissions)}
|
||||
'') cfg.ensureUsers}
|
||||
'';
|
||||
|
||||
serviceConfig = mkMerge [
|
||||
{ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
User = "postgres";
|
||||
@ -329,40 +359,6 @@ in
|
||||
TimeoutSec = 120;
|
||||
|
||||
ExecStart = "${postgresql}/bin/postgres";
|
||||
|
||||
# Wait for PostgreSQL to be ready to accept connections.
|
||||
ExecStartPost =
|
||||
let
|
||||
setupScript = pkgs.writeScript "postgresql-setup" (''
|
||||
#!${pkgs.runtimeShell} -e
|
||||
|
||||
PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}"
|
||||
|
||||
while ! $PSQL -d postgres -c "" 2> /dev/null; do
|
||||
if ! kill -0 "$MAINPID"; then exit 1; fi
|
||||
sleep 0.1
|
||||
done
|
||||
|
||||
if test -e "${cfg.dataDir}/.first_startup"; then
|
||||
${optionalString (cfg.initialScript != null) ''
|
||||
$PSQL -f "${cfg.initialScript}" -d postgres
|
||||
''}
|
||||
rm -f "${cfg.dataDir}/.first_startup"
|
||||
fi
|
||||
'' + optionalString (cfg.ensureDatabases != []) ''
|
||||
${concatMapStrings (database: ''
|
||||
$PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"'
|
||||
'') cfg.ensureDatabases}
|
||||
'' + ''
|
||||
${concatMapStrings (user: ''
|
||||
$PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
|
||||
${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
|
||||
$PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"'
|
||||
'') user.ensurePermissions)}
|
||||
'') cfg.ensureUsers}
|
||||
'');
|
||||
in
|
||||
"+${setupScript}";
|
||||
}
|
||||
(mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") {
|
||||
StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}";
|
||||
|
@ -53,11 +53,11 @@
|
||||
<varname>emacs</varname>
|
||||
</term>
|
||||
<term>
|
||||
<varname>emacs25</varname>
|
||||
<varname>emacs</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
The latest stable version of Emacs 25 using the
|
||||
The latest stable version of Emacs using the
|
||||
<link
|
||||
xlink:href="http://www.gtk.org">GTK 2</link>
|
||||
widget toolkit.
|
||||
@ -66,11 +66,11 @@
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<varname>emacs25-nox</varname>
|
||||
<varname>emacs-nox</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Emacs 25 built without any dependency on X11 libraries.
|
||||
Emacs built without any dependency on X11 libraries.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
@ -79,11 +79,11 @@
|
||||
<varname>emacsMacport</varname>
|
||||
</term>
|
||||
<term>
|
||||
<varname>emacs25Macport</varname>
|
||||
<varname>emacsMacport</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Emacs 25 with the "Mac port" patches, providing a more native look and
|
||||
Emacs with the "Mac port" patches, providing a more native look and
|
||||
feel under macOS.
|
||||
</para>
|
||||
</listitem>
|
||||
|
@ -82,12 +82,11 @@ in
|
||||
services.xserver.windowManager = {
|
||||
session = [{
|
||||
name = "xmonad";
|
||||
start = if (cfg.config != null) then ''
|
||||
${xmonadBin}
|
||||
waitPID=$!
|
||||
'' else ''
|
||||
systemd-cat -t xmonad ${xmonad}/bin/xmonad &
|
||||
waitPID=$!
|
||||
start = let
|
||||
xmonadCommand = if (cfg.config != null) then xmonadBin else "${xmonad}/bin/xmonad";
|
||||
in ''
|
||||
systemd-cat -t xmonad ${xmonadCommand} &
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
};
|
||||
|
@ -85,7 +85,7 @@ in
|
||||
|
||||
environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml";
|
||||
|
||||
environment.etc."crio/crio.conf".text = ''
|
||||
environment.etc."crio/crio.conf.d/00-default.conf".text = ''
|
||||
[crio]
|
||||
storage_driver = "${cfg.storageDriver}"
|
||||
|
||||
@ -100,6 +100,7 @@ in
|
||||
cgroup_manager = "systemd"
|
||||
log_level = "${cfg.logLevel}"
|
||||
manage_ns_lifecycle = true
|
||||
pinns_path = "${cfg.package}/bin/pinns"
|
||||
|
||||
${optionalString (cfg.runtime != null) ''
|
||||
default_runtime = "${cfg.runtime}"
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ffmpeg_3, sox }:
|
||||
{ stdenv, fetchurl, ffmpeg, sox }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bs1770gain";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk";
|
||||
};
|
||||
|
||||
buildInputs = [ ffmpeg_3 sox ];
|
||||
buildInputs = [ ffmpeg sox ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtractor";
|
||||
version = "0.9.14";
|
||||
version = "0.9.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1gh268gdpj7nw19xfh7k2l3aban4yrs1lmx33qswrnngs2izj1fk";
|
||||
sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.10";
|
||||
version = "6.12c";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
|
||||
sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p";
|
||||
sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
|
@ -7,13 +7,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version;
|
||||
version = "1.7.0.0";
|
||||
version = "1.8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcoinunlimited";
|
||||
repo = "bitcoinunlimited";
|
||||
rev = "bucash${version}";
|
||||
sha256 = "0lil6rivrj4cnr8a7n8zn9rp9f4h2nk88jjxc29m6dwqn5gk6f1i";
|
||||
rev = "BCHunlimited${version}";
|
||||
sha256 = "01qi15li5x9fvhsmvx7ai5fz6yzqqd3r9yv7081h75jn0nxai49q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook python3 ]
|
||||
|
318
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
318
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
@ -19,10 +19,10 @@
|
||||
elpaBuild {
|
||||
pname = "ack";
|
||||
ename = "ack";
|
||||
version = "1.8";
|
||||
version = "1.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ack-1.8.tar";
|
||||
sha256 = "1d4218km7j1bx1fsna29j3gi3k2ak2fzbk1gyki327pnnlma6bav";
|
||||
url = "https://elpa.gnu.org/packages/ack-1.10.tar";
|
||||
sha256 = "0jz8badhjpzjlrprpzgcm1z6ask1ykc7ab62ixjrj9wcgfjif5qw";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -39,10 +39,10 @@
|
||||
elpaBuild {
|
||||
pname = "ada-mode";
|
||||
ename = "ada-mode";
|
||||
version = "7.1.1";
|
||||
version = "7.1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-7.1.1.tar";
|
||||
sha256 = "11ch0dn478ddzkcjcyqf2rjim7w0fjb8xfijqxxi07847w4gkklp";
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-7.1.4.tar";
|
||||
sha256 = "13zcs7kn7rca82c80qshbdpmmmgkf5phr88hf7p5nwxqhkazy9cd";
|
||||
};
|
||||
packageRequires = [ emacs uniquify-files wisi ];
|
||||
meta = {
|
||||
@ -54,10 +54,10 @@
|
||||
elpaBuild {
|
||||
pname = "ada-ref-man";
|
||||
ename = "ada-ref-man";
|
||||
version = "2012.5";
|
||||
version = "2020.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ada-ref-man-2012.5.tar";
|
||||
sha256 = "0n7izqc44i3l6fxbzkq9gwwlcf04rr9g1whrk8biz84jhbyh23x8";
|
||||
url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar";
|
||||
sha256 = "1g4brb9g2spd55issyqldfc4azwilbrz8kh8sl0lka2kn42l3qqc";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -223,10 +223,10 @@
|
||||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "12.2.1";
|
||||
version = "12.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-12.2.1.tar";
|
||||
sha256 = "14y0kdri2zvz81qwpncsr3ly4ciqab6g8yxl956k3ddn36b3a56s";
|
||||
url = "https://elpa.gnu.org/packages/auctex-12.2.4.tar";
|
||||
sha256 = "1yz2h692mr35zgqwlxdq8rzv8n0jixhpaqmbiki00hlysm4zh9py";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -557,10 +557,10 @@
|
||||
elpaBuild {
|
||||
pname = "company";
|
||||
ename = "company";
|
||||
version = "0.9.12";
|
||||
version = "0.9.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.12.tar";
|
||||
sha256 = "1vcgfccdc06alba3jl6dg7ms20wdzdhaqikh7id5lbawb00hc10j";
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.13.tar";
|
||||
sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -636,6 +636,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
counsel = callPackage ({ elpaBuild, emacs, fetchurl, lib, swiper }:
|
||||
elpaBuild {
|
||||
pname = "counsel";
|
||||
ename = "counsel";
|
||||
version = "0.13.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/counsel-0.13.1.el";
|
||||
sha256 = "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli";
|
||||
};
|
||||
packageRequires = [ emacs swiper ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/counsel.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "cpio-mode";
|
||||
ename = "cpio-mode";
|
||||
version = "0.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cpio-mode-0.16.tar";
|
||||
sha256 = "06xdifgx45aghfppz5dws3v6w37q84lwgxp1pc51p2jjflqbqy5q";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
crisp = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "crisp";
|
||||
@ -730,10 +760,10 @@
|
||||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.22";
|
||||
version = "0.25";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.22.tar";
|
||||
sha256 = "05ik9qv539b5c1nzxkk3lk23bqj4vqgmfmd8x367abhb7c9gix2z";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.25.tar";
|
||||
sha256 = "0h0pxav170yzfpjf4vb8simiw67x9dkcjx9m4ghdk6wia25y8jni";
|
||||
};
|
||||
packageRequires = [ emacs soap-client ];
|
||||
meta = {
|
||||
@ -745,10 +775,10 @@
|
||||
elpaBuild {
|
||||
pname = "delight";
|
||||
ename = "delight";
|
||||
version = "1.5";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/delight-1.5.el";
|
||||
sha256 = "0kzlvzwmn6zj0874086q2xw0pclyi7wlkq48zh2lkd2796xm8vw7";
|
||||
url = "https://elpa.gnu.org/packages/delight-1.7.el";
|
||||
sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1";
|
||||
};
|
||||
packageRequires = [ cl-lib nadvice ];
|
||||
meta = {
|
||||
@ -925,10 +955,10 @@
|
||||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
ename = "ebdb";
|
||||
version = "0.6.17";
|
||||
version = "0.6.18";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.6.17.tar";
|
||||
sha256 = "07335pcqvvj1apzbwy4dc4i6pc6w21hr7v9fvgkc9c2x7fqlqg24";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.6.18.tar";
|
||||
sha256 = "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs seq ];
|
||||
meta = {
|
||||
@ -970,10 +1000,10 @@
|
||||
elpaBuild {
|
||||
pname = "ediprolog";
|
||||
ename = "ediprolog";
|
||||
version = "1.2";
|
||||
version = "2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ediprolog-1.2.el";
|
||||
sha256 = "039ffvp7c810mjyargmgw1i87g0z8qs8qicq826sd9aiz9hprfaz";
|
||||
url = "https://elpa.gnu.org/packages/ediprolog-2.1.el";
|
||||
sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1040,10 +1070,10 @@
|
||||
elpaBuild {
|
||||
pname = "eldoc";
|
||||
ename = "eldoc";
|
||||
version = "1.0.0";
|
||||
version = "1.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eldoc-1.0.0.el";
|
||||
sha256 = "0jdqnndvpz929rbfgrm2bgw3z2vp7dvvgk3wnhvlhf63mdiza89m";
|
||||
url = "https://elpa.gnu.org/packages/eldoc-1.8.0.el";
|
||||
sha256 = "1zxy9x9a0yqwdi572jj04x9lyj3d87mpyfbn3092a5nqwc864k9w";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1085,10 +1115,10 @@
|
||||
elpaBuild {
|
||||
pname = "elisp-benchmarks";
|
||||
ename = "elisp-benchmarks";
|
||||
version = "1.4";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.4.tar";
|
||||
sha256 = "18ia04aq4pqa8374x60g3g66jqmm17c6n904naa0jhqphlgam8pb";
|
||||
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.7.tar";
|
||||
sha256 = "1ps28bvh87d98k84ygx374a1kbwvnqm4w8jpkgzic01as78hgkiz";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1096,6 +1126,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "emms";
|
||||
ename = "emms";
|
||||
version = "5.42";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/emms-5.42.tar";
|
||||
sha256 = "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/emms.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "enwc";
|
||||
@ -1187,10 +1232,10 @@
|
||||
elpaBuild {
|
||||
pname = "exwm";
|
||||
ename = "exwm";
|
||||
version = "0.23";
|
||||
version = "0.24";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.23.tar";
|
||||
sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5";
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.24.tar";
|
||||
sha256 = "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s";
|
||||
};
|
||||
packageRequires = [ xelb ];
|
||||
meta = {
|
||||
@ -1243,16 +1288,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flymake = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "flymake";
|
||||
ename = "flymake";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/flymake-1.0.8.el";
|
||||
sha256 = "1hqxrqb227v4ncjjqx8im3c4mhg8w5yjbz9hpfcm5x8xnr2yd6bp";
|
||||
url = "https://elpa.gnu.org/packages/flymake-1.0.9.el";
|
||||
sha256 = "0xm1crhjcs14iqkf481igbf40wj2ib3hjzinw1gn8w1n0462ymp6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ eldoc emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/flymake.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1292,10 +1337,10 @@
|
||||
elpaBuild {
|
||||
pname = "frog-menu";
|
||||
ename = "frog-menu";
|
||||
version = "0.2.10";
|
||||
version = "0.2.11";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/frog-menu-0.2.10.el";
|
||||
sha256 = "050qikvgh9v7kgvhznjsfrpyhs7iq1x63bryqdkrwlf668yhzi1m";
|
||||
url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.el";
|
||||
sha256 = "06iw11z61fd0g4w3562k3smcmzaq3nivvvc6gzm8y8k5pcrqzdff";
|
||||
};
|
||||
packageRequires = [ avy emacs posframe ];
|
||||
meta = {
|
||||
@ -1591,10 +1636,10 @@
|
||||
elpaBuild {
|
||||
pname = "hyperbole";
|
||||
ename = "hyperbole";
|
||||
version = "7.0.6";
|
||||
version = "7.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/hyperbole-7.0.6.tar";
|
||||
sha256 = "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab";
|
||||
url = "https://elpa.gnu.org/packages/hyperbole-7.1.2.tar";
|
||||
sha256 = "1bspmqnbniwr9385wh823dsr5fgch5qnlkf45s4vi0nvg8jdccp1";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1636,10 +1681,10 @@
|
||||
elpaBuild {
|
||||
pname = "ivy";
|
||||
ename = "ivy";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ivy-0.13.0.tar";
|
||||
sha256 = "18r9vb9v7hvdkylchn436sgh7ji9avhry1whjip8zrn0c1bnqmk8";
|
||||
url = "https://elpa.gnu.org/packages/ivy-0.13.1.tar";
|
||||
sha256 = "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1726,10 +1771,10 @@
|
||||
elpaBuild {
|
||||
pname = "jsonrpc";
|
||||
ename = "jsonrpc";
|
||||
version = "1.0.11";
|
||||
version = "1.0.12";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.11.el";
|
||||
sha256 = "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23";
|
||||
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.12.el";
|
||||
sha256 = "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1782,6 +1827,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "leaf";
|
||||
ename = "leaf";
|
||||
version = "4.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/leaf-4.2.5.tar";
|
||||
sha256 = "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/leaf.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "let-alist";
|
||||
@ -2026,10 +2086,10 @@
|
||||
elpaBuild {
|
||||
pname = "mmm-mode";
|
||||
ename = "mmm-mode";
|
||||
version = "0.5.7";
|
||||
version = "0.5.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.7.tar";
|
||||
sha256 = "0c4azrkgagyfm9znh7hmw93gkvddpsxlr0dwjp96winymih7mahf";
|
||||
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar";
|
||||
sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@ -2041,10 +2101,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-operandi-theme";
|
||||
ename = "modus-operandi-theme";
|
||||
version = "0.8.1";
|
||||
version = "0.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.8.1.el";
|
||||
sha256 = "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb";
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.11.0.el";
|
||||
sha256 = "11sq105vpp8rmyayfb7h8gz099kfdr7nb8n4pg81iby4fllj1kgd";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2056,10 +2116,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-vivendi-theme";
|
||||
ename = "modus-vivendi-theme";
|
||||
version = "0.8.1";
|
||||
version = "0.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.8.1.el";
|
||||
sha256 = "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1";
|
||||
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.11.0.el";
|
||||
sha256 = "14ky9cxg9cpvhgg24ra0xla2dapqjlf948470q7v0m402x1r2iif";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2485,10 +2545,10 @@
|
||||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.3.48";
|
||||
version = "0.3.52";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.3.48.tar";
|
||||
sha256 = "1mnbrsgh6lx7kgkfsfq5zk78a97iwh8mxgxzyf1zq4jj6ziwd6bv";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.3.52.tar";
|
||||
sha256 = "11783i4raw6z326bqin9g37ig2szbqsma1r0fsdckyn2q6w7nn92";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2530,10 +2590,10 @@
|
||||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-0.7.0.el";
|
||||
sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9";
|
||||
url = "https://elpa.gnu.org/packages/posframe-0.8.0.el";
|
||||
sha256 = "1vzaiiw2pxa0zrc2bkaxljpr4035xrh3d8z3l5f0jvp72cnq49kp";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2541,16 +2601,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
project = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }:
|
||||
elpaBuild {
|
||||
pname = "project";
|
||||
ename = "project";
|
||||
version = "0.1.2";
|
||||
version = "0.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/project-0.1.2.el";
|
||||
sha256 = "0713hwim1chf6lxpg1rb234aa1gj92c153fjlc4jddp6dzzgn50d";
|
||||
url = "https://elpa.gnu.org/packages/project-0.5.1.el";
|
||||
sha256 = "1i15hlrfipsfrdmgh6xzkr6aszgvik3y8j9363qkj654dl04pmz4";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ emacs xref ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/project.html";
|
||||
license = lib.licenses.free;
|
||||
@ -2571,6 +2631,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "pspp-mode";
|
||||
ename = "pspp-mode";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el";
|
||||
sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "python";
|
||||
@ -2620,10 +2695,10 @@
|
||||
elpaBuild {
|
||||
pname = "rainbow-mode";
|
||||
ename = "rainbow-mode";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el";
|
||||
sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg";
|
||||
url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.5.el";
|
||||
sha256 = "159fps843k5pap9k04a7ll1k3gw6d9c6w08lq4bbc3lqg78aa2l9";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2840,10 +2915,10 @@
|
||||
elpaBuild {
|
||||
pname = "relint";
|
||||
ename = "relint";
|
||||
version = "1.17";
|
||||
version = "1.18";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/relint-1.17.tar";
|
||||
sha256 = "1nv13dqdhf72c1jgk1ml4k6jqb8wsyphcx2vhsyhig5198lg4kd7";
|
||||
url = "https://elpa.gnu.org/packages/relint-1.18.tar";
|
||||
sha256 = "0zfislsksrkn6qs0w26yaff5xr7xqy2x235dcdpz8s2v35b6dhci";
|
||||
};
|
||||
packageRequires = [ emacs xr ];
|
||||
meta = {
|
||||
@ -2881,6 +2956,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rt-liberation = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "rt-liberation";
|
||||
ename = "rt-liberation";
|
||||
version = "1.31";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rt-liberation-1.31.tar";
|
||||
sha256 = "0qqqqwdkb0h8137rqsr08179skl1475cg4hl7a987rmccys0j83c";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/rt-liberation.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rudel = callPackage ({ cl-generic
|
||||
, cl-lib ? null
|
||||
, cl-print
|
||||
@ -3067,6 +3157,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "so-long";
|
||||
ename = "so-long";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/so-long-1.0.el";
|
||||
sha256 = "00z9gnxz32rakd0k7lqaj050fwmqzq5vr9d6rb7ji3fn01rjp7kj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/so-long.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "soap-client";
|
||||
@ -3191,10 +3296,10 @@
|
||||
elpaBuild {
|
||||
pname = "svg-clock";
|
||||
ename = "svg-clock";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/svg-clock-1.1.el";
|
||||
sha256 = "12wf4dd3vgbq1v3363cil4wr2skx60xy546jc69ycyk0jq7plcq3";
|
||||
url = "https://elpa.gnu.org/packages/svg-clock-1.2.el";
|
||||
sha256 = "15pmj07wnlcpv78av9qpnbfwdjlkf237vib8smpa7nvyikdfszfr";
|
||||
};
|
||||
packageRequires = [ emacs svg ];
|
||||
meta = {
|
||||
@ -3202,6 +3307,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
|
||||
elpaBuild {
|
||||
pname = "swiper";
|
||||
ename = "swiper";
|
||||
version = "0.13.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/swiper-0.13.1.el";
|
||||
sha256 = "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y";
|
||||
};
|
||||
packageRequires = [ emacs ivy ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/swiper.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "system-packages";
|
||||
@ -3300,10 +3420,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.4.3.4";
|
||||
version = "2.4.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.4.3.4.tar";
|
||||
sha256 = "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.4.4.1.tar";
|
||||
sha256 = "0jayd75yscaqvg6y0m6g2mgbjswyj5gqdij2az9g0j18vm5vbqy3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3491,10 +3611,10 @@
|
||||
elpaBuild {
|
||||
pname = "verilog-mode";
|
||||
ename = "verilog-mode";
|
||||
version = "2020.2.23.232634261";
|
||||
version = "2020.6.27.14326051";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/verilog-mode-2020.2.23.232634261.el";
|
||||
sha256 = "07r2nzyfwmpv1299q1v768ai14rdgq7y4bvz5xsnp4qj3g06p0f6";
|
||||
url = "https://elpa.gnu.org/packages/verilog-mode-2020.6.27.14326051.el";
|
||||
sha256 = "194gn8cj01jb9xcl0qq3gq6mzxfdyn459ysb35fnib7pcnafm188";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -3704,10 +3824,10 @@
|
||||
elpaBuild {
|
||||
pname = "wisi";
|
||||
ename = "wisi";
|
||||
version = "3.1.1";
|
||||
version = "3.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/wisi-3.1.1.tar";
|
||||
sha256 = "0abm9xfyk2izi0w9172sfhdq83abcxgbngngbh2gby54df0ycn0q";
|
||||
url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar";
|
||||
sha256 = "0cbjcm35lp164wd06mn3clikga07qxfsfnkvadswsapsd0cn2b4k";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
@ -3724,10 +3844,10 @@
|
||||
elpaBuild {
|
||||
pname = "wisitoken-grammar-mode";
|
||||
ename = "wisitoken-grammar-mode";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.1.0.tar";
|
||||
sha256 = "123z9j76cm0p22d9n4kqvn2477fdkgp5jarw564nd71cxrrb52ms";
|
||||
url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.2.0.tar";
|
||||
sha256 = "0isxmpwys148djjymszdm5nisqjp9xff8kad45l4cpb3c717vsjw";
|
||||
};
|
||||
packageRequires = [ emacs mmm-mode wisi ];
|
||||
meta = {
|
||||
@ -3810,16 +3930,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
xref = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
|
||||
xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "xref";
|
||||
ename = "xref";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xref-1.0.1.el";
|
||||
sha256 = "17wlwilm2d1gvin8mkkqnpw2skjx0klxfs1pqpy8rrzdfpsb55li";
|
||||
url = "https://elpa.gnu.org/packages/xref-1.0.2.el";
|
||||
sha256 = "156rfwdihb3vz31iszbmby16spqswyf69nhl3r2cp6jzkgwzc1d8";
|
||||
};
|
||||
packageRequires = [ emacs project ];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/xref.html";
|
||||
license = lib.licenses.free;
|
||||
|
@ -4,10 +4,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20200511";
|
||||
version = "20200817";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20200511.tar";
|
||||
sha256 = "147k6nmq00milw5knyhw01z481rcdl6s30vk4fkjidw508nkmg9c";
|
||||
url = "https://orgmode.org/elpa/org-20200817.tar";
|
||||
sha256 = "159hch9zls3apxq11c5rjpmci1avyl7q3cgsrqxwgnzy8c61104d";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -19,10 +19,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20200511";
|
||||
version = "20200817";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20200511.tar";
|
||||
sha256 = "1hsdp7n985404zdqj6gyfw1bxxbs0p3bf4fyizvgji21zxwnf63f";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20200817.tar";
|
||||
sha256 = "0n3fhcxjsk2w78p7djna4nlppa7ypjxzpq3r5dmzc8jpl71mipba";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
let
|
||||
pkgs = import ../../../.. {};
|
||||
|
||||
emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let
|
||||
emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let
|
||||
|
||||
promise = epkgs.trivialBuild {
|
||||
pname = "promise";
|
||||
|
@ -1,146 +0,0 @@
|
||||
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, fetchpatch
|
||||
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
|
||||
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
|
||||
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
|
||||
, withX ? !stdenv.isDarwin
|
||||
, withGTK2 ? false, gtk2 ? null
|
||||
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
|
||||
, withXwidgets ? false, webkitgtk, wrapGAppsHook ? null, glib-networking ? null
|
||||
, withCsrc ? true
|
||||
, autoconf ? null, automake ? null, texinfo ? null
|
||||
}:
|
||||
|
||||
assert (libXft != null) -> libpng != null; # probably a bug
|
||||
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
|
||||
assert withGTK2 -> withX || stdenv.isDarwin;
|
||||
assert withGTK3 -> withX || stdenv.isDarwin;
|
||||
assert withGTK2 -> !withGTK3 && gtk2 != null;
|
||||
assert withGTK3 -> !withGTK2 && gtk3 != null;
|
||||
assert withXwidgets -> withGTK3 && webkitgtk != null;
|
||||
|
||||
let
|
||||
toolkit =
|
||||
if withGTK2 then "gtk2"
|
||||
else if withGTK3 then "gtk3"
|
||||
else "lucid";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emacs-${version}${versionModifier}";
|
||||
version = "25.3";
|
||||
versionModifier = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/emacs/${name}.tar.xz";
|
||||
sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
./at-fdcwd.patch
|
||||
|
||||
# Backport of the fix to
|
||||
# https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
|
||||
# Should be removed when switching to Emacs 26.1
|
||||
(fetchurl {
|
||||
url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
|
||||
sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
|
||||
})
|
||||
] ++ [
|
||||
# Backport patches so we can use webkitgtk with xwidgets.
|
||||
(fetchpatch {
|
||||
name = "0001-Omit-unnecessary-includes-from-xwidget-c.patch";
|
||||
url = "https://github.com/emacs-mirror/emacs/commit/a36ed9b5e95afea5716256bac24d883263aefbaf.patch";
|
||||
sha256 = "1j34c0vkj87il87xy1px23yk6bw73adpr7wqa79ncj89i4lc8qkb";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-xwidget-Use-WebKit2-API.patch";
|
||||
url = "https://github.com/emacs-mirror/emacs/commit/d781662873f228b110a128f7a2b6583a4d5e0a3a.patch";
|
||||
sha256 = "1lld56zi4cw2hmjxhhdcc0f07k8lbj32h10wcq4ml3asdwa31ryr";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf automake texinfo ]
|
||||
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
|
||||
|
||||
buildInputs =
|
||||
[ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
|
||||
++ lib.optionals stdenv.isLinux [ dbus libselinux ]
|
||||
++ lib.optionals withX
|
||||
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
|
||||
imagemagick gconf ]
|
||||
++ lib.optional (withX && withGTK2) gtk2
|
||||
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
|
||||
++ lib.optional (stdenv.isDarwin && withX) cairo
|
||||
++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = [ "--with-modules" ] ++
|
||||
(if stdenv.isDarwin
|
||||
then [ "--with-ns" "--disable-ns-self-contained" ]
|
||||
else if withX
|
||||
then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
|
||||
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
|
||||
"--with-gif=no" "--with-tiff=no" ])
|
||||
++ lib.optional withXwidgets "--with-xwidgets";
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'' + ''
|
||||
substituteInPlace lisp/international/mule-cmds.el \
|
||||
--replace /usr/share/locale ${gettext}/share/locale
|
||||
|
||||
for makefile_in in $(find . -name Makefile.in -print); do
|
||||
substituteInPlace $makefile_in --replace /bin/pwd pwd
|
||||
done
|
||||
'';
|
||||
|
||||
installTargets = [ "tags" "install" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
|
||||
$out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
|
||||
|
||||
rm -rf $out/var
|
||||
rm -rf $out/share/emacs/${version}/site-lisp
|
||||
'' + lib.optionalString withCsrc ''
|
||||
for srcdir in src lisp lwlib ; do
|
||||
dstdir=$out/share/emacs/${version}/$srcdir
|
||||
mkdir -p $dstdir
|
||||
find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
|
||||
cp $srcdir/TAGS $dstdir
|
||||
echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
|
||||
done
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv nextstep/Emacs.app $out/Applications
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The extensible, customizable GNU text editor";
|
||||
homepage = "https://www.gnu.org/software/emacs/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lovek323 peti jwiegley ];
|
||||
platforms = platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
GNU Emacs is an extensible, customizable text editor—and more. At its
|
||||
core is an interpreter for Emacs Lisp, a dialect of the Lisp
|
||||
programming language with extensions to support text editing.
|
||||
|
||||
The features of GNU Emacs include: content-sensitive editing modes,
|
||||
including syntax coloring, for a wide variety of file types including
|
||||
plain text, source code, and HTML; complete built-in documentation,
|
||||
including a tutorial for new users; full Unicode support for nearly all
|
||||
human languages and their scripts; highly customizable, using Emacs
|
||||
Lisp code or a graphical interface; a large number of extensions that
|
||||
add other functionality, including a project planner, mail and news
|
||||
reader, debugger interface, calendar, and more. Many of these
|
||||
extensions are distributed with GNU Emacs; others are available
|
||||
separately.
|
||||
'';
|
||||
};
|
||||
}
|
8
pkgs/applications/editors/emacs/26.nix
Normal file
8
pkgs/applications/editors/emacs/26.nix
Normal file
@ -0,0 +1,8 @@
|
||||
import ./generic.nix (rec {
|
||||
version = "26.3";
|
||||
sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
|
||||
patches = [
|
||||
./clean-env-26.patch
|
||||
./tramp-detect-wrapped-gvfsd-26.patch
|
||||
];
|
||||
})
|
8
pkgs/applications/editors/emacs/27.nix
Normal file
8
pkgs/applications/editors/emacs/27.nix
Normal file
@ -0,0 +1,8 @@
|
||||
import ./generic.nix (rec {
|
||||
version = "27.1";
|
||||
sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a";
|
||||
patches = [
|
||||
./clean-env.patch
|
||||
./tramp-detect-wrapped-gvfsd.patch
|
||||
];
|
||||
})
|
15
pkgs/applications/editors/emacs/clean-env-26.patch
Normal file
15
pkgs/applications/editors/emacs/clean-env-26.patch
Normal file
@ -0,0 +1,15 @@
|
||||
Dump temacs in an empty environment to prevent -dev paths from ending
|
||||
up in the dumped image.
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes)
|
||||
ln -f temacs$(EXEEXT) $@
|
||||
else
|
||||
unset EMACS_HEAP_EXEC; \
|
||||
- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
|
||||
+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
|
||||
ifneq ($(PAXCTL_dumped),)
|
||||
$(PAXCTL_dumped) $@
|
||||
endif
|
@ -1,3 +1,11 @@
|
||||
{
|
||||
version
|
||||
, sha256
|
||||
, versionModifier ? ""
|
||||
, pname ? "emacs"
|
||||
, name ? "emacs-${version}${versionModifier}"
|
||||
, patches ? [ ]
|
||||
}:
|
||||
{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm
|
||||
, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
|
||||
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
|
||||
@ -32,25 +40,17 @@ assert withXwidgets -> withGTK3 && webkitgtk != null;
|
||||
|
||||
|
||||
let
|
||||
version = "27.1";
|
||||
versionModifier = "";
|
||||
name = "emacs-${version}${versionModifier}";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
inherit name version;
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/emacs/${name}.tar.xz";
|
||||
sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [
|
||||
./clean-env.patch
|
||||
./tramp-detect-wrapped-gvfsd.patch
|
||||
];
|
||||
|
||||
postPatch = lib.concatStringsSep "\n" [
|
||||
(lib.optionalString srcRepo ''
|
||||
rm -fr .git
|
@ -0,0 +1,14 @@
|
||||
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
|
||||
index f370abba31..f2806263a9 100644
|
||||
--- a/lisp/net/tramp-gvfs.el
|
||||
+++ b/lisp/net/tramp-gvfs.el
|
||||
@@ -164,7 +164,8 @@ tramp-gvfs-enabled
|
||||
(and (featurep 'dbusbind)
|
||||
(tramp-compat-funcall 'dbus-get-unique-name :system)
|
||||
(tramp-compat-funcall 'dbus-get-unique-name :session)
|
||||
- (or (tramp-compat-process-running-p "gvfs-fuse-daemon")
|
||||
+ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
|
||||
+ (tramp-compat-process-running-p "gvfs-fuse-daemon")
|
||||
(tramp-compat-process-running-p "gvfsd-fuse"))))
|
||||
"Non-nil when GVFS is available.")
|
||||
|
@ -220,9 +220,6 @@ let
|
||||
};
|
||||
}) (attrs: {
|
||||
patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + ''
|
||||
# Patch built-in mono for ReSharperHost to start successfully
|
||||
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
|
||||
patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen
|
||||
rm -rf lib/ReSharperHost/linux-x64/dotnet
|
||||
mkdir -p lib/ReSharperHost/linux-x64/dotnet/
|
||||
ln -s ${dotnet-sdk_3}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
|
||||
@ -388,12 +385,12 @@ in
|
||||
|
||||
rider = buildRider rec {
|
||||
name = "rider-${version}";
|
||||
version = "2020.1.4"; /* updated by script */
|
||||
version = "2020.2"; /* updated by script */
|
||||
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
|
||||
sha256 = "0vicgwgsbllfw6fz4l82x4vbka3agf541576ix9akyvsskwbaxj9"; /* updated by script */
|
||||
sha256 = "0fxgdxsrrl659lh45slikgck6jld90rd6nnj8gj3aixq0yp5pkix"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rider";
|
||||
update-channel = "Rider RELEASE";
|
||||
|
77
pkgs/applications/editors/xxe-pe/default.nix
Normal file
77
pkgs/applications/editors/xxe-pe/default.nix
Normal file
@ -0,0 +1,77 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, lib
|
||||
, unzip
|
||||
, makeWrapper
|
||||
, openjdk11
|
||||
, makeDesktopItem
|
||||
, icoutils
|
||||
, config
|
||||
, acceptLicense ? config.xxe-pe.acceptLicense or false
|
||||
}:
|
||||
|
||||
let
|
||||
pkg_path = "$out/lib/xxe";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "XMLmind XML Editor Personal Edition";
|
||||
exec = "xxe";
|
||||
icon = "xxe";
|
||||
desktopName = "xxe";
|
||||
genericName = "XML Editor";
|
||||
categories = "Development;IDE;TextEditor;Java";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xxe-pe";
|
||||
version = "9.4.0";
|
||||
|
||||
src =
|
||||
assert !acceptLicense -> throw ''
|
||||
You must accept the XMLmind XML Editor Personal Edition License at
|
||||
https://www.xmlmind.com/xmleditor/license_xxe_perso.html
|
||||
by setting nixpkgs config option `xxe-pe.acceptLicense = true;`
|
||||
or by using `xxe-pe.override { acceptLicense = true; }` package.
|
||||
'';
|
||||
fetchurl {
|
||||
url = "https://www.xmlmind.com/xmleditor/_download/xxe-perso-${builtins.replaceStrings [ "." ] [ "_" ] version}.zip";
|
||||
sha256 = "FKPdf9cOpgm/WG2i8bFnR6MmEifpiq5ykw2zHA8HnT8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
makeWrapper
|
||||
icoutils
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "${pkg_path}"
|
||||
mkdir -p "${pkg_path}" "$out/share/applications"
|
||||
cp -a * "${pkg_path}"
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications
|
||||
|
||||
icotool -x "${pkg_path}/bin/icon/xxe.ico"
|
||||
ls
|
||||
for f in xxe_*.png; do
|
||||
res=$(basename "$f" ".png" | cut -d"_" -f3 | cut -d"x" -f1-2)
|
||||
mkdir -pv "$out/share/icons/hicolor/$res/apps"
|
||||
mv "$f" "$out/share/icons/hicolor/$res/apps/xxe.png"
|
||||
done;
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p "$out/bin"
|
||||
makeWrapper "${pkg_path}/bin/xxe" "$out/bin/xxe" \
|
||||
--prefix PATH : ${lib.makeBinPath [ openjdk11 ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Strictly validating, near WYSIWYG, XML editor with DocBook support";
|
||||
homepage = "https://www.xmlmind.com/xmleditor/";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.jtojnar ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
49
pkgs/applications/graphics/lightburn/default.nix
Normal file
49
pkgs/applications/graphics/lightburn/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ stdenv, patchelf, fetchurl, p7zip
|
||||
, nss, nspr, libusb1
|
||||
, qtbase, qtmultimedia, qtserialport
|
||||
, autoPatchelfHook, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "0.9.15";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
autoPatchelfHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "1dwmrili4jfw55gnlnda3imgli7f4jqz9smwlynf7k87lxrhppmh";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
nss nspr libusb1
|
||||
qtbase qtmultimedia qtserialport
|
||||
];
|
||||
|
||||
# We nuke the vendored Qt5 libraries that LightBurn ships and instead use our
|
||||
# own.
|
||||
unpackPhase = ''
|
||||
7z x $src
|
||||
rm -rf LightBurn/lib LightBurn/plugins
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share $out/bin
|
||||
cp -ar LightBurn $out/share/LightBurn
|
||||
ln -s $out/share/LightBurn/LightBurn $out/bin
|
||||
|
||||
wrapQtApp $out/bin/LightBurn
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "LightBurn is layout, editing, and control software for your laser cutter.";
|
||||
homepage = "https://lightburnsoftware.com/";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
maintainers = with stdenv.lib.maintainers; [ q3k ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
@ -147,6 +147,7 @@ let
|
||||
kpat = callPackage ./kpat.nix {};
|
||||
kpimtextedit = callPackage ./kpimtextedit.nix {};
|
||||
ksmtp = callPackage ./ksmtp {};
|
||||
ksquares = callPackage ./ksquares.nix {};
|
||||
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
|
||||
kpkpass = callPackage ./kpkpass.nix {};
|
||||
krdc = callPackage ./krdc.nix {};
|
||||
|
22
pkgs/applications/kde/ksquares.nix
Normal file
22
pkgs/applications/kde/ksquares.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ mkDerivation, lib, extra-cmake-modules, kdoctools, libkdegames, kconfig, kcrash, kxmlgui }:
|
||||
|
||||
mkDerivation {
|
||||
name = "ksquares";
|
||||
meta = with lib; {
|
||||
homepage = "https://kde.org/applications/en/games/org.kde.ksquares";
|
||||
description = "KSquares is a game of Dots and Boxes";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
buildInputs = [
|
||||
kdoctools
|
||||
libkdegames
|
||||
kconfig
|
||||
kcrash
|
||||
kxmlgui
|
||||
];
|
||||
}
|
@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "CopyQ";
|
||||
version = "3.11.1";
|
||||
version = "3.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xxf8d220pa77195d9f3l3scvvyqsh1pvlrbw4cq6ydj9qbp5kf0";
|
||||
sha256 = "04jidibf0b80c5vd659pz2wibmggjyyj9yz2bw7j4g84hwraksxb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, python3Packages
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@ -12,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ pyqt5 ];
|
||||
nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyaes
|
||||
@ -35,6 +36,10 @@ python3Packages.buildPythonApplication rec {
|
||||
sed -i '/Created: .*/d' gui/qt/icons_rc.py
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapQtApp $out/bin/electrum-ltc
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
$out/bin/electrum-ltc help >/dev/null
|
||||
'';
|
||||
@ -54,4 +59,3 @@ python3Packages.buildPythonApplication rec {
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
25
pkgs/applications/misc/xmenu/default.nix
Normal file
25
pkgs/applications/misc/xmenu/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, imlib2, libX11, libXft, libXinerama }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmenu";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phillbush";
|
||||
repo = "xmenu";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m97w1nwak5drcxxlyisqb73fxkapy2rlph9mg531kbx3k2h30r1";
|
||||
};
|
||||
|
||||
buildInputs = [ imlib2 libX11 libXft libXinerama ];
|
||||
|
||||
postPatch = "sed -i \"s:/usr/local:$out:\" config.mk";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "XMenu is a menu utility for X";
|
||||
homepage = "https://github.com/phillbush/xmenu";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ neonfuz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -2,12 +2,13 @@
|
||||
|
||||
# Native dependencies
|
||||
, python3, gtk3, gobject-introspection, gnome3
|
||||
, glib-networking
|
||||
|
||||
# Test dependencies
|
||||
, xvfb_run, dbus
|
||||
|
||||
# Optional dependencies
|
||||
, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly, libnice
|
||||
, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice
|
||||
, enableE2E ? true
|
||||
, enableSecrets ? true, libsecret
|
||||
, enableRST ? true, docutils
|
||||
@ -19,32 +20,33 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gajim";
|
||||
majorVersion = "1.1";
|
||||
version = "${majorVersion}.3";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
|
||||
sha256 = "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716";
|
||||
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
|
||||
sha256 = "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# This test requires network access
|
||||
echo "" > test/integration/test_resolver.py
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection gtk3 gnome3.adwaita-icon-theme wrapGAppsHook
|
||||
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly libnice ]
|
||||
gobject-introspection gtk3 gnome3.adwaita-icon-theme
|
||||
glib-networking
|
||||
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ]
|
||||
++ lib.optional enableSecrets libsecret
|
||||
++ lib.optional enableSpelling gspell
|
||||
++ lib.optional enableUPnP gupnp-igd;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
gettext wrapGAppsHook
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring setuptools
|
||||
nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools
|
||||
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
|
||||
++ lib.optional enableRST docutils
|
||||
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
|
||||
|
@ -9,7 +9,6 @@
|
||||
, ocamlPackages, ncurses
|
||||
, buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10")
|
||||
, glib, gnome3, wrapGAppsHook
|
||||
, darwin
|
||||
, csdp ? null
|
||||
, version
|
||||
}:
|
||||
@ -116,7 +115,6 @@ self = stdenv.mkDerivation {
|
||||
++ stdenv.lib.optionals buildIde
|
||||
(if versionAtLeast "8.10"
|
||||
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa
|
||||
else [ ocamlPackages.lablgtk ]);
|
||||
|
||||
propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ltl2ba";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${pname}-${version}.tar.gz";
|
||||
sha256 = "0vzv5g7v87r41cvdafxi6yqnk7glzxrzgavy8213k59f6v11dzlx";
|
||||
sha256 = "1bz9gjpvby4mnvny0nmxgd81rim26mqlcnjlznnxxk99575pfa4i";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
@ -1,20 +1,31 @@
|
||||
{ stdenv, python2Packages, fetchurl }:
|
||||
python2Packages.buildPythonApplication rec {
|
||||
{ stdenv, python3Packages, fetchFromGitHub, qt5 }:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "labelImg";
|
||||
version = "1.8.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz";
|
||||
sha256 = "1banpkpbrny1jx3zsgs544xai62z5yvislbq782a5r47gv2f2k4a";
|
||||
version = "1.8.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tzutalin";
|
||||
repo = "labelImg";
|
||||
rev = "v${version}";
|
||||
sha256 = "07v106fzlmxrbag4xm06m4mx9m0gckb27vpwsn7sap1bbgc1pap5";
|
||||
};
|
||||
nativeBuildInputs = with python2Packages; [
|
||||
pyqt4
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
pyqt5
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
pyqt4
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyqt5
|
||||
lxml
|
||||
sip
|
||||
];
|
||||
preBuild = ''
|
||||
make qt4py2
|
||||
make qt5py3
|
||||
'';
|
||||
postInstall = ''
|
||||
cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs
|
||||
'';
|
||||
dontWrapQtApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images";
|
||||
|
51
pkgs/applications/video/mpv/scripts/sponsorblock.nix
Normal file
51
pkgs/applications/video/mpv/scripts/sponsorblock.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, python3 }:
|
||||
|
||||
# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }`
|
||||
stdenv.mkDerivation {
|
||||
pname = "mpv_sponsorblock";
|
||||
version = "unstable-2020-07-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "po5";
|
||||
repo = "mpv_sponsorblock";
|
||||
rev = "f71e49e0531350339134502e095721fdc66eac20";
|
||||
sha256 = "1fr4cagzs26ygxyk8dxqvjw4n85fzv6is6cb1jhr2qnsjg6pa0p8";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
patches = [
|
||||
# Use XDG_DATA_HOME and XDG_CACHE_HOME if defined for UID and DB
|
||||
# Necessary to avoid sponsorblock to write in the nix store at runtime.
|
||||
# https://github.com/po5/mpv_sponsorblock/pull/17
|
||||
(fetchpatch {
|
||||
url = "https://github.com/po5/mpv_sponsorblock/pull/17/commits/e65b360a7d03a3430b4829e457a6670b2f617b09.patch";
|
||||
sha256 = "00wv0pvbz0dz2ibka66zhl2jk0pil4pyv6ipjfz37i81q6szyhs5";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/po5/mpv_sponsorblock/pull/17/commits/3832304d959205e99120a14c0560ed3c37104b08.patch";
|
||||
sha256 = "149ffvn714n2m3mqs8mgrbs24bcr74kqfkx7wyql36ndhm88xd2z";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace sponsorblock.lua \
|
||||
--replace "python3" "${python3}/bin/python3" \
|
||||
--replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\""
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp -r sponsorblock.lua sponsorblock_shared $out/share/mpv/scripts/
|
||||
'';
|
||||
|
||||
passthru.scriptName = "sponsorblock.lua";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "mpv script to skip sponsored segments of YouTube videos";
|
||||
homepage = "https://github.com/po5/mpv_sponsorblock";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ pacien ];
|
||||
};
|
||||
}
|
@ -2,11 +2,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "smplayer";
|
||||
version = "20.4.2";
|
||||
version = "20.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0kqdx6q2274gm83rycvdcglka60ymdk4iw2lc39iw7z1zgsv6ky3";
|
||||
sha256 = "0c59gfgm2ya8yb2nx7gy1zc0nrr4206213xy86y7jw0bk9mmjxmy";
|
||||
};
|
||||
|
||||
buildInputs = [ qtscript ];
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "20.1.0";
|
||||
version = "20.6.0";
|
||||
pname = "smtube";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "00x7gyk06d01hrr1lcqbrffbkkpj2j0j1fy9mkxc7slbzqcl27dz";
|
||||
sha256 = "0hnza5gszwqnkc1py5g34hi4p976vpkc4h3ab0247ynqs83fpwc2";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, mkDerivation
|
||||
, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
|
||||
, ffmpeg_3
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
@ -35,7 +35,7 @@ mkDerivation rec {
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg_3}
|
||||
substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -0,0 +1,58 @@
|
||||
{ stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, go-md2man
|
||||
, installShellFiles
|
||||
, libseccomp
|
||||
, linuxPackages
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oci-seccomp-bpf-hook";
|
||||
version = "1.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "oci-seccomp-bpf-hook";
|
||||
rev = "v${version}";
|
||||
sha256 = "143x4daixzhhhpli1l14r7dr7dn3q42w8dddr16jzhhwighsirqw";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
doCheck = false;
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
nativeBuildInputs = [
|
||||
go-md2man
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
libseccomp
|
||||
linuxPackages.bcc
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
make
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
substituteInPlace oci-seccomp-bpf-hook.json --replace HOOK_BIN_DIR "$out/bin"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 bin/* -t $out/bin
|
||||
install -Dm644 oci-seccomp-bpf-hook.json -t $out
|
||||
installManPage docs/*.[1-9]
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/containers/oci-seccomp-bpf-hook";
|
||||
description = ''
|
||||
OCI hook to trace syscalls and generate a seccomp profile
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ saschagrunert ];
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
}
|
@ -23,7 +23,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.36.2";
|
||||
version = "3.36.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "gnome-notes";
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
|
||||
sha256 = "1d5ynfhwbmrbdk1gcnhddn32d3kakwniq6lwjzsrhq26hq5xncsd";
|
||||
sha256 = "1midnphyg038s94ahhzv0pvbzzzn62ccky28c9nazxqvw4hvdsbh";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
@ -31,11 +31,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.15beta1";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "1h1sg6j9jac5bw2pjrd13bf4nr18prs89147izdhzbhp896sikbq";
|
||||
sha256 = "0fmc53pamxxbvmp5bcvh1fhffirpv3gz6y7qz97iacpmsiz8yhv9";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
@ -1,16 +1,16 @@
|
||||
diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go
|
||||
index 8ad5a9607d..1d6091cf83 100644
|
||||
index ce88de025e..258ecc45d1 100644
|
||||
--- a/src/crypto/x509/root_darwin_amd64.go
|
||||
+++ b/src/crypto/x509/root_darwin_amd64.go
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
"bytes"
|
||||
"crypto/x509/internal/macOS"
|
||||
macOS "crypto/x509/internal/macos"
|
||||
"fmt"
|
||||
+ "io/ioutil"
|
||||
"os"
|
||||
"strings"
|
||||
)
|
||||
@@ -23,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
|
||||
@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
|
||||
var loadSystemRootsWithCgo func() (*CertPool, error)
|
||||
|
||||
func loadSystemRoots() (*CertPool, error) {
|
||||
@ -25,10 +25,10 @@ index 8ad5a9607d..1d6091cf83 100644
|
||||
var trustedRoots []*Certificate
|
||||
untrustedRoots := make(map[string]bool)
|
||||
|
||||
diff --git a/src/crypto/x509/root_darwin_arm64.go b/src/crypto/x509/root_darwin_arm64.go
|
||||
index 2fb079ba66..6a072f3e78 100644
|
||||
--- a/src/crypto/x509/root_darwin_arm64.go
|
||||
+++ b/src/crypto/x509/root_darwin_arm64.go
|
||||
diff --git a/src/crypto/x509/root_darwin_ios.go b/src/crypto/x509/root_darwin_ios.go
|
||||
index 5ecc4911b3..14b4205c00 100644
|
||||
--- a/src/crypto/x509/root_darwin_ios.go
|
||||
+++ b/src/crypto/x509/root_darwin_ios.go
|
||||
@@ -6,6 +6,11 @@
|
||||
|
||||
package x509
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
# Uses scheme to bootstrap the build of idris2
|
||||
stdenv.mkDerivation rec {
|
||||
name = "idris2";
|
||||
pname = "idris2";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -30,9 +30,42 @@ stdenv.mkDerivation rec {
|
||||
|
||||
checkTarget = "bootstrap-test";
|
||||
|
||||
# idris2 needs to find scheme at runtime to compile
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/idris2" --set CHEZ "${chez}/bin/scheme"
|
||||
# TODO: Move this into its own derivation, such that this can be changed
|
||||
# without having to recompile idris2 every time.
|
||||
postInstall = let
|
||||
includedLibs = [ "base" "contrib" "network" "prelude" ];
|
||||
name = "${pname}-${version}";
|
||||
packagePaths = builtins.map (l: "$out/${name}/" + l) includedLibs;
|
||||
additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths;
|
||||
in ''
|
||||
# Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
|
||||
rm $out/bin/idris2
|
||||
# Move actual idris2 binary
|
||||
mv $out/bin/idris2_app/idris2.so $out/bin/idris2
|
||||
|
||||
# After moving the binary, there is nothing left in idris2_app that isn't
|
||||
# either contained in lib/ or is useless to us.
|
||||
rm $out/bin/idris2_app/*
|
||||
rmdir $out/bin/idris2_app
|
||||
|
||||
# idris2 needs to find scheme at runtime to compile
|
||||
# idris2 installs packages with --install into the path given by PREFIX.
|
||||
# Since PREFIX is in nix-store, it is immutable so --install does not work.
|
||||
# If the user redefines PREFIX to be able to install packages, idris2 will
|
||||
# not find the libraries and packages since all paths are relative to
|
||||
# PREFIX by default.
|
||||
# We explicitly make all paths to point to nix-store, such that they are
|
||||
# independent of what IDRIS2_PREFIX is. This allows the user to redefine
|
||||
# IDRIS2_PREFIX and use --install as expected.
|
||||
# TODO: Make support libraries their own derivation such that
|
||||
# overriding LD_LIBRARY_PATH is unnecessary
|
||||
# TODO: Maybe set IDRIS2_PREFIX to the users home directory
|
||||
wrapProgram "$out/bin/idris2" \
|
||||
--set-default CHEZ "${chez}/bin/scheme" \
|
||||
--suffix IDRIS2_LIBS ':' "$out/${name}/lib" \
|
||||
--suffix IDRIS2_DATA ':' "$out/${name}/support" \
|
||||
--suffix IDRIS2_PATH ':' "${additionalIdris2Paths}" \
|
||||
--suffix LD_LIBRARY_PATH ':' "$out/${name}/lib"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -9,7 +9,6 @@
|
||||
, llvmPackages_5
|
||||
, gmp
|
||||
, emacs
|
||||
, emacs25-nox
|
||||
, jre_headless
|
||||
, tcl
|
||||
, tk
|
||||
@ -73,7 +72,7 @@ in stdenv.mkDerivation rec {
|
||||
llvmPackages_5.clang
|
||||
llvmPackages_5.clang-unwrapped
|
||||
gmp
|
||||
emacs25-nox
|
||||
emacs
|
||||
jre_headless
|
||||
tcl
|
||||
tk
|
||||
|
@ -1,27 +1,72 @@
|
||||
{ stdenvNoCC, buildPackages, fetchurl }:
|
||||
{ stdenvNoCC, buildPackages, makeRustPlatform }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "binary-relibc-latest";
|
||||
let
|
||||
rpath = stdenvNoCC.lib.makeLibraryPath [
|
||||
buildPackages.stdenv.cc.libc
|
||||
"$out"
|
||||
];
|
||||
bootstrapCrossRust = stdenvNoCC.mkDerivation {
|
||||
name = "binary-redox-rust";
|
||||
|
||||
src = fetchTarball {
|
||||
name = "redox-rust-toolchain-bin.tar.gz";
|
||||
url = "https://www.dropbox.com/s/33r92en0t47l1ei/redox-rust-toolchain-bin.tar.gz?dl=1";
|
||||
sha256 = "1g17qp2q6b88p04yclkw6amm374pqlakrmw9kd86vw8z4g70jkxm";
|
||||
};
|
||||
|
||||
# snapshot of https://static.redox-os.org/toolchain/x86_64-unknown-redox/relibc-install.tar.gz
|
||||
src = fetchurl {
|
||||
name = "relibc-install.tar.gz";
|
||||
url = "https://gateway.pinata.cloud/ipfs/QmNp6fPTjPA6LnCYvW1UmbAHcPpU7tqZhstfSpSXMJCRwp";
|
||||
sha256 = "1hjdzrj67jdag3pm8h2dqh6xipbfxr6f4navdra6q1h83gl7jkd9";
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
installPhase = ''
|
||||
mkdir $out/
|
||||
cp -r * $out/
|
||||
|
||||
find $out/ -executable -type f -exec patchelf \
|
||||
--set-interpreter "${buildPackages.stdenv.cc.libc}/lib/ld-linux-x86-64.so.2" \
|
||||
--set-rpath "${rpath}" \
|
||||
"{}" \;
|
||||
find $out/ -name "*.so" -type f -exec patchelf \
|
||||
--set-rpath "${rpath}" \
|
||||
"{}" \;
|
||||
'';
|
||||
|
||||
meta.platforms = with stdenvNoCC.lib; platforms.redox ++ platforms.linux;
|
||||
};
|
||||
|
||||
# to avoid "unpacker produced multiple directories"
|
||||
unpackPhase = "unpackFile $src";
|
||||
redoxRustPlatform = buildPackages.makeRustPlatform {
|
||||
rustc = bootstrapCrossRust;
|
||||
cargo = bootstrapCrossRust;
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
installPhase = ''
|
||||
mkdir $out/
|
||||
cp -r x86_64-unknown-redox/* $out/
|
||||
rm -rf $out/bin
|
||||
in
|
||||
redoxRustPlatform.buildRustPackage rec {
|
||||
pname = "relibc";
|
||||
version = "latest";
|
||||
|
||||
LD_LIBRARY_PATH = "${buildPackages.zlib}/lib";
|
||||
|
||||
src = buildPackages.fetchgit {
|
||||
url = "https://gitlab.redox-os.org/redox-os/relibc/";
|
||||
rev = "5af8e3ca35ad401014a867ac1a0cc3b08dee682b";
|
||||
sha256 = "1j4wsga9psl453031izkl3clkvm31d1wg4y8f3yqqvhml2aliws5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
dontInstall = true;
|
||||
dontFixup = true;
|
||||
doCheck = false;
|
||||
|
||||
postBuild = ''
|
||||
mkdir -p $out
|
||||
DESTDIR=$out make install
|
||||
'';
|
||||
|
||||
TARGET = buildPackages.rust.toRustTarget stdenvNoCC.targetPlatform;
|
||||
|
||||
cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz";
|
||||
|
||||
meta = with stdenvNoCC.lib; {
|
||||
homepage = "https://gitlab.redox-os.org/redox-os/relibc";
|
||||
description = "C Library in Rust for Redox and Linux";
|
||||
|
@ -150,6 +150,14 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
tsun = super.tsun.overrideAttrs (oldAttrs: {
|
||||
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/tsun" \
|
||||
--prefix NODE_PATH : ${self.typescript}/lib/node_modules
|
||||
'';
|
||||
});
|
||||
|
||||
stf = super.stf.override {
|
||||
meta.broken = since "10";
|
||||
};
|
||||
|
32
pkgs/development/ocaml-modules/genspio/default.nix
Normal file
32
pkgs/development/ocaml-modules/genspio/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage
|
||||
, nonstd, sosa
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "genspio";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hammerlab";
|
||||
repo = pname;
|
||||
rev = "${pname}.${version}";
|
||||
sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
|
||||
propagatedBuildInputs = [ nonstd sosa ];
|
||||
|
||||
configurePhase = ''
|
||||
ocaml please.mlt configure
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://smondet.gitlab.io/genspio-doc/;
|
||||
description = "Typed EDSL to generate POSIX Shell scripts";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.alexfmpe ];
|
||||
};
|
||||
}
|
@ -12,8 +12,7 @@ buildDunePackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ gtk3 ];
|
||||
propagatedBuildInputs = [ cairo2 ];
|
||||
propagatedBuildInputs = [ gtk3 cairo2 ];
|
||||
|
||||
meta = {
|
||||
description = "OCaml interface to GTK 3";
|
||||
|
24
pkgs/development/ocaml-modules/nonstd/default.nix
Normal file
24
pkgs/development/ocaml-modules/nonstd/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib, fetchFromBitbucket, buildDunePackage }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "nonstd";
|
||||
version = "0.0.3";
|
||||
|
||||
minimumOCamlVersion = "4.02";
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "smondet";
|
||||
repo = pname;
|
||||
rev = "${pname}.${version}";
|
||||
sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://bitbucket.org/smondet/nonstd;
|
||||
description = "Non-standard mini-library";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.alexfmpe ];
|
||||
};
|
||||
}
|
30
pkgs/development/ocaml-modules/sosa/default.nix
Normal file
30
pkgs/development/ocaml-modules/sosa/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib, fetchFromGitHub, stdenv
|
||||
, findlib, nonstd, ocaml, ocamlbuild
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-sosa-${version}";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hammerlab";
|
||||
repo = "sosa";
|
||||
rev = "sosa.${version}";
|
||||
sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk";
|
||||
};
|
||||
|
||||
buildInputs = [ nonstd ocaml ocamlbuild findlib ];
|
||||
|
||||
buildPhase = "make build";
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = http://www.hammerlab.org/docs/sosa/master/index.html;
|
||||
description = "Sane OCaml String API";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.alexfmpe ];
|
||||
};
|
||||
}
|
@ -1,21 +1,50 @@
|
||||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }:
|
||||
{ stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }:
|
||||
let
|
||||
pname = "uunf";
|
||||
webpage = "https://erratique.ch/software/${pname}";
|
||||
version = "13.0.0";
|
||||
ucdxml = fetchurl {
|
||||
url = "http://www.unicode.org/Public/${version}/ucdxml/ucd.all.grouped.zip";
|
||||
sha256 = "04gpl09ggb6fb0kmk6298rd8184dv6vcscn28l1gpdv1yjlw1a8q";
|
||||
};
|
||||
gen = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen.ml";
|
||||
sha256 = "08j2mpi7j6q3rqc6bcdwspqn1s7pkkphznxfdycqjv4h9yaqsymj";
|
||||
};
|
||||
gen_norm = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_norm.ml";
|
||||
sha256 = "11vx5l5bag6bja7qj8jv4s2x9fknj3557n0mj87k2apq5gs5f4m5";
|
||||
};
|
||||
gen_props = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_props.ml";
|
||||
sha256 = "0a6lhja498kp9lxql0pbfvkgvajs10wx88wkqc7y5m3lrvw46268";
|
||||
};
|
||||
in
|
||||
|
||||
assert stdenv.lib.versionAtLeast ocaml.version "4.03";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-${pname}-${version}";
|
||||
version = "13.0.0";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ];
|
||||
postConfigure = ''
|
||||
rm -f src/uunf_data.ml
|
||||
mkdir -p support/
|
||||
cp ${gen} support/gen.ml
|
||||
cp ${gen_norm} support/gen_norm.ml
|
||||
cp ${gen_props} support/gen_props.ml
|
||||
funzip ${ucdxml} > support/ucd.xml
|
||||
ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/build_support.ml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner uucd ];
|
||||
|
||||
propagatedBuildInputs = [ uchar ];
|
||||
|
||||
@ -27,6 +56,5 @@ stdenv.mkDerivation rec {
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
@ -1,8 +1,8 @@
|
||||
{ stdenv, buildPythonPackage, fetchzip, pyopenssl, python }:
|
||||
{ stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }:
|
||||
|
||||
let
|
||||
pname = "nbxmpp";
|
||||
version = "0.6.10";
|
||||
version = "1.0.2";
|
||||
name = "${pname}-${version}";
|
||||
in buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -11,16 +11,12 @@ in buildPythonPackage {
|
||||
name = "${name}.tar.bz2";
|
||||
url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?"
|
||||
+ "ref=${name}";
|
||||
sha256 = "1w31a747mj9rvlp3n20z0fnvyvihphkgkyr22sk2kap3migw8vai";
|
||||
sha256 = "1rhzsakqrybzq5j5b9400wjd14pncph47c1ggn5a6f3di03lk4az";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyopenssl ];
|
||||
|
||||
checkPhase = ''
|
||||
# Disable tests requiring networking
|
||||
echo "" > test/unit/test_xmpp_transports_nb2.py
|
||||
${python.executable} test/runtests.py
|
||||
'';
|
||||
buildInputs = [ precis-i18n ];
|
||||
checkInputs = [ gobject-introspection libsoup pygobject3 ];
|
||||
propagatedBuildInputs = [ idna pyopenssl ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
|
||||
|
@ -1,26 +1,22 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "timescaledb-parallel-copy";
|
||||
version = "0.2.0";
|
||||
|
||||
owner = "timescale";
|
||||
repo = "timescaledb-parallel-copy";
|
||||
|
||||
goPackagePath = with src; "github.com/${owner}/${repo}";
|
||||
goDeps = ./deps.nix;
|
||||
buildGoModule rec {
|
||||
pname = "timescaledb-parallel-copy";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = version;
|
||||
sha256 = "1z9vf29vrxqs8imbisv681d02p4cfk3hlsrin6hhibxf1h0br9gd";
|
||||
owner = "timescale";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0r8c78l8vg7l24c3vzs2qr2prfjpagvdkp95fh9gyz76nvik29ba";
|
||||
};
|
||||
|
||||
vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Bulk, parallel insert of CSV records into PostgreSQL";
|
||||
homepage = "https://github.com/timescale/timescaledb-parallel-copy";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://github.com/timescale/timescaledb-parallel-copy";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
@ -1,21 +0,0 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/jmoiron/sqlx";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jmoiron/sqlx";
|
||||
rev = "82935fac6c1a317907c8f43ed3f7f85ea844a78b";
|
||||
sha256 = "0cbscnss2ifc3qgmy97i0zbirrp4hix4jlcz853f4bg5n2zzgwh2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/lib/pq";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/lib/pq";
|
||||
rev = "7aad666537ab32b76f0966145530335f1fed51fd";
|
||||
sha256 = "12qczn5afbf6203wnbpay1kazzh20jg5qyakrph3j1r13n91nc1r";
|
||||
};
|
||||
}
|
||||
]
|
@ -1,20 +1,18 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "timescaledb-tune";
|
||||
version = "0.6.0";
|
||||
|
||||
goPackagePath = "github.com/timescale/timescaledb-tune";
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
buildGoModule rec {
|
||||
pname = "timescaledb-tune";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = name;
|
||||
rev = version;
|
||||
sha256 = "0hjxmjgkqm9sbjbyhs3pzkk1d9vvlcbzwl7ghsigh4h7rw3a0mpk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0vncwwvw7y6g3crd4n5vvd6jwdsa8vsvsmfwy5mad4j6lix09ajx";
|
||||
};
|
||||
|
||||
vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A tool for tuning your TimescaleDB for better performance";
|
||||
homepage = "https://github.com/timescale/timescaledb-tune";
|
||||
|
@ -1,21 +0,0 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/fatih/color";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fatih/color";
|
||||
rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e";
|
||||
sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pbnjay/memory";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pbnjay/memory";
|
||||
rev = "974d429e7ae40c89e7dcd41cfcc22a0bfbe42510";
|
||||
sha256 = "0kazg5psdn90pqadrzma5chdwh0l2by9z31sspr47gx93fhjmkkq";
|
||||
};
|
||||
}
|
||||
]
|
@ -10,13 +10,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "godot";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godotengine";
|
||||
repo = "godot";
|
||||
rev = "${version}-stable";
|
||||
sha256 = "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6";
|
||||
sha256 = "1libz83mbyrkbbsmmi8z2rydv3ls0w9r4vb5v6diqqwn7ka8z804";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
@ -1,16 +1,18 @@
|
||||
+++ build/SConstruct
|
||||
@@ -63,10 +63,10 @@ elif platform_arg == 'javascript':
|
||||
custom_tools = ['cc', 'c++', 'ar', 'link', 'textfile', 'zip']
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index b3d033dc90..04b8dcc832 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -62,10 +62,9 @@ elif platform_arg == "javascript":
|
||||
custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"]
|
||||
|
||||
env_base = Environment(tools=custom_tools)
|
||||
-if 'TERM' in os.environ:
|
||||
- env_base['ENV']['TERM'] = os.environ['TERM']
|
||||
-env_base.AppendENVPath('PATH', os.getenv('PATH'))
|
||||
-env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
|
||||
-if "TERM" in os.environ:
|
||||
- env_base["ENV"]["TERM"] = os.environ["TERM"]
|
||||
-env_base.AppendENVPath("PATH", os.getenv("PATH"))
|
||||
-env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
|
||||
+for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):
|
||||
+ if (k in os.environ):
|
||||
+ env_base["ENV"][k] = os.environ[k]
|
||||
+
|
||||
env_base.disabled_modules = []
|
||||
env_base.use_ptrcall = False
|
||||
env_base.module_version_string = ""
|
||||
|
@ -1,22 +1,25 @@
|
||||
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
|
||||
index 5674e78350..7051d8e73c 100644
|
||||
--- a/platform/x11/detect.py
|
||||
+++ b/platform/x11/detect.py
|
||||
@@ -175,6 +175,11 @@ def configure(env):
|
||||
env.ParseConfig('pkg-config xrender --cflags --libs')
|
||||
env.ParseConfig('pkg-config xi --cflags --libs')
|
||||
@@ -201,6 +201,11 @@ def configure(env):
|
||||
env.ParseConfig("pkg-config xrender --cflags --libs")
|
||||
env.ParseConfig("pkg-config xi --cflags --libs")
|
||||
|
||||
+ env.ParseConfig('pkg-config xext --cflags --libs')
|
||||
+ env.ParseConfig('pkg-config xfixes --cflags --libs')
|
||||
+ env.ParseConfig('pkg-config glu --cflags --libs')
|
||||
+ env.ParseConfig('pkg-config zlib --cflags --libs')
|
||||
+ env.ParseConfig("pkg-config xext --cflags --libs")
|
||||
+ env.ParseConfig("pkg-config xfixes --cflags --libs")
|
||||
+ env.ParseConfig("pkg-config glu --cflags --libs")
|
||||
+ env.ParseConfig("pkg-config zlib --cflags --libs")
|
||||
+
|
||||
if (env['touch']):
|
||||
env.Append(CPPFLAGS=['-DTOUCH_ENABLED'])
|
||||
if env["touch"]:
|
||||
env.Append(CPPDEFINES=["TOUCH_ENABLED"])
|
||||
|
||||
@@ -264,7 +269,7 @@ def configure(env):
|
||||
@@ -299,7 +304,7 @@ def configure(env):
|
||||
print("Enabling ALSA")
|
||||
env.Append(CPPFLAGS=["-DALSA_ENABLED", "-DALSAMIDI_ENABLED"])
|
||||
# Don't parse --cflags, we don't need to add /usr/include/alsa to include path
|
||||
- env.ParseConfig('pkg-config alsa --libs')
|
||||
+ env.ParseConfig('pkg-config alsa --cflags --libs')
|
||||
env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"])
|
||||
# Don't parse --cflags, we don't need to add /usr/include/alsa to include path
|
||||
- env.ParseConfig("pkg-config alsa --libs")
|
||||
+ env.ParseConfig("pkg-config alsa --cflags --libs")
|
||||
else:
|
||||
print("ALSA libraries not found, disabling driver")
|
||||
|
||||
|
62
pkgs/misc/cups/drivers/hl1210w/default.nix
Normal file
62
pkgs/misc/cups/drivers/hl1210w/default.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
|
||||
|
||||
let
|
||||
version = "3.0.1-1";
|
||||
cupsdeb = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf101546/hl1210wcupswrapper-${version}.i386.deb";
|
||||
sha256 = "0395mnw6c7qpjgjch9in5q9p2fjdqvz9bwfwp6q1hzhs08ryk7w0";
|
||||
};
|
||||
lprdeb = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf101547/hl1210wlpr-${version}.i386.deb";
|
||||
sha256 = "1sl3g2cd4a2gygryrr27ax3qaa65cbirz3kzskd8afkwqpmjyv7j";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "cups-brother-hl1210W";
|
||||
|
||||
srcs = [ lprdeb cupsdeb ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ cups ghostscript dpkg a2ps ];
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
# install lpr
|
||||
dpkg-deb -x ${lprdeb} $out
|
||||
|
||||
substituteInPlace $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \
|
||||
--replace /opt "$out/opt"
|
||||
|
||||
sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1210W/lpd/psconvert2
|
||||
|
||||
patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/lpd/brprintconflsr3
|
||||
patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/lpd/rawtobr3
|
||||
patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/inf/braddprinter
|
||||
|
||||
wrapProgram $out/opt/brother/Printers/HL1210W/lpd/psconvert2 \
|
||||
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] }
|
||||
wrapProgram $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \
|
||||
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
|
||||
|
||||
# install cups
|
||||
dpkg-deb -x ${cupsdeb} $out
|
||||
|
||||
substituteInPlace $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W --replace /opt "$out/opt"
|
||||
|
||||
mkdir -p $out/lib/cups/filter
|
||||
ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W $out/lib/cups/filter/brother_lpdwrapper_HL1210W
|
||||
ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/lib/cups/filter/brother-HL1210W-cups-en.ppd
|
||||
# cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/
|
||||
ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4
|
||||
|
||||
wrapProgram $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W \
|
||||
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] }
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother HL1210W printer driver";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=hl1210w_eu_as&os=128";
|
||||
};
|
||||
}
|
@ -65,12 +65,12 @@ let
|
||||
|
||||
ale = buildVimPluginFrom2Nix {
|
||||
pname = "ale";
|
||||
version = "2020-08-14";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dense-analysis";
|
||||
repo = "ale";
|
||||
rev = "5ceda0164c5fae0d61fd51d4c9e083b27abdc9d2";
|
||||
sha256 = "1bq3q6sqxb6ihipnm1hv8yyj78yl9wygv6xr9xafy0zk338sg7ph";
|
||||
rev = "2b785688ead505dcbc1007374d3dca9914aa247a";
|
||||
sha256 = "1n91vm354fd45vvg4skvx7s9mpjpsk1l61n2x5ylqr8dlm7vgjkw";
|
||||
};
|
||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||
};
|
||||
@ -425,24 +425,24 @@ let
|
||||
|
||||
coc-fzf = buildVimPluginFrom2Nix {
|
||||
pname = "coc-fzf";
|
||||
version = "2020-08-15";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoinemadec";
|
||||
repo = "coc-fzf";
|
||||
rev = "294ee401d81656ff9e383e98b9d963a6c0edaf44";
|
||||
sha256 = "0s8fnzimk26rzrkky13si2iacw0nahyvcvicv3g8xc28sppddvd4";
|
||||
rev = "341ea7db0ab85a2ecb3a067ca721c1327fcd7013";
|
||||
sha256 = "0gqs6xdnmg33xraxqv10jl7dhaca19dlidmc86zdki2hg1bckr9b";
|
||||
};
|
||||
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
|
||||
};
|
||||
|
||||
coc-git = buildVimPluginFrom2Nix {
|
||||
pname = "coc-git";
|
||||
version = "2020-08-08";
|
||||
version = "2020-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc-git";
|
||||
rev = "eef63ac3807ff32fe60743b4041dc293f76401bf";
|
||||
sha256 = "1m1nzrzy7c5ggl87adbla9zcnaqr3dvx72sd3mcfxq5g9qglr2gk";
|
||||
rev = "5a768cd395fc94e0448c596fafaf5f78d15fb968";
|
||||
sha256 = "019mb2v7ldyzjjh86kxyxrbrgyf9chgp0f0nkwk0fiwf2qi2141y";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc-git/";
|
||||
};
|
||||
@ -557,12 +557,12 @@ let
|
||||
|
||||
coc-metals = buildVimPluginFrom2Nix {
|
||||
pname = "coc-metals";
|
||||
version = "2020-08-15";
|
||||
version = "2020-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ckipp01";
|
||||
repo = "coc-metals";
|
||||
rev = "b2d58e9e352afcc324bc23a0359fed390e069307";
|
||||
sha256 = "0hsqb71w9ypgd2w8zwv4vmjcjyxjpk4qb67k9cwfp589nrfkw6xb";
|
||||
rev = "14c820dad44b057e2b8343f7d8896529cd973ee6";
|
||||
sha256 = "0569by8x73dpb3hapbx73x9fg2wzzb965mkkifqgdq4wdg6wizkx";
|
||||
};
|
||||
meta.homepage = "https://github.com/ckipp01/coc-metals/";
|
||||
};
|
||||
@ -641,12 +641,12 @@ let
|
||||
|
||||
coc-rust-analyzer = buildVimPluginFrom2Nix {
|
||||
pname = "coc-rust-analyzer";
|
||||
version = "2020-08-15";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-rust-analyzer";
|
||||
rev = "60b75af3c86ce5c310cc39007cefcac6f36bc02a";
|
||||
sha256 = "1j4mmh45s5rchw3wf76gph4wm95kpzyql8i1dlqc7qndf06wwq37";
|
||||
rev = "ac57b7b3cdaee3cfb56b76a8fc13444337f09276";
|
||||
sha256 = "0n26d63qifhnsrpwq8x587mh9y83rmayc2car222hjqbrg705r28";
|
||||
};
|
||||
meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/";
|
||||
};
|
||||
@ -677,12 +677,12 @@ let
|
||||
|
||||
coc-solargraph = buildVimPluginFrom2Nix {
|
||||
pname = "coc-solargraph";
|
||||
version = "2020-08-08";
|
||||
version = "2020-08-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc-solargraph";
|
||||
rev = "66d1ca9d5fd10927d618561b81447a22f6929a6a";
|
||||
sha256 = "0i48hzgsnn9ghk41c885nslwv8hi98ym6yzcsayncs2vasv7gcnl";
|
||||
rev = "e61385cc483768afc8d8c064b5c98baa474d0d9c";
|
||||
sha256 = "1hiy12h85z8m6i4nc92jpi6z0zph8rpdmgb75czhy5y0cjwkn59q";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc-solargraph/";
|
||||
};
|
||||
@ -749,12 +749,12 @@ let
|
||||
|
||||
coc-tsserver = buildVimPluginFrom2Nix {
|
||||
pname = "coc-tsserver";
|
||||
version = "2020-08-08";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc-tsserver";
|
||||
rev = "47d3dba90a52eb1126cda486fb788e76404dc668";
|
||||
sha256 = "1s0xnk0f1hqp9nkcqzn31wfjl5sq9qpwriim946wbjg0cfng1xh2";
|
||||
rev = "e4f3ab555b35a0057d22dcc8bb7b7af7e43546d6";
|
||||
sha256 = "0i1fpvbl228jhh50fbz8cppv2v20zy0zywb1qgh9hsmw6pfgjg1w";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc-tsserver/";
|
||||
};
|
||||
@ -809,12 +809,12 @@ let
|
||||
|
||||
coc-yaml = buildVimPluginFrom2Nix {
|
||||
pname = "coc-yaml";
|
||||
version = "2020-06-26";
|
||||
version = "2020-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc-yaml";
|
||||
rev = "e3db99f415a1439b44548473fbaa3f79df4f383e";
|
||||
sha256 = "0aij94s5jak5g2myd6xmcwx5aclpvgcbg9nwxqzkij5m24wpi23n";
|
||||
rev = "a453c70b2507d66e48a2d4e89f78cb5f340f140f";
|
||||
sha256 = "0av0jv0g01cpkf5rsicniq7maa6c509bc3gs5piczf5za990nrsx";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc-yaml/";
|
||||
};
|
||||
@ -1086,12 +1086,12 @@ let
|
||||
|
||||
defx-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "defx-nvim";
|
||||
version = "2020-08-14";
|
||||
version = "2020-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "defx.nvim";
|
||||
rev = "c533595c435e776297e84ff739eb6bf84523cf22";
|
||||
sha256 = "1y6fwy6hrdpf3znkrcbfj1gk0agdcl80a6i2027qlsar1k7w2pyp";
|
||||
rev = "1cfffcff2aba8a7b819f8b27414021d451abb4ce";
|
||||
sha256 = "0ysnkwv9hk84i4rdglrmjms24nh9i5x5qvr8lyzrjzzp8zj7qs2l";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/defx.nvim/";
|
||||
};
|
||||
@ -1122,12 +1122,12 @@ let
|
||||
|
||||
denite-git = buildVimPluginFrom2Nix {
|
||||
pname = "denite-git";
|
||||
version = "2020-08-15";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "denite-git";
|
||||
rev = "6992366697e5509c405c0ae8386cca91a186fd0b";
|
||||
sha256 = "1iqlf7669qxf80g30j5zjyx6w7hjvmylnlwcmq3rdcsyk1b0iiwy";
|
||||
rev = "281f45114ba5673d671683ee19194a4958a2da57";
|
||||
sha256 = "0j4vmljk6zvgvrj5s6ij5h5v4am7y9sd467f1fn3g6wqgm8432g6";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/denite-git/";
|
||||
};
|
||||
@ -1376,12 +1376,12 @@ let
|
||||
|
||||
dhall-vim = buildVimPluginFrom2Nix {
|
||||
pname = "dhall-vim";
|
||||
version = "2020-07-15";
|
||||
version = "2020-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmchale";
|
||||
repo = "dhall-vim";
|
||||
rev = "2b89ae34b07fc305741a58ba2c584a4cfc3377fc";
|
||||
sha256 = "0jnxy5wy2mf4j01rgxjirqp3pyjwhsf3z2zxdzwz1bykhlwp7xhl";
|
||||
rev = "77d1c165bcbe6bb7f9eedbeafe390c2107d3c52e";
|
||||
sha256 = "03x55x0gvf7n4i8hh6s5453mf5h43pf7kdy817q6w1149bd90vxy";
|
||||
};
|
||||
meta.homepage = "https://github.com/vmchale/dhall-vim/";
|
||||
};
|
||||
@ -1422,6 +1422,18 @@ let
|
||||
meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/";
|
||||
};
|
||||
|
||||
dracula-vim = buildVimPluginFrom2Nix {
|
||||
pname = "dracula-vim";
|
||||
version = "2020-07-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "vim";
|
||||
rev = "b64b22affafca7d3831a20949115b91031d596ec";
|
||||
sha256 = "1f5hwfcrsfq3yk53kkn4syaxmri8wh8h6rpq867468b8rdcnhq01";
|
||||
};
|
||||
meta.homepage = "https://github.com/dracula/vim/";
|
||||
};
|
||||
|
||||
echodoc-vim = buildVimPluginFrom2Nix {
|
||||
pname = "echodoc-vim";
|
||||
version = "2020-06-08";
|
||||
@ -1703,12 +1715,12 @@ let
|
||||
|
||||
git-messenger-vim = buildVimPluginFrom2Nix {
|
||||
pname = "git-messenger-vim";
|
||||
version = "2020-08-03";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhysd";
|
||||
repo = "git-messenger.vim";
|
||||
rev = "2069a081cb83aab8ed5e275a97aa178a30cf47a0";
|
||||
sha256 = "1xj95c2hhlalf2zjp2qh414dr50cp3gly8zk4bsk82v65rdwcqv1";
|
||||
rev = "c16b0d43ca57e77081f1f23f67552efe37110b39";
|
||||
sha256 = "171w3dv3jl4mw1ikh5p688v0a8nf85h862d9zvsmdzs2v6ajigpw";
|
||||
};
|
||||
meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
|
||||
};
|
||||
@ -2196,12 +2208,12 @@ let
|
||||
|
||||
lh-vim-lib = buildVimPluginFrom2Nix {
|
||||
pname = "lh-vim-lib";
|
||||
version = "2020-08-12";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LucHermitte";
|
||||
repo = "lh-vim-lib";
|
||||
rev = "70237012f9be89d0ce4c0ea728f5ca8bba9818fd";
|
||||
sha256 = "18faws5vhh0v78c8xs68iklsmd9mddg2s0ha4z5adhfa6ddhbks6";
|
||||
rev = "15722c04a41d49027c7b499703fc1dac376653a8";
|
||||
sha256 = "1h94zzanzlixlmlyy3r54hk2lw9hwd49v9ij9lq3ghyc79gvhvgi";
|
||||
};
|
||||
meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
|
||||
};
|
||||
@ -2220,24 +2232,24 @@ let
|
||||
|
||||
lightline-bufferline = buildVimPluginFrom2Nix {
|
||||
pname = "lightline-bufferline";
|
||||
version = "2020-08-04";
|
||||
version = "2020-08-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mengelbrecht";
|
||||
repo = "lightline-bufferline";
|
||||
rev = "deac5994a0bf6795b743d444dde11a407416ddc7";
|
||||
sha256 = "0y6cill4pwck6ajm55br2prhgj928yb94dq2wxxsrk6xw2mn0y79";
|
||||
rev = "4e0c69a53b64ac90ca5235f176a070e003108113";
|
||||
sha256 = "1rhin9pcry3sgggvkzsmxd2s4x262m4x9xdvsrshkc2zj8wy8b0i";
|
||||
};
|
||||
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
|
||||
};
|
||||
|
||||
lightline-vim = buildVimPluginFrom2Nix {
|
||||
pname = "lightline-vim";
|
||||
version = "2020-08-15";
|
||||
version = "2020-08-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "itchyny";
|
||||
repo = "lightline.vim";
|
||||
rev = "c1883dbf23632e6c3ba0a26ba2bd8f92f5690fb3";
|
||||
sha256 = "0lkix2dbmmdp40qp5mlcmqscxs7sjg57mjjrvlsr9gg8r05dv6fq";
|
||||
rev = "1b412cf3af3dad79ee5807e6b151b8ac6aa4e2fc";
|
||||
sha256 = "074jp56m55mbvyhl5sw4pmg8ivjxqmah1kl3nyxk61hnnv1ackb3";
|
||||
};
|
||||
meta.homepage = "https://github.com/itchyny/lightline.vim/";
|
||||
};
|
||||
@ -2580,12 +2592,12 @@ let
|
||||
|
||||
neoformat = buildVimPluginFrom2Nix {
|
||||
pname = "neoformat";
|
||||
version = "2020-08-02";
|
||||
version = "2020-08-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbdchd";
|
||||
repo = "neoformat";
|
||||
rev = "2721992fa64b0c26031f514f7cce4f6b1399427f";
|
||||
sha256 = "0fp6r5zw3hn0wg6fhk1f90qcmamnxx18rwjx173d7rqap375pfgg";
|
||||
rev = "56a9d6259981d0d9c2b33a4d65ccbb674af70baa";
|
||||
sha256 = "0kn35l7kfqa0zvh1l8mdl3755hv1rx6xp5wjib9acsbk2czhg5nx";
|
||||
};
|
||||
meta.homepage = "https://github.com/sbdchd/neoformat/";
|
||||
};
|
||||
@ -2628,12 +2640,12 @@ let
|
||||
|
||||
neosnippet-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "neosnippet-snippets";
|
||||
version = "2020-07-28";
|
||||
version = "2020-08-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "neosnippet-snippets";
|
||||
rev = "06f8fdc40262f5f6b0cec19f0e572f0477ecc022";
|
||||
sha256 = "0mdf0qpnly4y7fh02zdpx59gvvj33nd5p90cc5620y6qfld0y13y";
|
||||
rev = "b7ba77a4eb39a95ffbb6b3ff0c3c43746441b2aa";
|
||||
sha256 = "0yf55pi6d35brdva4n0x7yygjnymwbgwn1fx83nbzxhixmgbk45b";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
|
||||
};
|
||||
@ -2724,12 +2736,12 @@ let
|
||||
|
||||
nerdtree = buildVimPluginFrom2Nix {
|
||||
pname = "nerdtree";
|
||||
version = "2020-08-14";
|
||||
version = "2020-08-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "preservim";
|
||||
repo = "nerdtree";
|
||||
rev = "23000acd7f9744667abc840dd10dd07a16e18fc6";
|
||||
sha256 = "1sapl458rrswgyqlm2pg8wxjqplryn3qnb1qqsh727ihfq5vfqjr";
|
||||
rev = "577ddc73f0a1d2fd6166ed3268ab8536111037e0";
|
||||
sha256 = "0bccr18nr42vwbb4i765yxjw18piyiyd12sm4snbkkxahp9yswf7";
|
||||
};
|
||||
meta.homepage = "https://github.com/preservim/nerdtree/";
|
||||
};
|
||||
@ -2820,12 +2832,12 @@ let
|
||||
|
||||
nvim-gdb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-gdb";
|
||||
version = "2020-05-20";
|
||||
version = "2020-08-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sakhnik";
|
||||
repo = "nvim-gdb";
|
||||
rev = "67c37060deba03d123c4654c1b3da426c92d6f61";
|
||||
sha256 = "0rsgpnl20pxfqcwd5gr89mkqv3im4s7v4d1cvxvi9wj0ix06pxm1";
|
||||
rev = "47b0828287b410b56ff1a31906c4d5709d143d4a";
|
||||
sha256 = "0kl2d58plpnlz2w9haadmbpmkb04bjwgfrs1scwi04mcc8dfpbmn";
|
||||
};
|
||||
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
|
||||
};
|
||||
@ -2868,12 +2880,12 @@ let
|
||||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2020-08-15";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "83210fa412b5b63a6e7717ae576536b7a10f6aef";
|
||||
sha256 = "14lkzdkkkzk8xp7ambzz688mh9cvibka82gqy063w75hrnz8y8yy";
|
||||
rev = "5c0ca925af3332769f04c122ecb5bb9a5ca36dd0";
|
||||
sha256 = "0fmciqdmg5fy1jx2wind0vyykfdvdbls0lyrn85xi4c7d8yg74h2";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
@ -3613,12 +3625,12 @@ let
|
||||
|
||||
tagbar = buildVimPluginFrom2Nix {
|
||||
pname = "tagbar";
|
||||
version = "2020-08-03";
|
||||
version = "2020-08-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "majutsushi";
|
||||
repo = "tagbar";
|
||||
rev = "a5090717dd8862be0a47a96731c6120ace544fe1";
|
||||
sha256 = "1iz26xj3mrshj0n6gpqa9xbk0i3lr0383bqdrq0yk0lp32ys5gh0";
|
||||
rev = "a81c01c29406df6aa59be221a17953c18ed57ccc";
|
||||
sha256 = "1amqxazfjnljylkj5jz3in927mkkhbvchs9pb5cnijfbvrf3dh5s";
|
||||
};
|
||||
meta.homepage = "https://github.com/majutsushi/tagbar/";
|
||||
};
|
||||
@ -3746,12 +3758,12 @@ let
|
||||
|
||||
traces-vim = buildVimPluginFrom2Nix {
|
||||
pname = "traces-vim";
|
||||
version = "2020-07-13";
|
||||
version = "2020-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "markonm";
|
||||
repo = "traces.vim";
|
||||
rev = "d8ff43209d6464d5239db724207d588e4153767d";
|
||||
sha256 = "0gf7jdisll5cz9myh67947xwh0v8513n64jxbsh2fbxh8rq5wb21";
|
||||
rev = "b38bdda4378b17888f5132787c49d79722c25752";
|
||||
sha256 = "0q29h348pgqxqw1pqq1nsj0nxccnb2x6jd92bpsqnjf452wsh2f2";
|
||||
};
|
||||
meta.homepage = "https://github.com/markonm/traces.vim/";
|
||||
};
|
||||
@ -3888,18 +3900,6 @@ let
|
||||
meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
|
||||
};
|
||||
|
||||
vim = buildVimPluginFrom2Nix {
|
||||
pname = "vim";
|
||||
version = "2020-07-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "vim";
|
||||
rev = "b64b22affafca7d3831a20949115b91031d596ec";
|
||||
sha256 = "1f5hwfcrsfq3yk53kkn4syaxmri8wh8h6rpq867468b8rdcnhq01";
|
||||
};
|
||||
meta.homepage = "https://github.com/dracula/vim/";
|
||||
};
|
||||
|
||||
vim-abolish = buildVimPluginFrom2Nix {
|
||||
pname = "vim-abolish";
|
||||
version = "2019-11-13";
|
||||
@ -4142,12 +4142,12 @@ let
|
||||
|
||||
vim-airline = buildVimPluginFrom2Nix {
|
||||
pname = "vim-airline";
|
||||
version = "2020-08-12";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-airline";
|
||||
repo = "vim-airline";
|
||||
rev = "19d1990f8613fa29fccbec60aa58101faf7549c1";
|
||||
sha256 = "14wbhgarwhq4akknv79vnqvl5q2pfx6pqpb42wf6d079j54x4ay1";
|
||||
rev = "ef4666bd86ea1d6ac06a709cde0cde3df537c9e3";
|
||||
sha256 = "0rql6vbfr78pnjpbavpkdh47bh4jlzcg5pjf7xcl0273v03b6rbf";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-airline/vim-airline/";
|
||||
};
|
||||
@ -4358,12 +4358,12 @@ let
|
||||
|
||||
vim-clap = buildVimPluginFrom2Nix {
|
||||
pname = "vim-clap";
|
||||
version = "2020-08-13";
|
||||
version = "2020-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liuchengxu";
|
||||
repo = "vim-clap";
|
||||
rev = "b51fdf94f4dec9c0e32b2a07ccd157aa3dfa6d57";
|
||||
sha256 = "0v4j192jixd8akiw4iclwkrjqix3ms5mb17gwhkcjksw4205r5zv";
|
||||
rev = "e690bde9e7838894b68f9d3d4d1a131e86c13ffb";
|
||||
sha256 = "1pl32zgwn7ffyfn8xqqlck48sqv78jv8v4pfjay0rgr3jvaxis1v";
|
||||
};
|
||||
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
||||
};
|
||||
@ -4538,12 +4538,12 @@ let
|
||||
|
||||
vim-css-color = buildVimPluginFrom2Nix {
|
||||
pname = "vim-css-color";
|
||||
version = "2020-08-15";
|
||||
version = "2020-08-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ap";
|
||||
repo = "vim-css-color";
|
||||
rev = "d2ccb376ebfeeef842456a7883164ef2c0d1656c";
|
||||
sha256 = "0260h5yhghyaxsbmx3imnjq1rfz5f5w60ypzr4y8p5a0bh8kvwmq";
|
||||
rev = "4694c6ea03a065a3f6ddbebce56797a21e8241ef";
|
||||
sha256 = "12bzxrdvb9s0d8llkq6h63g86qxs0gv9x7401apl6qrs79prrb4a";
|
||||
};
|
||||
meta.homepage = "https://github.com/ap/vim-css-color/";
|
||||
};
|
||||
@ -4922,12 +4922,12 @@ let
|
||||
|
||||
vim-floaterm = buildVimPluginFrom2Nix {
|
||||
pname = "vim-floaterm";
|
||||
version = "2020-08-11";
|
||||
version = "2020-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "voldikss";
|
||||
repo = "vim-floaterm";
|
||||
rev = "268a0744b9959d78a54b1257d0462e5f34fc52c5";
|
||||
sha256 = "1gk3jk8iqj41sw4wn4kqr66gxp75bs8c1fxc47n33gca8mpnr8l0";
|
||||
rev = "2de1b9bdea54baeb40bc6f3fe761309b4435d156";
|
||||
sha256 = "09m31j8cgd8pnyd4p2rh7bj74gh27df98cjy13diljaa56jd6grr";
|
||||
};
|
||||
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
|
||||
};
|
||||
@ -5066,12 +5066,12 @@ let
|
||||
|
||||
vim-go = buildVimPluginFrom2Nix {
|
||||
pname = "vim-go";
|
||||
version = "2020-08-13";
|
||||
version = "2020-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatih";
|
||||
repo = "vim-go";
|
||||
rev = "bd56f5690807d4a92652fe7a4d10dc08f260564e";
|
||||
sha256 = "1gd30pnmrg4422dg7g14r9z539bz8vzssyfmm6ml6kgzn0pagzi0";
|
||||
rev = "7c14e8ae5de7f4562c365249c83abc4d0e0d906c";
|
||||
sha256 = "1l96mlkfvpsa2bw9rc4m8s7abjvcfyy05gsm445rzbijqxigkknk";
|
||||
};
|
||||
meta.homepage = "https://github.com/fatih/vim-go/";
|
||||
};
|
||||
@ -5090,12 +5090,12 @@ let
|
||||
|
||||
vim-graphql = buildVimPluginFrom2Nix {
|
||||
pname = "vim-graphql";
|
||||
version = "2020-03-30";
|
||||
version = "2020-08-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jparise";
|
||||
repo = "vim-graphql";
|
||||
rev = "a3ff39f955e60baeddd8c3c4d1cab291ce37d66e";
|
||||
sha256 = "0d98b0zpbyjcafp0q25c3qsx13q74nszxsi5jxxjnpz1wv6s83x1";
|
||||
rev = "1b9db5b2089751dc80a5dab9fa976a9750c3066c";
|
||||
sha256 = "14bp6knckqa8rc9xwd5cnd6cnfhi0j6vgv0yl5nin47yzv0navha";
|
||||
};
|
||||
meta.homepage = "https://github.com/jparise/vim-graphql/";
|
||||
};
|
||||
@ -6159,12 +6159,12 @@ let
|
||||
|
||||
vim-polyglot = buildVimPluginFrom2Nix {
|
||||
pname = "vim-polyglot";
|
||||
version = "2020-08-14";
|
||||
version = "2020-08-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sheerun";
|
||||
repo = "vim-polyglot";
|
||||
rev = "a3bdbcdb3c60a9563fb90e02b28ae46cee5ef974";
|
||||
sha256 = "1h9993j9w8883hi4fllykim261srphlzv7lfww0bvr0whi77hv1r";
|
||||
rev = "0df1bfa0c5f3efb6688566d5656a330034772037";
|
||||
sha256 = "1ba96gk3qs1d2zaxs24dk624z9b9ip7yx4vg0klasf4xq8s6kwjs";
|
||||
};
|
||||
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
|
||||
};
|
||||
@ -6627,12 +6627,12 @@ let
|
||||
|
||||
vim-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "vim-snippets";
|
||||
version = "2020-08-14";
|
||||
version = "2020-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "honza";
|
||||
repo = "vim-snippets";
|
||||
rev = "a7486b266a5e1dc92228e575969e10b5b95efad8";
|
||||
sha256 = "05di0x6a0cd9w02l3aybixin2yidpla2js0pyx4v4as595izl10q";
|
||||
rev = "c093074fec6ba83aced4958ea44af11c5e5dff30";
|
||||
sha256 = "0919fhzpg7scm7idq4vh7kqjvlmc4037cn5d24ggsvziybi07k9p";
|
||||
};
|
||||
meta.homepage = "https://github.com/honza/vim-snippets/";
|
||||
};
|
||||
@ -6771,24 +6771,24 @@ let
|
||||
|
||||
vim-SyntaxRange = buildVimPluginFrom2Nix {
|
||||
pname = "vim-SyntaxRange";
|
||||
version = "2020-06-17";
|
||||
version = "2020-08-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "inkarkat";
|
||||
repo = "vim-SyntaxRange";
|
||||
rev = "63c382eabfb5dd0b1e837dc6a42b14f3fe000ff9";
|
||||
sha256 = "1c62m2k08vnla3zd3rb716y6vp5ijn8b36fv48jw77y579k9l6pk";
|
||||
rev = "602316468bc044e047db88f50157b61fa00b65cb";
|
||||
sha256 = "0zrrvd9xrivx61fiz799mdbwdzl7damdgm6i9h0sl1v95hclhi3i";
|
||||
};
|
||||
meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/";
|
||||
};
|
||||
|
||||
vim-table-mode = buildVimPluginFrom2Nix {
|
||||
pname = "vim-table-mode";
|
||||
version = "2020-08-02";
|
||||
version = "2020-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhruvasagar";
|
||||
repo = "vim-table-mode";
|
||||
rev = "88cb2e44b60f4fa7d2e242c43ee90c5f6079e82c";
|
||||
sha256 = "1ny17d30pk8z96zr8qh9g04n57ix4pjm3sg0a80b2qq82anxkmvs";
|
||||
rev = "3476c4e517aa86bc131c707d32f2e508bd5be468";
|
||||
sha256 = "0vglazxlsg7ai4c5znxaddpjnfhz6a9slzs0kzzqvmhd3xr7vfg1";
|
||||
};
|
||||
meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/";
|
||||
};
|
||||
@ -7120,24 +7120,24 @@ let
|
||||
|
||||
vim-vsnip = buildVimPluginFrom2Nix {
|
||||
pname = "vim-vsnip";
|
||||
version = "2020-08-15";
|
||||
version = "2020-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "vim-vsnip";
|
||||
rev = "fa412d7ad3d98446bfd3c14cf2e279226161de9d";
|
||||
sha256 = "1kpi2ygj1b7n93md66awrg9jna9q4iqzgjm95695b6403ljkpvnv";
|
||||
rev = "bf0d6c142721d3c1e3ce1f35b205655657db13c9";
|
||||
sha256 = "1z90g90h0yc9xiwl4bwbq3nawks0rzsbxr1ryy07w3qjcg7kwrdp";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
|
||||
};
|
||||
|
||||
vim-vsnip-integ = buildVimPluginFrom2Nix {
|
||||
pname = "vim-vsnip-integ";
|
||||
version = "2020-07-07";
|
||||
version = "2020-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "vim-vsnip-integ";
|
||||
rev = "b3188a81a753a5274809a99c1550d7c981560b1b";
|
||||
sha256 = "03cqz9rnv9fwjygrr3iflcbcvr0mjdjx0l32cdr9lkaddavlwqkz";
|
||||
rev = "4a076bea73e307738ac5d08f60a0936cab391efd";
|
||||
sha256 = "1jx6ijmj48ffymfn20d0syp1ywv19gmjvf3hb6rdwsk421y58chv";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
|
||||
};
|
||||
@ -7372,12 +7372,12 @@ let
|
||||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2020-08-13";
|
||||
version = "2020-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "ebb422c3c87c9f2cb333fac2b42b8e45ecc7f441";
|
||||
sha256 = "04vzv73bdiqdj1f1k62yzrdrb3qlql62sxpyq8hwc8sz1gc1kh8h";
|
||||
rev = "e14617591fcf59b638d25320215a80f437009119";
|
||||
sha256 = "10nlqbqfna5lvlk6rd4zsr5056vx2d22n6hm8sdpxp094nrqbdic";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
@ -83,7 +83,7 @@ digitaltoad/vim-pug
|
||||
direnv/direnv.vim
|
||||
dleonard0/pony-vim-syntax
|
||||
dmix/elvish.vim
|
||||
dracula/vim
|
||||
dracula/vim as dracula-vim
|
||||
drewtempelmeyer/palenight.vim
|
||||
drmingdrmer/xptemplate
|
||||
dylanaraps/wal.vim
|
||||
|
@ -18,12 +18,12 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "jellyfin";
|
||||
version = "10.6.2";
|
||||
version = "10.6.3";
|
||||
|
||||
# Impossible to build anything offline with dotnet
|
||||
src = fetchurl {
|
||||
url = "https://repo.jellyfin.org/releases/server/portable/stable/combined/jellyfin_${version}.tar.gz";
|
||||
sha256 = "16yib2k9adch784p6p0whgfb6lrjzwiigg1n14cp88dx64hyhxhb";
|
||||
sha256 = "bqGIXS+T82jGMObMPMyYSjzQ+qZnACW4Q7WpV948crc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -1,8 +1,8 @@
|
||||
{ lib, buildGoModule, fetchurl, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "7.0.4";
|
||||
version = "7.1.3";
|
||||
|
||||
excludedPackages = [ "release_publisher" ];
|
||||
|
||||
@ -10,17 +10,15 @@ buildGoModule rec {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "16vdbxq9vhv71jjk689xx0nn3qr4s5ybzbp41dm09pppvxzibpg7";
|
||||
sha256 = "1acvvqsgwfrkqmbgzdxfa8shwmx7c91agaqv3gsfgpqkqwp3pnmh";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "1362rwmpv1y32w5m1fd9vqffs32244f0h7d5jm5cigiq2l7ix7n2";
|
||||
sha256 = "0c72xmazr3rgiccrqcy02w30159vsq9d78dkqf5c2yjqn8zzwf98";
|
||||
};
|
||||
|
||||
vendorSha256 = "00xvpxhnvxdf030978paywl794mlmgqzd94b64hh67946acnbjcl";
|
||||
|
||||
doCheck = false;
|
||||
vendorSha256 = "11zi7a4mqi80m5z4zcrc6wnzhgk6xnmzisrk2v4vpmfp33s732lz";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pkg/cmd/grafana-server/main.go \
|
||||
@ -33,6 +31,8 @@ buildGoModule rec {
|
||||
mv grafana-*/{public,conf,tools} $out/share/grafana/
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) grafana; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB";
|
||||
license = licenses.asl20;
|
||||
|
25
pkgs/tools/archivers/bomutils/default.nix
Normal file
25
pkgs/tools/archivers/bomutils/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bomutils";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hogliux";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1i7nhbq1fcbrjwfg64znz8p4l7662f7qz2l6xcvwd5z93dnmgmdr";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/hogliux/bomutils";
|
||||
description = "Open source tools to create bill-of-materials files used in macOS installers";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mstflint";
|
||||
version = "4.14.0-1";
|
||||
version = "4.14.0-3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mellanox";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0xrwx623vl17cqzpacil74m2fi4xrshgvvzxiplz1wq47gq7wp1i";
|
||||
sha256 = "0zy9npyzf7dkxlfl9mx6997aa61mk23ixpjb01ckb1wvav5k6z82";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
@ -1,18 +1,19 @@
|
||||
{ rustPlatform, stdenv, fetchFromGitHub, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "MozWire";
|
||||
version = "0.4.1";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NilsIrl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1slfb6m22vzglnrxahlhdcwzwpf3b817mskdx628s92mjzngzyih";
|
||||
sha256 = "07icgswmfvrvlm3mkm78pbbk6m2hb73j7ffj7r77whzb11v027v1";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoSha256 = "0b00j8vn1vvvphcyv8li7i73pq66sq6dr4wc1w4s3pppa151xr55";
|
||||
cargoSha256 = "10lhz7bdlfqj7wgsqnsxdfskms33pvj176fhf4kwci7nb8vgai4b";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN";
|
||||
|
@ -2,11 +2,13 @@
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, installShellFiles
|
||||
, ronn
|
||||
, curl
|
||||
, libgit2
|
||||
, libssh2
|
||||
, openssl
|
||||
, pkg-config
|
||||
, Security
|
||||
, zlib
|
||||
}:
|
||||
@ -25,10 +27,22 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v4.1.1.patch ];
|
||||
cargoSha256 = "1yaawp015gdnlfqkdmqsf95gszz0h5j1vpfjh763y7kk0bp7zswl";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ];
|
||||
|
||||
buildInputs = [ libgit2 libssh2 openssl zlib ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ];
|
||||
|
||||
postBuild = ''
|
||||
# Man pages contain non-ASCII, so explicitly set encoding to UTF-8.
|
||||
HOME=$TMPDIR \
|
||||
RUBYOPT="-E utf-8:utf-8" \
|
||||
ronn -r --organization="cargo-update developers" man/*.md
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/*.1
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A cargo subcommand for checking and applying updates to installed executables";
|
||||
homepage = "https://github.com/nabijaczleweli/cargo-update";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shfmt";
|
||||
@ -17,6 +17,14 @@ buildGoModule rec {
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
patches = [
|
||||
# fix failing test on go 1.15, remove with > 3.1.2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mvdan/sh/commit/88956f97dae1f268af6c030bf2ba60762ebb488a.patch";
|
||||
sha256 = "1zg8i7kklr12zjkaxh8djd2bzkdx8klgfj271r2wivkc2x61shgv";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mvdan/sh";
|
||||
description = "A shell parser and formatter";
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asciidoctorj";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
|
||||
sha256 = "0gp45vwm0hl8590014qrxlpw2rycxm7ir819d242mh38v3hdjgkz";
|
||||
sha256 = "1bp26x5mhbl25s9djlq6yani1vaqrgbi5mjljhwhj97iapwsd0yb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lowdown";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
|
||||
sha512 = "3ks1jfw4rjm0qb87ask7wx0xx1grxhbpg53r86q74zhsiqqi6xiza2czg75mydmgic1nr9ny43d5p44sl8ihhja9kwdx230nblx1176";
|
||||
sha512 = "14mx22aqr9cmin4cyhrclhm0hly1i21j2dmsikfp1c87wl2kpn9xgxnix5r0iqh5dwjxdh591rfh21xjp0l11m0nl5wkpnn7wmq7g6b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
|
@ -114,7 +114,6 @@ mapAliases ({
|
||||
docker_compose = docker-compose; # 2018-11-10
|
||||
draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14
|
||||
dwarf_fortress = dwarf-fortress; # added 2016-01-23
|
||||
emacsMelpa = emacs25Packages; # for backward compatibility
|
||||
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
|
||||
emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
|
||||
emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
|
||||
|
@ -900,6 +900,8 @@ in
|
||||
|
||||
calls = callPackage ../applications/networking/calls { };
|
||||
|
||||
inherit (nodePackages) castnow;
|
||||
|
||||
certigo = callPackage ../tools/admin/certigo { };
|
||||
|
||||
catcli = python3Packages.callPackage ../tools/filesystems/catcli { };
|
||||
@ -2498,6 +2500,8 @@ in
|
||||
|
||||
bogofilter = callPackage ../tools/misc/bogofilter { };
|
||||
|
||||
bomutils = callPackage ../tools/archivers/bomutils { };
|
||||
|
||||
bsdbuild = callPackage ../development/tools/misc/bsdbuild { };
|
||||
|
||||
bsdiff = callPackage ../tools/compression/bsdiff { };
|
||||
@ -9303,7 +9307,9 @@ in
|
||||
|
||||
mosml = callPackage ../development/compilers/mosml { };
|
||||
|
||||
mozart2 = callPackage ../development/compilers/mozart { };
|
||||
mozart2 = callPackage ../development/compilers/mozart {
|
||||
emacs = emacs-nox;
|
||||
};
|
||||
|
||||
mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
|
||||
|
||||
@ -11507,6 +11513,8 @@ in
|
||||
|
||||
xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { };
|
||||
|
||||
xxe-pe = callPackage ../applications/editors/xxe-pe { };
|
||||
|
||||
xxdiff-tip = xxdiff;
|
||||
|
||||
yaml2json = callPackage ../development/tools/yaml2json { };
|
||||
@ -19864,7 +19872,7 @@ in
|
||||
|
||||
electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };
|
||||
|
||||
electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { };
|
||||
electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { };
|
||||
|
||||
elementary-planner = callPackage ../applications/office/elementary-planner { };
|
||||
|
||||
@ -19872,11 +19880,31 @@ in
|
||||
|
||||
elvis = callPackage ../applications/editors/elvis { };
|
||||
|
||||
emacs = emacs26;
|
||||
emacsPackages = emacs26Packages;
|
||||
emacs-nox = emacs26-nox;
|
||||
emacs = emacs27;
|
||||
emacsPackages = emacs27Packages;
|
||||
emacs-nox = emacs27-nox;
|
||||
emacsWithPackages = emacsPackages.emacsWithPackages;
|
||||
|
||||
emacs26 = callPackage ../applications/editors/emacs {
|
||||
emacs27 = callPackage ../applications/editors/emacs/27.nix {
|
||||
# use override to enable additional features
|
||||
libXaw = xorg.libXaw;
|
||||
Xaw3d = null;
|
||||
gconf = null;
|
||||
alsaLib = null;
|
||||
imagemagick = null;
|
||||
acl = null;
|
||||
gpm = null;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
|
||||
};
|
||||
|
||||
emacs27-nox = lowPrio (appendToName "nox" (emacs27.override {
|
||||
withX = false;
|
||||
withNS = false;
|
||||
withGTK2 = false;
|
||||
withGTK3 = false;
|
||||
}));
|
||||
|
||||
emacs26 = callPackage ../applications/editors/emacs/26.nix {
|
||||
# use override to enable additional features
|
||||
libXaw = xorg.libXaw;
|
||||
Xaw3d = null;
|
||||
@ -19895,24 +19923,6 @@ in
|
||||
withGTK3 = false;
|
||||
}));
|
||||
|
||||
emacs25 = callPackage ../applications/editors/emacs/25.nix {
|
||||
# use override to enable additional features
|
||||
libXaw = xorg.libXaw;
|
||||
Xaw3d = null;
|
||||
gconf = null;
|
||||
alsaLib = null;
|
||||
imagemagick = null;
|
||||
acl = null;
|
||||
gpm = null;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
|
||||
};
|
||||
|
||||
emacs25-nox = lowPrio (appendToName "nox" (emacs25.override {
|
||||
withX = false;
|
||||
withGTK2 = false;
|
||||
withGTK3 = false;
|
||||
}));
|
||||
|
||||
emacsMacport = callPackage ../applications/editors/emacs/macport.nix {
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
|
||||
@ -19944,12 +19954,10 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25);
|
||||
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26);
|
||||
|
||||
emacs25WithPackages = emacs25Packages.emacsWithPackages;
|
||||
emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27);
|
||||
emacs26WithPackages = emacs26Packages.emacsWithPackages;
|
||||
emacsWithPackages = emacsPackages.emacsWithPackages;
|
||||
emacs27WithPackages = emacs27Packages.emacsWithPackages;
|
||||
|
||||
inherit (gnome3) empathy;
|
||||
|
||||
@ -21052,7 +21060,7 @@ in
|
||||
akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
|
||||
kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
|
||||
keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
|
||||
kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle;
|
||||
kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle;
|
||||
|
||||
okteta = libsForQt5.callPackage ../applications/editors/okteta { };
|
||||
|
||||
@ -21285,6 +21293,8 @@ in
|
||||
ledger-autosync = callPackage ../applications/office/ledger-autosync { };
|
||||
|
||||
ledger-web = callPackage ../applications/office/ledger-web { };
|
||||
|
||||
lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { };
|
||||
|
||||
lighthouse = callPackage ../applications/misc/lighthouse { };
|
||||
|
||||
@ -21648,6 +21658,7 @@ in
|
||||
convert = callPackage ../applications/video/mpv/scripts/convert.nix {};
|
||||
mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {};
|
||||
simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {};
|
||||
sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {};
|
||||
};
|
||||
|
||||
mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
|
||||
@ -23899,6 +23910,8 @@ in
|
||||
|
||||
xmacro = callPackage ../tools/X11/xmacro { };
|
||||
|
||||
xmenu = callPackage ../applications/misc/xmenu { };
|
||||
|
||||
xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { };
|
||||
|
||||
xmp = callPackage ../applications/audio/xmp { };
|
||||
@ -24599,6 +24612,8 @@ in
|
||||
|
||||
nxengine-evo = callPackage ../games/nxengine-evo { };
|
||||
|
||||
oci-seccomp-bpf-hook = callPackage ../applications/virtualization/oci-seccomp-bpf-hook { };
|
||||
|
||||
odamex = callPackage ../games/odamex { };
|
||||
|
||||
oilrush = callPackage ../games/oilrush { };
|
||||
@ -26218,6 +26233,8 @@ in
|
||||
|
||||
cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { };
|
||||
|
||||
cups-brother-hl1210w = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1210w { };
|
||||
|
||||
cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { };
|
||||
|
||||
cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { };
|
||||
@ -26314,7 +26331,8 @@ in
|
||||
fuse-emulator = callPackage ../misc/emulators/fuse-emulator {};
|
||||
|
||||
gajim = callPackage ../applications/networking/instant-messengers/gajim {
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
|
||||
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
|
||||
};
|
||||
|
||||
gammu = callPackage ../applications/misc/gammu { };
|
||||
|
@ -300,6 +300,8 @@ let
|
||||
|
||||
gen = callPackage ../development/ocaml-modules/gen { };
|
||||
|
||||
genspio = callPackage ../development/ocaml-modules/genspio { };
|
||||
|
||||
gmap = callPackage ../development/ocaml-modules/gmap { };
|
||||
|
||||
gnuplot = callPackage ../development/ocaml-modules/gnuplot {
|
||||
@ -573,6 +575,8 @@ let
|
||||
|
||||
nocrypto = callPackage ../development/ocaml-modules/nocrypto { };
|
||||
|
||||
nonstd = callPackage ../development/ocaml-modules/nonstd { };
|
||||
|
||||
notty = callPackage ../development/ocaml-modules/notty { };
|
||||
|
||||
npy = callPackage ../development/ocaml-modules/npy {
|
||||
@ -756,6 +760,8 @@ let
|
||||
|
||||
seq = callPackage ../development/ocaml-modules/seq { };
|
||||
|
||||
sosa = callPackage ../development/ocaml-modules/sosa { };
|
||||
|
||||
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
|
||||
|
||||
sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
|
||||
|
@ -38,7 +38,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
|
||||
dhcp = linux;
|
||||
diffutils = all;
|
||||
e2fsprogs = linux;
|
||||
emacs25 = linux;
|
||||
emacs = linux;
|
||||
enscript = all;
|
||||
file = all;
|
||||
findutils = all;
|
||||
|
Loading…
Reference in New Issue
Block a user