b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Jan Tojnar 2021-01-14 02:24:17 +01:00
parent 318e673af0 acc4bb890e
commit b813710c04
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
102 changed files with 2621 additions and 2559 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/builders/packages/emacs.section.md
View file

@ -2,12 +2,12 @@
## Configuring Emacs {#sec-emacs-config}
The Emacs package comes with some extra helpers to make it easier to configure. `emacsWithPackages` allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override:
The Emacs package comes with some extra helpers to make it easier to configure. `emacs.pkgs.withPackages` allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override:
```nix
{
packageOverrides = pkgs: with pkgs; {
myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [
company
counsel
flycheck
@ -84,7 +84,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
(projectile-global-mode))
'';
myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [
(runCommand "default.el" {} ''
mkdir -p $out/share/emacs/site-lisp
cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
@ -103,14 +103,14 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing `-q` to the Emacs command.
Sometimes `emacsWithPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`.
Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`.
```nix
overrides = self: super: rec {
haskell-mode = self.melpaPackages.haskell-mode;
...
};
((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages
((emacsPackagesFor emacs).overrideScope' overrides).emacs.pkgs.withPackages
(p: with p; [
# here both these package will use haskell-mode of our own choice
ghc-mod

12
maintainers/maintainer-list.nix
View file

@ -3771,6 +3771,12 @@
githubId = 7481521;
name = "Balázs Lengyel";
};
ilian = {
email = "ilian@tuta.io";
github = "ilian";
githubId = 25505957;
name = "Ilian";
};
ilikeavocadoes = {
email = "ilikeavocadoes@hush.com";
github = "ilikeavocadoes";
@ -6559,12 +6565,6 @@
github = "NobbZ";
githubId = 58951;
};
nocent = {
email = "nocent@protonmail.ch";
github = "nocent";
githubId = 25505957;
name = "nocent";
};
nocoolnametom = {
email = "nocoolnametom@gmail.com";
github = "nocoolnametom";

11
nixos/modules/profiles/all-hardware.nix
View file

@ -3,8 +3,10 @@
# enabled in the initrd. Its primary use is in the NixOS installation
# CDs.
{ ... }:
{ pkgs, lib,... }:
let
platform = pkgs.stdenv.hostPlatform;
in
{
# The initrd has to contain any module that might be necessary for
@ -42,7 +44,10 @@
"virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
# VMware support.
"mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock"
"mptspi" "vmxnet3" "vsock"
] ++ lib.optional platform.isx86 "vmw_balloon"
++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
"vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
# Hyper-V support.
"hv_storvsc"

10
nixos/modules/services/editors/emacs.xml
View file

@ -156,7 +156,7 @@ $ ./result/bin/emacs
let
myEmacs = pkgs.emacs; <co xml:id="ex-emacsNix-2" />
emacsWithPackages = (pkgs.emacsPackagesGen myEmacs).emacsWithPackages; <co xml:id="ex-emacsNix-3" />
emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages; <co xml:id="ex-emacsNix-3" />
in
emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ <co xml:id="ex-emacsNix-4" />
magit # ; Integrate git &lt;C-x g&gt;
@ -254,10 +254,10 @@ in
<example xml:id="module-services-emacs-querying-packages">
<title>Querying Emacs packages</title>
<programlisting><![CDATA[
nix-env -f "<nixpkgs>" -qaP -A emacsPackages.elpaPackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackages.melpaPackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackages.melpaStablePackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages
nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.elpaPackages
nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaPackages
nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaStablePackages
nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.orgPackages
]]></programlisting>
</example>
</para>

3
nixos/modules/services/misc/matrix-synapse.xml
View file

@ -69,6 +69,9 @@ in {
# i.e. to delegate from the host being accessible as ${config.networking.domain}
# to another host actually running the Matrix homeserver.
"${config.networking.domain}" = {
<link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;
<link linkend="opt-services.nginx.virtualHosts._name_.forceSSL">forceSSL</link> = true;
<link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.extraConfig">locations."= /.well-known/matrix/server".extraConfig</link> =
let
# use 443 instead of the default 8448 port to unite

9
nixos/modules/services/networking/murmur.nix
View file

@ -109,6 +109,13 @@ in
description = "Host to bind to. Defaults binding on all addresses.";
};
package = mkOption {
type = types.package;
default = pkgs.murmur;
defaultText = "pkgs.murmur";
description = "Overridable attribute of the murmur package to use.";
};
password = mkOption {
type = types.str;
default = "";
@ -299,7 +306,7 @@ in
Type = if forking then "forking" else "simple";
PIDFile = mkIf forking "/run/murmur/murmurd.pid";
EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
ExecStart = "${pkgs.murmur}/bin/murmurd -ini /run/murmur/murmurd.ini";
ExecStart = "${cfg.package}/bin/murmurd -ini /run/murmur/murmurd.ini";
Restart = "always";
RuntimeDirectory = "murmur";
RuntimeDirectoryMode = "0700";

2
nixos/modules/services/x11/window-managers/exwm.nix
View file

@ -48,7 +48,7 @@ in
description = ''
Extra packages available to Emacs. The value must be a
function which receives the attrset defined in
<varname>emacsPackages</varname> as the sole argument.
<varname>emacs.pkgs</varname> as the sole argument.
'';
};
};

6
nixos/modules/virtualisation/docker.nix
View file

@ -155,19 +155,17 @@ in
users.groups.docker.gid = config.ids.gids.docker;
systemd.packages = [ cfg.package ];
# TODO: remove once docker 20.10 is released
systemd.enableUnifiedCgroupHierarchy = false;
systemd.services.docker = {
wantedBy = optional cfg.enableOnBoot "multi-user.target";
environment = proxy_env;
serviceConfig = {
Type = "notify";
ExecStart = [
""
''
${cfg.package}/bin/dockerd \
--group=docker \
--host=fd:// \
--host=unix:// \
--log-driver=${cfg.logDriver} \
${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
${optionalString cfg.liveRestore "--live-restore" } \

4
pkgs/applications/audio/reaper/default.nix
View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "reaper";
version = "6.12c";
version = "6.19";
src = fetchurl {
url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w";
sha256 = "1cdy5ilpfidz7xyqn2i41szr24ilcmpl35aw1vbashf0b6dg48la";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

8
pkgs/applications/blockchains/exodus/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango,
atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk,
cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
stdenv.mkDerivation rec {
pname = "exodus";
version = "20.12.4";
version = "21.1.7";
src = fetchurl {
url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
sha256 = "1j1iqmcbwfj72l7g83ah701bipas9cqwazyhh0af5hp2ckj9nmmf";
sha256 = "sha256-im0z3g225EhboJFoHBweHefn2QAKvYGSAP7e4Mz6Jm8=";
};
sourceRoot = ".";
@ -62,6 +62,8 @@ stdenv.mkDerivation rec {
libpulseaudio
systemd
vivaldi-ffmpeg-codecs
libxkbcommon
mesa
];
in ''
patchelf \

2
pkgs/applications/editors/bonzomatic/default.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
unlicense
unfreeRedistributable # contains libbass.so in repository
];
maintainers = [ maintainers.nocent ];
maintainers = [ maintainers.ilian ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

652
pkgs/applications/editors/emacs-modes/elpa-generated.nix generated
View file

@ -69,10 +69,10 @@
elpaBuild {
pname = "adaptive-wrap";
ename = "adaptive-wrap";
version = "0.7";
version = "0.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/adaptive-wrap-0.7.el";
sha256 = "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp";
url = "https://elpa.gnu.org/packages/adaptive-wrap-0.8.tar";
sha256 = "1gs1pqzywvvw4prj63vpj8abh8h14pjky11xfl23pgpk9l3ldrb0";
};
packageRequires = [];
meta = {
@ -223,10 +223,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.0.1";
version = "13.0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.0.1.tar";
sha256 = "1y5q3phd0xr7342i757hr4hic8nad4kkdf1zk56mlj5snwr0g0w7";
url = "https://elpa.gnu.org/packages/auctex-13.0.3.tar";
sha256 = "1ljpkr0z15fyh907jbgky238dvci5vqi3xhvslyhblhp8sg9cbsi";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -553,21 +553,6 @@
license = lib.licenses.free;
};
}) {};
company = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "company";
ename = "company";
version = "0.9.13";
src = fetchurl {
url = "https://elpa.gnu.org/packages/company-0.9.13.tar";
sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/company.html";
license = lib.licenses.free;
};
}) {};
company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "company-ebdb";
@ -651,21 +636,6 @@
license = lib.licenses.free;
};
}) {};
cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "cpio-mode";
ename = "cpio-mode";
version = "0.17";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar";
sha256 = "144ajbxmz6amb2234a278c9sl4zg69ndswb8vk0mcq8y9s2abm1x";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
license = lib.licenses.free;
};
}) {};
crisp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "crisp";
@ -726,21 +696,6 @@
license = lib.licenses.free;
};
}) {};
dash = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "dash";
ename = "dash";
version = "2.12.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dash-2.12.0.tar";
sha256 = "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/dash.html";
license = lib.licenses.free;
};
}) {};
dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "dbus-codegen";
@ -771,21 +726,6 @@
license = lib.licenses.free;
};
}) {};
delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
elpaBuild {
pname = "delight";
ename = "delight";
version = "1.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/delight-1.7.el";
sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1";
};
packageRequires = [ cl-lib nadvice ];
meta = {
homepage = "https://elpa.gnu.org/packages/delight.html";
license = lib.licenses.free;
};
}) {};
dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }:
elpaBuild {
pname = "dict-tree";
@ -801,36 +741,6 @@
license = lib.licenses.free;
};
}) {};
diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "diff-hl";
ename = "diff-hl";
version = "1.8.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar";
sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/diff-hl.html";
license = lib.licenses.free;
};
}) {};
diffview = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "diffview";
ename = "diffview";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/diffview-1.0.el";
sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/diffview.html";
license = lib.licenses.free;
};
}) {};
dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "dired-du";
@ -846,21 +756,6 @@
license = lib.licenses.free;
};
}) {};
dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "dired-git-info";
ename = "dired-git-info";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.el";
sha256 = "1kd0rpw7l32wvwi7q8s0inx4bc66xrl7hkllnlicyczsnzw2z52z";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/dired-git-info.html";
license = lib.licenses.free;
};
}) {};
disk-usage = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "disk-usage";
@ -876,21 +771,6 @@
license = lib.licenses.free;
};
}) {};
dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "dismal";
ename = "dismal";
version = "1.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dismal-1.5.tar";
sha256 = "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://elpa.gnu.org/packages/dismal.html";
license = lib.licenses.free;
};
}) {};
djvu = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "djvu";
@ -966,59 +846,14 @@
license = lib.licenses.free;
};
}) {};
ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }:
elpaBuild {
pname = "ebdb-gnorb";
ename = "ebdb-gnorb";
version = "1.0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el";
sha256 = "0bma7mqilp3lfgv0z2mk6nnqzh1nn1prkz2aiwrs4hxwydmda13i";
};
packageRequires = [ ebdb gnorb ];
meta = {
homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
license = lib.licenses.free;
};
}) {};
ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }:
elpaBuild {
pname = "ebdb-i18n-chn";
ename = "ebdb-i18n-chn";
version = "1.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.1.el";
sha256 = "02drr89i4kzjm1rs22sj0nv9sj95dmqk40xvxd75qzfn8y33k9vl";
};
packageRequires = [ ebdb pyim ];
meta = {
homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
license = lib.licenses.free;
};
}) {};
ediprolog = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "ediprolog";
ename = "ediprolog";
version = "2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ediprolog-2.1.el";
sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/ediprolog.html";
license = lib.licenses.free;
};
}) {};
eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "eev";
ename = "eev";
version = "20201013";
version = "20210102";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20201013.tar";
sha256 = "1frwlcqi8kjm13x3i6pw70kqcr306rikaanyfxyn6i5brm1ncxk8";
url = "https://elpa.gnu.org/packages/eev-20210102.tar";
sha256 = "14vpgcncmzzbv8v78v221hdhigvk00vqiizwd8dy0b7hqz6gl0rq";
};
packageRequires = [ emacs ];
meta = {
@ -1099,36 +934,6 @@
license = lib.licenses.free;
};
}) {};
electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "electric-spacing";
ename = "electric-spacing";
version = "5.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/electric-spacing-5.0.el";
sha256 = "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/electric-spacing.html";
license = lib.licenses.free;
};
}) {};
elisp-benchmarks = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "elisp-benchmarks";
ename = "elisp-benchmarks";
version = "1.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar";
sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
license = lib.licenses.free;
};
}) {};
emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
elpaBuild {
pname = "emms";
@ -1159,21 +964,6 @@
license = lib.licenses.free;
};
}) {};
epoch-view = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "epoch-view";
ename = "epoch-view";
version = "0.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el";
sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/epoch-view.html";
license = lib.licenses.free;
};
}) {};
ergoemacs-mode = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -1194,43 +984,6 @@
license = lib.licenses.free;
};
}) {};
excorporate = callPackage ({ elpaBuild
, emacs
, fetchurl
, fsm
, lib
, nadvice
, soap-client
, url-http-ntlm }:
elpaBuild {
pname = "excorporate";
ename = "excorporate";
version = "0.9.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/excorporate-0.9.1.tar";
sha256 = "15rk0br7dmvni10f3mm94ylybl3jbf2ps1sypis6hxbazxxr443j";
};
packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
meta = {
homepage = "https://elpa.gnu.org/packages/excorporate.html";
license = lib.licenses.free;
};
}) {};
expand-region = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "expand-region";
ename = "expand-region";
version = "0.11.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/expand-region-0.11.0.tar";
sha256 = "1q6xaqkv40z4c6rgdkxqqkvxgsaj8yjqjrxi40kz5y0ck3bjrk0i";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/expand-region.html";
license = lib.licenses.free;
};
}) {};
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }:
elpaBuild {
pname = "exwm";
@ -1306,21 +1059,6 @@
license = lib.licenses.free;
};
}) {};
fountain-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "fountain-mode";
ename = "fountain-mode";
version = "2.7.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/fountain-mode-2.7.3.el";
sha256 = "1sz3qp3y52d05jd006zc99r4ryignpa2jgfk72rw3zfqmikzv15j";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/fountain-mode.html";
license = lib.licenses.free;
};
}) {};
frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "frame-tabs";
@ -1381,21 +1119,6 @@
license = lib.licenses.free;
};
}) {};
ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ggtags";
ename = "ggtags";
version = "0.8.13";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ggtags-0.8.13.el";
sha256 = "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/ggtags.html";
license = lib.licenses.free;
};
}) {};
gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gited";
@ -1512,10 +1235,10 @@
elpaBuild {
pname = "gnus-mock";
ename = "gnus-mock";
version = "0.4.5";
version = "0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnus-mock-0.4.5.tar";
sha256 = "1hfh315vrxd54r2f1wpdfk06b7lhpab7knygav58vdwwdbndlqiz";
url = "https://elpa.gnu.org/packages/gnus-mock-0.5.tar";
sha256 = "1lyh1brb68zaasnw2brymsspcyl3jxmnvbvpvrqfxhhl3fq9nbv1";
};
packageRequires = [];
meta = {
@ -1553,21 +1276,6 @@
license = lib.licenses.free;
};
}) {};
greenbar = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "greenbar";
ename = "greenbar";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/greenbar-1.1.el";
sha256 = "01ixv3489zdx2b67zqad6h7g8cpnzpzrvvkqyx7csqyrfx0qy27n";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/greenbar.html";
license = lib.licenses.free;
};
}) {};
guess-language = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -1620,36 +1328,6 @@
license = lib.licenses.free;
};
}) {};
hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "hook-helpers";
ename = "hook-helpers";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar";
sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/hook-helpers.html";
license = lib.licenses.free;
};
}) {};
html5-schema = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "html5-schema";
ename = "html5-schema";
version = "0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar";
sha256 = "19k1jal6j64zq78w8h0lw7cljivmp2jzs5sa1ppc0mqkpn2hyq1i";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/html5-schema.html";
license = lib.licenses.free;
};
}) {};
hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "hydra";
@ -1725,21 +1403,6 @@
license = lib.licenses.free;
};
}) {};
ivy-explorer = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
elpaBuild {
pname = "ivy-explorer";
ename = "ivy-explorer";
version = "0.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.el";
sha256 = "0q9gy9w22hnq30bfmnpqknk0qc1rcbjcybpjgb8hnlldvcci95l7";
};
packageRequires = [ emacs ivy ];
meta = {
homepage = "https://elpa.gnu.org/packages/ivy-explorer.html";
license = lib.licenses.free;
};
}) {};
ivy-posframe = callPackage ({ elpaBuild
, emacs
, fetchurl
@ -1790,21 +1453,6 @@
license = lib.licenses.free;
};
}) {};
js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "js2-mode";
ename = "js2-mode";
version = "20201220";
src = fetchurl {
url = "https://elpa.gnu.org/packages/js2-mode-20201220.tar";
sha256 = "0zdrp8lap1ijrmsn9jsnvm44b6vxlgh9vcla5ysh1ga95zkjxrwm";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/js2-mode.html";
license = lib.licenses.free;
};
}) {};
json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "json-mode";
@ -2060,21 +1708,6 @@
license = lib.licenses.free;
};
}) {};
memory-usage = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "memory-usage";
ename = "memory-usage";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/memory-usage-0.2.el";
sha256 = "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/memory-usage.html";
license = lib.licenses.free;
};
}) {};
metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "metar";
@ -2150,36 +1783,6 @@
license = lib.licenses.free;
};
}) {};
mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "mmm-mode";
ename = "mmm-mode";
version = "0.5.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar";
sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
license = lib.licenses.free;
};
}) {};
modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "modus-operandi-theme";
ename = "modus-operandi-theme";
version = "0.12.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el";
sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html";
license = lib.licenses.free;
};
}) {};
modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "modus-vivendi-theme";
@ -2399,21 +2002,6 @@
license = lib.licenses.free;
};
}) {};
olivetti = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "olivetti";
ename = "olivetti";
version = "1.7.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/olivetti-1.7.1.el";
sha256 = "1bk41bqri0ycpab46c7a6i5k3js1pm5k6d76y91mp3l2izy2bxwj";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/olivetti.html";
license = lib.licenses.free;
};
}) {};
omn-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "omn-mode";
@ -2549,21 +2137,6 @@
license = lib.licenses.free;
};
}) {};
paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "paced";
ename = "paced";
version = "1.1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/paced-1.1.3.tar";
sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl";
};
packageRequires = [ async emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/paced.html";
license = lib.licenses.free;
};
}) {};
parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "parsec";
@ -2579,36 +2152,6 @@
license = lib.licenses.free;
};
}) {};
path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "path-iterator";
ename = "path-iterator";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar";
sha256 = "0kgl7rhv9x23jyr6ahfy6ql447zpz9fnmfwldkpn69g7jdx6a3cc";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/path-iterator.html";
license = lib.licenses.free;
};
}) {};
peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "peg";
ename = "peg";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/peg-1.0.tar";
sha256 = "0skr5dz9k34r409hisnj37n1b7n62l3md0glnfx578xkbmxlpcxl";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/peg.html";
license = lib.licenses.free;
};
}) {};
persist = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "persist";
@ -2699,36 +2242,6 @@
license = lib.licenses.free;
};
}) {};
psgml = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "psgml";
ename = "psgml";
version = "1.3.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar";
sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/psgml.html";
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";
@ -3165,6 +2678,21 @@
license = lib.licenses.free;
};
}) {};
shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar";
sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/shell-command+.html";
license = lib.licenses.free;
};
}) {};
shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "shen-mode";
@ -3225,21 +2753,6 @@
license = lib.licenses.free;
};
}) {};
smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "smalltalk-mode";
ename = "smalltalk-mode";
version = "3.2.92";
src = fetchurl {
url = "https://elpa.gnu.org/packages/smalltalk-mode-3.2.92.tar";
sha256 = "0zlp1pk88m1gybhnvcmm0bhrj6zvnjzhc26r1i4d56pyh6vwivfj";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
license = lib.licenses.free;
};
}) {};
smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "smart-yank";
@ -3330,21 +2843,6 @@
license = lib.licenses.free;
};
}) {};
spinner = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "spinner";
ename = "spinner";
version = "1.7.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/spinner-1.7.3.el";
sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/spinner.html";
license = lib.licenses.free;
};
}) {};
sql-beeline = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "sql-beeline";
@ -3435,21 +2933,6 @@
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.tar";
sha256 = "0k39pa89y0bfvdfqg3nc5pjq5mwxwimc4ma3z28vaf14zd38x9m1";
};
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";
@ -3718,21 +3201,6 @@
license = lib.licenses.free;
};
}) {};
vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "vcl-mode";
ename = "vcl-mode";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vcl-mode-1.1.el";
sha256 = "1r70pmvr95k5f2xphvhliqvyh7al0qabm7wvkamximcssvs38q1h";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
license = lib.licenses.free;
};
}) {};
vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }:
elpaBuild {
pname = "vdiff";
@ -3828,21 +3296,6 @@
license = lib.licenses.free;
};
}) {};
w3 = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "w3";
ename = "w3";
version = "4.0.49";
src = fetchurl {
url = "https://elpa.gnu.org/packages/w3-4.0.49.tar";
sha256 = "01n334b3gwx288xysa1vxsvb14avsz3syfigw85i7m5nizhikqbb";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/w3.html";
license = lib.licenses.free;
};
}) {};
wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "wcheck-mode";
@ -3907,10 +3360,10 @@
elpaBuild {
pname = "websocket";
ename = "websocket";
version = "1.12";
version = "1.13.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/websocket-1.12.tar";
sha256 = "0ap4z80c6pzpb69wrx0hsvwzignxmd2b9xy974by9gf5xm2wpa8w";
url = "https://elpa.gnu.org/packages/websocket-1.13.1.tar";
sha256 = "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc";
};
packageRequires = [ cl-lib ];
meta = {
@ -3918,36 +3371,6 @@
license = lib.licenses.free;
};
}) {};
which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "which-key";
ename = "which-key";
version = "3.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar";
sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/which-key.html";
license = lib.licenses.free;
};
}) {};
windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "windower";
ename = "windower";
version = "0.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/windower-0.0.1.el";
sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/windower.html";
license = lib.licenses.free;
};
}) {};
windresize = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "windresize";
@ -4013,21 +3436,6 @@
license = lib.licenses.free;
};
}) {};
xclip = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "xclip";
ename = "xclip";
version = "1.10";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xclip-1.10.el";
sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/xclip.html";
license = lib.licenses.free;
};
}) {};
xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "xelb";

2
pkgs/applications/editors/emacs-modes/elpa-packages.nix
View file

@ -5,7 +5,7 @@
To update the list of packages from MELPA,
1. Run `./update-elpa`.
2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages`.
2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages`.
3. `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix`
## Update from overlay

4
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file

@ -6,8 +6,8 @@ To update the list of packages from MELPA,
1. Run ./update-melpa
2. Check for evaluation errors:
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaStablePackages
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaPackages
3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json`
## Update from overlay

12
pkgs/applications/editors/emacs-modes/org-generated.nix generated
View file

@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "20201228";
version = "20210111";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20201228.tar";
sha256 = "0rv98v3zbdbc4yfq9mymrxrcj422xpfhvw31xrspydwgpxqgsf99";
url = "https://orgmode.org/elpa/org-20210111.tar";
sha256 = "1hn3i583h3idmiv1plbp0p6qi3myl317vl43qyxjks2nvqfj5313";
};
packageRequires = [];
meta = {
@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
version = "20201228";
version = "20210111";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20201228.tar";
sha256 = "0libzh2a51m9l0kb01zjw2fai2nbxqw9r01i8fkjy94hq0lbw7cc";
url = "https://orgmode.org/elpa/org-plus-contrib-20210111.tar";
sha256 = "1qw44y4v4vg0vhz1i55x4fjiaxfaqcch0mqm98sc5f31fw3r4zga";
};
packageRequires = [];
meta = {

2
pkgs/applications/editors/emacs-modes/org-packages.nix
View file

@ -5,7 +5,7 @@
To update the list of packages from Org (ELPA),
1. Run `./update-org`.
2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages`.
2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.orgPackages`.
3. `git commit -m "org-packages $(date -Idate)" -- org-generated.nix`
*/

2884
pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
View file

File diff suppressed because it is too large Load diff

16
pkgs/applications/editors/emacs-modes/update-from-overlay
View file

@ -2,18 +2,20 @@
#! nix-shell -i bash -p curl nix
set -euxo pipefail
export NIXPKGS_ALLOW_BROKEN=1
# This script piggybacks on the automatic code generation done by the nix-community emacs overlay
# You can use this to avoid running lengthy code generation jobs locally
curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix
nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace
git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacsPackages.elpa-packages: $(date --iso)" -- elpa-generated.nix
nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages --show-trace
git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix
curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix
nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages --show-trace
git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacsPackages.org-packages: $(date --iso)" -- org-generated.nix
nix-instantiate ../../../.. -A emacs.pkgs.orgPackages --show-trace
git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix
curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages
git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacsPackages.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json
nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaStablePackages
nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaPackages
git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacs.pkgs.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json

2
pkgs/applications/editors/emacs-modes/updater-emacs.nix
View file

@ -1,7 +1,7 @@
let
pkgs = import ../../../.. {};
emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let
emacsEnv = pkgs.emacs.withPackages (epkgs: let
promise = epkgs.trivialBuild {
pname = "promise";

9
pkgs/applications/editors/emacs/generic.nix
View file

@ -11,6 +11,7 @@
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, jansson, harfbuzz
, dontRecurseIntoAttrs ,emacsPackagesFor
, libgccjit, targetPlatform, makeWrapper # native-comp params
, systemd ? null
, withX ? !stdenv.isDarwin
@ -40,9 +41,7 @@ assert withGTK3 -> !withGTK2 && gtk3-x11 != null;
assert withXwidgets -> withGTK3 && webkitgtk != null;
let
in stdenv.mkDerivation (lib.optionalAttrs nativeComp {
let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
NATIVE_FULL_AOT = "1";
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
} // lib.optionalAttrs stdenv.isDarwin {
@ -175,6 +174,7 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp {
passthru = {
inherit nativeComp;
pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs);
};
meta = with lib; {
@ -201,4 +201,5 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp {
separately.
'';
};
})
});
in emacs

2
pkgs/applications/graphics/gimp/plugins/default.nix
View file

@ -167,8 +167,6 @@ in
variant = "gimp";
};
ufraw = pkgs.ufraw.gimpPlugin;
gimplensfun = pluginDerivation rec {
version = "unstable-2018-10-21";
name = "gimplensfun-${version}";

88
pkgs/applications/graphics/ufraw/default.nix
View file

@ -1,88 +0,0 @@
{ lib, stdenv
, fetchFromGitHub
, autoconf
, automake
, autoreconfHook
, bzip2
, cfitsio
, exiv2
, gettext
, gimp ? null
, gtk2
, gtkimageview
, lcms2
, lensfun
, libjpeg
, libtiff
, perl
, pkgconfig
, zlib
, withGimpPlugin ? true
}:
assert withGimpPlugin -> gimp != null;
stdenv.mkDerivation {
pname = "ufraw";
version = "unstable-2019-06-12";
# The original ufraw repo is unmaintained and broken;
# this is a fork that collects patches
src = fetchFromGitHub {
owner = "sergiomb2";
repo = "ufraw";
rev = "c65b4237dcb430fb274e4778afaf5df9a18e04e6";
sha256 = "02icn67bsinvgliy62qa6v7gmwgp2sh15jvm8iiz3c7g1h74f0b7";
};
outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin";
nativeBuildInputs = [ autoconf automake autoreconfHook gettext perl pkgconfig ];
buildInputs = [
bzip2
cfitsio
exiv2
gtk2
gtkimageview
lcms2
lensfun
libjpeg
libtiff
zlib
] ++ stdenv.lib.optional withGimpPlugin gimp;
configureFlags = [
"--enable-contrast"
"--enable-dst-correction"
] ++ stdenv.lib.optional withGimpPlugin "--with-gimp";
postInstall = stdenv.lib.optionalString withGimpPlugin ''
moveToOutput "lib/gimp" "$gimpPlugin"
'';
meta = with lib; {
homepage = "https://github.com/sergiomb2/ufraw";
broken = true; # https://github.com/NixOS/nixpkgs/issues/97946
description = "Utility to read and manipulate raw images from digital cameras";
longDescription =
'' The Unidentified Flying Raw (UFRaw) is a utility to read and
manipulate raw images from digital cameras. It can be used on its
own or as a Gimp plug-in. It reads raw images using Dave Coffin's
raw conversion utility - DCRaw. UFRaw supports color management
workflow based on Little CMS, allowing the user to apply ICC color
profiles. For Nikon users UFRaw has the advantage that it can read
the camera's tone curves.
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [ gloaming ];
platforms = with platforms; all;
};
}

18
pkgs/applications/misc/calibre/default.nix
View file

@ -16,7 +16,7 @@
, hyphen
, unrarSupport ? false
, chmlib
, python3Packages
, pythonPackages
, libusb1
, libmtp
, xdg_utils
@ -26,11 +26,11 @@
mkDerivation rec {
pname = "calibre";
version = "5.9.0";
version = "4.23.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
sha256 = "a71196af15372054c4a25697534a2df1ef6dd732b9db07aaecaac7a86d9b3a0a";
sha256 = "sha256-Ft5RRzzw4zb5RqVyUaHk9Pu6H4V/F9j8FKoTLn61lRg=";
};
patches = [
@ -43,7 +43,7 @@ mkDerivation rec {
] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
prePatch = ''
sed -i "/pyqt_sip_dir/ s:=.*:= '${python3Packages.pyqt5}/share/sip/PyQt5':" \
sed -i "/pyqt_sip_dir/ s:=.*:= '${pythonPackages.pyqt5}/share/sip/PyQt5':" \
setup/build_environment.py
# Remove unneeded files and libs
@ -57,6 +57,8 @@ mkDerivation rec {
nativeBuildInputs = [ pkgconfig qmake removeReferencesTo ];
CALIBRE_PY3_PORT = builtins.toString pythonPackages.isPy3k;
buildInputs = [
chmlib
fontconfig
@ -74,7 +76,7 @@ mkDerivation rec {
sqlite
xdg_utils
] ++ (
with python3Packages; [
with pythonPackages; [
apsw
beautifulsoup4
css-parser
@ -112,11 +114,11 @@ mkDerivation rec {
export FC_LIB_DIR=${fontconfig.lib}/lib
export PODOFO_INC_DIR=${podofo.dev}/include/podofo
export PODOFO_LIB_DIR=${podofo.lib}/lib
export SIP_BIN=${python3Packages.sip}/bin/sip
export SIP_BIN=${pythonPackages.sip}/bin/sip
export XDG_DATA_HOME=$out/share
export XDG_UTILS_INSTALL_MODE="user"
${python3Packages.python.interpreter} setup.py install --root=$out \
${pythonPackages.python.interpreter} setup.py install --root=$out \
--prefix=$out \
--libdir=$out/lib \
--staging-root=$out \
@ -145,7 +147,7 @@ mkDerivation rec {
# /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h
preFixup = ''
remove-references-to -t ${podofo.dev} \
$out/lib/calibre/calibre/plugins${lib.optionalString python3Packages.isPy3k "/3"}/podofo.so
$out/lib/calibre/calibre/plugins${lib.optionalString pythonPackages.isPy3k "/3"}/podofo.so
for program in $out/bin/*; do
wrapProgram $program \

6
pkgs/applications/misc/joplin-desktop/default.nix
View file

@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
version = "1.4.19";
version = "1.6.7";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@ -16,8 +16,8 @@ let
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = {
x86_64-linux = "1xyj30pnlczchbh4awb955sxh51v89d170f4yk0v1jkj7dg2wjgj";
x86_64-darwin = "166yp2rr87p0lh64ngs498a50ahcann8z5s0g2p0azs6wi54a6kw";
x86_64-linux = "0g1fac8l0w0b11bs4c9mi2k426hcqa7q4ks48fzxq0yl9ricjlrb";
x86_64-darwin = "1h5crdjzvjg30hdmh3fkygxi5gy714wpz4gwy5dn8s3xr12mmgka";
}.${system} or throwSystem;
};

12
pkgs/applications/misc/printrun/default.nix
View file

@ -1,18 +1,18 @@
{ lib, stdenv, python27Packages, fetchFromGitHub }:
{ lib, stdenv, python3Packages, fetchFromGitHub }:
python27Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "printrun";
version = "1.6.0";
version = "2.0.0rc5";
src = fetchFromGitHub {
owner = "kliment";
repo = "Printrun";
rev = "${pname}-${version}";
sha256 = "0nhcx1bi1hals0a6d6994y0kcwsfqx3hplwbmn9136hgrplg0l2l";
sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81";
};
propagatedBuildInputs = with python27Packages; [
wxPython30 pyserial dbus-python psutil numpy pyopengl pyglet cython
propagatedBuildInputs = with python3Packages; [
appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial
];
doCheck = false;

22
pkgs/applications/misc/todolist/default.nix
View file

@ -1,22 +0,0 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "todolist";
version = "v0.8.1";
goPackagePath = "github.com/gammons/todolist";
src = fetchFromGitHub {
owner = "gammons";
repo = "todolist";
rev = version;
sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p";
};
meta = with lib; {
description = "Simple GTD-style todo list for the command line";
homepage = "http://todolist.site";
license = licenses.mit;
maintainers = with maintainers; [ uvnikita ];
};
}

22
pkgs/applications/misc/ultralist/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ultralist";
version = "1.5.1";
src = fetchFromGitHub {
owner = "ultralist";
repo = "ultralist";
rev = version;
sha256 = "09kgf83jn5k35lyrnyzbsy0l1livzmy292qmlbx5dkdpaq5wxnmp";
};
vendorSha256 = null;
meta = with lib; {
description = "Simple GTD-style todo list for the command line";
homepage = "https://ultralist.io";
license = licenses.mit;
maintainers = with maintainers; [ uvnikita ];
};
}

4
pkgs/applications/networking/browsers/amfora/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ stdenv, lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "amfora";
@ -13,7 +13,7 @@ buildGoModule rec {
vendorSha256 = "rOEM7iEkm42g8yJxY7qdTCSbkPMDHqlAsK7/ud8IDLY=";
postInstall = ''
postInstall = lib.optionalString (!stdenv.isDarwin) ''
sed -i "s:amfora:$out/bin/amfora:" amfora.desktop
install -Dm644 amfora.desktop -t $out/share/applications
'';

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -31,9 +31,9 @@
}
},
"dev": {
"version": "89.0.4381.6",
"sha256": "031w24qf5cn9y30pgh736g67p6c10kwpflhvxa24h0v99gqnah2i",
"sha256bin64": "1fssdxllq2ncpy8s7ykbq33456hfjlgj1m5147wbg2c5k36rj78s",
"version": "89.0.4385.0",
"sha256": "0cwfwkaidxi86n80kcn3lxrwz90zp6ra9dib1nd4xnhpgl7vjjjf",
"sha256bin64": "1hvrdvmlqc95qb9gn7iihal4h1kzf6jqrhk9xvv45chsvwl79pmd",
"deps": {
"gn": {
"version": "2020-12-22",

44
pkgs/applications/networking/browsers/lagrange/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, libunistring
, openssl
, pcre
, SDL2
, AppKit
}:
stdenv.mkDerivation rec {
pname = "lagrange";
version = "1.0.3";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
sha256 = "1l9qcymjwg3wzbbi4hcyzfrxyqgz2xdy4ab3lr0zq38v025d794n";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libunistring openssl pcre SDL2 ]
++ lib.optional stdenv.isDarwin AppKit;
hardeningDisable = lib.optional (!stdenv.cc.isClang) "format";
installPhase = if stdenv.isDarwin then ''
mkdir -p $out/Applications
mv Lagrange.app $out/Applications
'' else null;
meta = with lib; {
description = "A Beautiful Gemini Client";
homepage = "https://gmi.skyjake.fi/lagrange/";
license = licenses.bsd2;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
}

6
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxcd";
version = "0.5.0";
version = "0.5.9";
src = fetchFromGitHub {
owner = "fluxcd";
repo = "flux2";
rev = "v${version}";
sha256 = "125im8br7x8djd6zagvikpc02k55pxbd97rjj3g2frj9plbryh8n";
sha256 = "1fic1hgsjhail9p2ki7qqr0vl5av3gfb8y3h9ygzq4j869780bsq";
};
vendorSha256 = "0f818a0z71nl061db93iqb87njx66vbrra1zh92warbx8djdsr7k";
vendorSha256 = "15zn40pi1rw0yqxm9fpmj4l179rg846r3m89imh96g2v3gk8qqcv";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/cluster/tektoncd-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "1mkbwh4cmhx9in928vlvs7xjjklpsxbv5niv8jmsbnifflg1an8p";
sha256 = "0xb2zlpkh9cwinp6zj2jpv4wlws042ad1fa0wkcnnkh0vjm6mnrl";
};
vendorSha256 = null;

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.27.0";
version = "0.27.1";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MbhJ1f6Da+kkkCV85kH8Yv74cMzp7JvxeQb0By9aGp8=";
sha256 = "sha256-YZ/3qtukPoCbgzy1qr0MJHSdqovzmP/AQixLq6GO27Q";
};
vendorSha256 = "sha256-AMxBzUHRsq1HOMtvgYqIw22Cky7gQ7/2hI8wQnxaXb0=";

6
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage
, electron_9, element-web
, electron, element-web
}:
# Notes for maintainers:
# * versions of `element-web` and `element-desktop` should be kept in sync.
@ -15,8 +15,6 @@ let
rev = "v${version}";
sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g=";
};
electron = electron_9;
in mkYarnPackage rec {
name = "element-desktop-${version}";
inherit version src;
@ -57,7 +55,7 @@ in mkYarnPackage rec {
'';
# The desktop item properties should be kept in sync with data from upstream:
# https://github.com/vector-im/riot-desktop/blob/develop/package.json
# https://github.com/vector-im/element-desktop/blob/develop/package.json
desktopItem = makeDesktopItem {
name = "element-desktop";
exec = "${executableName} %u";

8
pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh
View file

@ -4,12 +4,12 @@
set -euo pipefail
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates the Yarn dependency lock files for the element-desktop package."
echo "Usage: $0 <git release tag>"
exit 1
echo "Regenerates the Yarn dependency lock files for the element-desktop package."
echo "Usage: $0 <git release tag>"
exit 1
fi
RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1"
RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/element-desktop/$1"
wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json
wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock

8
pkgs/applications/networking/instant-messengers/gomuks/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gomuks";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "tulir";
repo = pname;
rev = "v" + version;
sha256 = "0xa4ch4p48w6sd0f4s1sp0hl1w4fvzhff7w2ar19ki0ydy5g368n";
rev = "v${version}";
sha256 = "169xyd44jyfh5njwmhsmkah8njfgnp9q9c2b13p0ry5saicwm5h5";
};
vendorSha256 = "1rhvwk8bdbbffhx2d03a8p9jc5c8v3pi7kw1dmyyngz6p7wq1g0x";
vendorSha256 = "1l8qnz0qy90zpywfx7pbkqpxg7rkvc9j622zcmkf38kdc1z6w20a";
doCheck = false;

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file

@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.39.4"; # Please backport all updates to the stable channel.
version = "1.39.5"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "11rjz0vawwyny4rpdqsqyfh8pi177xykm69xxcj6kgcncxaxg0vb";
sha256 = "1x29ri4jxd1q2wbv5gf26x986x9sms4rxnhj7d5rhm6pz2ihzb2a";
};
nativeBuildInputs = [

34
pkgs/applications/networking/mailreaders/astroid/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome3, gmime3, webkitgtk, ronn
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
, gtkmm3, libpeas, gsettings-desktop-schemas
, python3, python3Packages
, vim ? vim_configurable.override {
features = "normal";
gui = "auto";
}
, ronn
, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3
# vim to be used, should support the GUI mode.
, vim ? vim_configurable.override { features = "normal"; gui = "auto"; }
# additional python3 packages to be available within plugins
, extraPythonPackages ? []
}:
stdenv.mkDerivation rec {
@ -20,22 +20,30 @@ stdenv.mkDerivation rec {
sha256 = "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3";
};
nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
nativeBuildInputs = [
cmake ronn pkg-config wrapGAppsHook gobject-introspection
python3 python3.pkgs.wrapPython
];
buildInputs = [
gtkmm3 gmime3 webkitgtk libsass libpeas
python3 python3Packages.pygobject3
python3
notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme
glib-networking protobuf
] ++ (if vim == null then [] else [ vim ]);
vim
];
postPatch = ''
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
sed -i "s~ -geom 10x10~~g" src/config.cc
'';
postInstall = ''
wrapProgram "$out/bin/astroid" --set CHARSET=en_us.UTF-8
pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ] ++ extraPythonPackages;
preFixup = ''
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(
--prefix PYTHONPATH : "$program_PYTHONPATH"
)
'';
meta = with lib; {

4
pkgs/applications/version-management/gerrit/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gerrit";
version = "3.2.3";
version = "3.3.1";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
sha256 = "0hdxbn5qqqjzpqfcydz33nc351zanxp0j2k0ivizx4dn40fnavd7";
sha256 = "0swj3lmxwh4a0gnkirqrh7znzizsizy3cnlinhhsi319qns2szb1";
};
buildCommand = ''

6
pkgs/applications/version-management/git-and-tools/gita/default.nix
View file

@ -9,12 +9,12 @@
}:
buildPythonApplication rec {
version = "0.10.10";
version = "0.11.9";
pname = "gita";
src = fetchFromGitHub {
sha256 = "0k7hicncbrqvhmpq1w3v1309bqij6izw31xs8xcb8is85dvi754h";
rev = "v${version}";
sha256 = "9+zuLAx9lMfltsBqjvsivJ5wPnStPfq11XgGMv/JDpY=";
rev = version;
repo = "gita";
owner = "nosarthur";
};

7
pkgs/applications/video/droidcam/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "droidcam";
version = "1.6";
version = "1.7";
src = fetchFromGitHub {
owner = "aramg";
repo = "droidcam";
rev = "v${version}";
sha256 = "sha256-3RmEmLNUbwIh+yr7vtYZnMwbzfmtW3mz5u4Ohau9OLU=";
sha256 = "sha256-nIqiRWk3gKOWrreyLVT8McRsXClXjOa4y8xXr1ox9Lc=";
};
nativeBuildInputs = [
@ -29,12 +29,11 @@ stdenv.mkDerivation rec {
];
postPatch = ''
substituteInPlace linux/src/droidcam.c \
substituteInPlace src/droidcam.c \
--replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png"
'';
preBuild = ''
cd linux
makeFlagsArray+=("JPEG=$(pkg-config --libs --cflags libturbojpeg)")
makeFlagsArray+=("USBMUXD=$(pkg-config --libs --cflags libusbmuxd-2.0)")
'';

182
pkgs/applications/virtualization/docker/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage
, makeWrapper, installShellFiles, pkgconfig
, makeWrapper, installShellFiles, pkg-config
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute, lvm2, systemd
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
@ -12,6 +12,7 @@ with lib;
rec {
dockerGen = {
version, rev, sha256
, mobyRev, mobySha256
, runcRev, runcSha256
, containerdRev, containerdSha256
, tiniRev, tiniSha256
@ -30,9 +31,7 @@ rec {
patches = [];
});
docker-containerd = let
withlibseccomp = lib.versionAtLeast version "19.03";
in containerd.overrideAttrs (oldAttrs: {
docker-containerd = containerd.overrideAttrs (oldAttrs: {
name = "docker-containerd-${version}";
inherit version;
src = fetchFromGitHub {
@ -41,11 +40,7 @@ rec {
rev = containerdRev;
sha256 = containerdSha256;
};
# disable completion, can be removed when docker uses containerd >= 1.4
postInstall = [];
# This should be removed once Docker uses containerd >=1.4
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig;
buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp;
buildInputs = oldAttrs.buildInputs ++ [ libseccomp ];
});
docker-tini = tini.overrideAttrs (oldAttrs: {
@ -64,16 +59,69 @@ rec {
NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
});
moby = buildGoPackage ((optionalAttrs (stdenv.isLinux)) rec {
name = "moby-${version}";
inherit version;
inherit docker-runc docker-containerd docker-proxy docker-tini;
src = fetchFromGitHub {
owner = "moby";
repo = "moby";
rev = mobyRev;
sha256 = mobySha256;
};
goPackagePath = "github.com/docker/docker";
nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ];
buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ];
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]);
buildPhase = ''
export GOCACHE="$TMPDIR/go-cache"
# build engine
cd ./go/src/${goPackagePath}
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="${rev}"
export VERSION="${version}"
./hack/make.sh dynbinary
cd -
'';
postPatch = ''
patchShebangs .
substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd
'';
installPhase = ''
cd ./go/src/${goPackagePath}
install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
--prefix PATH : "$out/libexec/docker:$extraPath"
ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd
ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim
ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc
ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy
ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
# systemd
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
'';
DOCKER_BUILDTAGS = []
++ optional (systemd != null) [ "journald" ]
++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
++ optional (lvm2 == null) "exclude_graphdriver_devicemapper"
++ optional (libseccomp != null) "seccomp";
});
in
buildGoPackage ((optionalAttrs (stdenv.isLinux) {
inherit docker-runc docker-containerd docker-proxy docker-tini;
DOCKER_BUILDTAGS = []
++ optional (systemd != null) [ "journald" ]
++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
++ optional (lvm2 == null) "exclude_graphdriver_devicemapper"
++ optional (libseccomp != null) "seccomp";
inherit docker-runc docker-containerd docker-proxy docker-tini moby;
}) // rec {
inherit version rev;
@ -82,97 +130,61 @@ rec {
src = fetchFromGitHub {
owner = "docker";
repo = "docker-ce";
repo = "cli";
rev = "v${version}";
sha256 = sha256;
};
patches = lib.optional (versionAtLeast version "19.03") [
# Replace hard-coded cross-compiler with $CC
(fetchpatch {
url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch;
sha256 = "1af20bzakhpfhaixc29qnl9iml9255xdinxdnaqp4an0n1xa686a";
})
];
goPackagePath = "github.com/docker/cli";
goPackagePath = "github.com/docker/docker-ce";
nativeBuildInputs = [ pkgconfig go-md2man go libtool installShellFiles ];
nativeBuildInputs = [ pkg-config go-md2man go libtool installShellFiles ];
buildInputs = [
makeWrapper
] ++ optionals (stdenv.isLinux) [
sqlite lvm2 btrfs-progs systemd libseccomp
];
dontStrip = true;
# Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables
buildPhase = ''
export GOCACHE="$TMPDIR/go-cache"
'' + (optionalString (stdenv.isLinux) ''
# build engine
cd ./go/src/${goPackagePath}/components/engine
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="${rev}"
export VERSION="${version}"
./hack/make.sh dynbinary
cd -
'') + ''
# build cli
cd ./go/src/${goPackagePath}/components/cli
cd ./go/src/${goPackagePath}
# Mimic AUTO_GOPATH
mkdir -p .gopath/src/github.com/docker/
ln -sf $PWD .gopath/src/github.com/docker/cli
export GOPATH="$PWD/.gopath:$GOPATH"
export GITCOMMIT="${rev}"
export VERSION="${version}"
export BUILDTIME="1970-01-01T00:00:00Z"
source ./scripts/build/.variables
export CGO_ENABLED=1
go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker
cd -
'';
# systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
postPatch = ''
substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" ""
'' + optionalString (stdenv.isLinux) ''
patchShebangs .
substituteInPlace ./components/engine/hack/make.sh --replace libsystemd-journal libsystemd
substituteInPlace ./components/engine/daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man"
substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man
'';
outputs = ["out" "man"];
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]);
installPhase = ''
cd ./go/src/${goPackagePath}
install -Dm755 ./components/cli/docker $out/libexec/docker/docker
install -Dm755 ./docker $out/libexec/docker/docker
makeWrapper $out/libexec/docker/docker $out/bin/docker \
--prefix PATH : "$out/libexec/docker:$extraPath"
'' + optionalString (stdenv.isLinux) ''
install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
--prefix PATH : "$out/libexec/docker:$extraPath"
# docker uses containerd now
ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd
ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim
ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc
ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy
ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
# systemd
install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
# symlink docker daemon to docker cli derivation
ln -s ${moby}/bin/dockerd $out/bin/dockerd
'' + ''
# completion (cli)
installShellCompletion --bash ./components/cli/contrib/completion/bash/docker
installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish
installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker
# Include contributed man pages (cli)
cd ./components/cli
installShellCompletion --bash ./contrib/completion/bash/docker
installShellCompletion --fish ./contrib/completion/fish/docker.fish
installShellCompletion --zsh ./contrib/completion/zsh/_docker
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
# Generate man pages from cobra commands
echo "Generate man pages from cobra"
@ -199,30 +211,18 @@ rec {
});
# Get revisions from
# https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/*
docker_18_09 = makeOverridable dockerGen rec {
version = "18.09.9";
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_20_10 = makeOverridable dockerGen rec {
version = "20.10.2";
rev = "v${version}";
sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h";
runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657";
runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj";
containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb";
containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
};
docker_19_03 = makeOverridable dockerGen rec {
version = "19.03.14";
rev = "v${version}";
sha256 = "0szr5dgfrypb5kyj5l1rf7rw4iqj0d0cyx6skdqlbgf4dqwa6g9y";
runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10
runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
# Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above
containerdRev = "ea765aba0d05254012b0b9e595e995c09186427f"; # v1.3.9
containerdSha256 = "1isi1wgq61b4l0lxy1d8n6dnmcb8s5ihn2yqjb6525y3dj5c5i1j";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0
sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51";
mobyRev = "v${version}";
mobySha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w";
runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92
runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94";
containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3
containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0";
tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
};
}

4
pkgs/applications/virtualization/docker/proxy.nix
View file

@ -2,13 +2,13 @@
buildGoPackage rec {
name = "docker-proxy-${rev}";
rev = "7b2b1feb1de4817d522cc372af149ff48d25028e";
rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7";
src = fetchFromGitHub {
inherit rev;
owner = "docker";
repo = "libnetwork";
sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935";
sha256 = "1r47y0gww3j7fas4kgiqbhrz5fazsx1c6sxnccdfhj8fzik77s9y";
};
goPackagePath = "github.com/docker/libnetwork";

14
pkgs/build-support/emacs/wrapper.nix
View file

@ -2,11 +2,11 @@
# Usage
`emacsWithPackages` takes a single argument: a function from a package
`emacs.pkgs.withPackages` takes a single argument: a function from a package
set to a list of packages (the packages that will be available in
Emacs). For example,
```
emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
```
All the packages in the list should come from the provided package
set. It is possible to add any package to the list, but the provided
@ -15,19 +15,19 @@ the correct version of Emacs.
# Overriding
`emacsWithPackages` inherits the package set which contains it, so the
`emacs.pkgs.withPackages` inherits the package set which contains it, so the
correct way to override the provided package set is to override the
set which contains `emacsWithPackages`. For example, to override
`emacsPackages.emacsWithPackages`,
set which contains `emacs.pkgs.withPackages`. For example, to override
`emacs.pkgs.emacs.pkgs.withPackages`,
```
let customEmacsPackages =
emacsPackages.overrideScope' (self: super: {
emacs.pkgs.overrideScope' (self: super: {
# use a custom version of emacs
emacs = ...;
# use the unstable MELPA version of magit
magit = self.melpaPackages.magit;
});
in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
```
*/

2
pkgs/development/interpreters/python/cpython/default.nix
View file

@ -216,7 +216,7 @@ in with passthru; stdenv.mkDerivation {
else
./3.7/fix-finding-headers-when-cross-compiling.patch
)
] ++ optionals (isPy37) [
] ++ optionals (isPy36 || isPy37) [
# Backport a fix for ctypes.util.find_library.
./3.7/find_library.patch
];

28
pkgs/development/libraries/pe-parse/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "pe-parse";
version = "1.2.0";
src = fetchFromGitHub {
owner = "trailofbits";
repo = "pe-parse";
rev = "v${version}";
sha256 = "1jvfjaiwddczjlx4xdhpbgwvvpycab7ix35lwp3wfy44hs6qpjqv";
};
nativeBuildInputs = [ cmake ];
doInstallCheck = true;
installCheckPhase = ''
$out/bin/dump-pe ../test/assets/example.exe
'';
meta = with lib; {
description = "A principled, lightweight parser for Windows portable executable files";
homepage = "https://github.com/trailofbits/pe-parse";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ arturcygan ];
};
}

22
pkgs/development/libraries/science/math/tensorflow/bin.nix
View file

@ -6,25 +6,20 @@
with stdenv.lib;
let
unavailable = throw "libtensorflow is not available for this platform!";
broken = !stdenv.isLinux && !stdenv.isDarwin;
tfType = if cudaSupport then "gpu" else "cpu";
system =
if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "darwin"
else unavailable;
system =
if stdenv.isLinux then "linux"
else "darwin";
platform =
if stdenv.isx86_64 then "x86_64"
else unavailable;
platform = "x86_64";
rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] ++
optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]);
rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib]
++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]);
packages = import ./binary-hashes.nix;
packageName = "${tfType}-${system}-${platform}";
url = packages.${packageName} or unavailable;
patchLibs =
if stdenv.isDarwin
@ -44,7 +39,7 @@ in stdenv.mkDerivation rec {
pname = "libtensorflow";
inherit (packages) version;
src = fetchurl url;
src = fetchurl packages."${tfType}-${system}-${platform}";
nativeBuildInputs = optional cudaSupport addOpenGLRunpath;
@ -72,6 +67,5 @@ in stdenv.mkDerivation rec {
homepage = "https://www.tensorflow.org/install/lang_c";
license = licenses.asl20;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ basvandijk ];
};
}

20
pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
View file

@ -1,15 +1,15 @@
{
version = "1.14.0";
cpu-linux-x86_64 = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz";
sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k";
version = "2.4.0";
"cpu-linux-x86_64" = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.4.0.tar.gz";
sha256 = "022p5jjwmb8rhyyis3cpk2lw45apl2vz49m2rgxmd75h783x1gjk";
};
gpu-linux-x86_64 = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz";
sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6";
"gpu-linux-x86_64" = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.4.0.tar.gz";
sha256 = "1fclvbrn3fs8qmhmh3lzni7s7wl1w30a071b4gzh9ifnxdhip6lq";
};
cpu-darwin-x86_64 = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz";
sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92";
"cpu-darwin-x86_64" = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-2.4.0.tar.gz";
sha256 = "09x096nslg04c8sr7bd5v68a5gfinc0f1h36lbzn8bahs8b1agi3";
};
}

6
pkgs/development/libraries/science/math/tensorflow/prefetcher.sh
View file

@ -1,7 +1,9 @@
#!/usr/bin/env bash
version=1.14.0
hashfile=binary-hashes.nix
# ./prefetcher.sh 2.4.0 binary-hashes.nix
version="$1"
hashfile="$2"
rm -f $hashfile
echo "{" >> $hashfile
echo "version = \"$version\";" >> $hashfile

1
pkgs/development/ocaml-modules/charInfo_width/default.nix
View file

@ -3,6 +3,7 @@
buildDunePackage rec {
pname = "charInfo_width";
version = "1.1.0";
useDune2 = true;
src = fetchzip {
url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2";
sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w";

4
pkgs/development/ocaml-modules/dns/default.nix
View file

@ -4,14 +4,14 @@
buildDunePackage rec {
pname = "dns";
version = "4.6.2";
version = "4.6.3";
useDune2 = true;
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
sha256 = "0prypr5c589vay4alri78g0sarh06z35did26wn3s3di17d5761q";
sha256 = "0g7xw43jm5hv0w9lsnhhi0w3243mxl615cdsvz29yh39fcqvqsdy";
};
propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];

17
pkgs/development/ocaml-modules/lens/default.nix
View file

@ -1,21 +1,22 @@
{ lib, ocaml, fetchzip, ppx_deriving, ppxfind, buildDunePackage }:
if lib.versionAtLeast ocaml.version "4.10"
then throw "lens is not available for OCaml ${ocaml.version}"
else
{ lib, fetchzip, ppx_deriving, ppxfind, buildDunePackage, ounit }:
buildDunePackage rec {
pname = "lens";
version = "1.2.3";
version = "1.2.4";
useDune2 = true;
src = fetchzip {
url = "https://github.com/pdonadeo/ocaml-lens/archive/v${version}.tar.gz";
sha256 = "09k2vhzysx91syjhgv6w1shc9mgzi0l4bhwpx1g5pi4r4ghjp07y";
sha256 = "18mv7n5rcix3545mc2qa2f9xngks4g4kqj2g878qj7r3cy96kklv";
};
minimumOCamlVersion = "4.04.1";
minimumOCamlVersion = "4.10";
buildInputs = [ ppx_deriving ppxfind ];
doCheck = true;
checkInputs = [ ounit ];
meta = with lib; {
homepage = "https://github.com/pdonadeo/ocaml-lens";
description = "Functional lenses";

8
pkgs/development/ocaml-modules/nonstd/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromBitbucket, buildDunePackage }:
{ lib, fetchzip, buildDunePackage }:
buildDunePackage rec {
pname = "nonstd";
@ -6,10 +6,8 @@ buildDunePackage rec {
minimumOCamlVersion = "4.02";
src = fetchFromBitbucket {
owner = "smondet";
repo = pname;
rev = "${pname}.${version}";
src = fetchzip {
url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz";
sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
};

46
pkgs/development/ocaml-modules/zed/default.nix
View file

@ -1,36 +1,19 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }:
{ lib, buildDunePackage, fetchFromGitHub, camomile, react, charInfo_width }:
let param =
if lib.versionAtLeast ocaml.version "4.02" then
{
version = "3.1.0";
buildDunePackage rec {
pname = "zed";
version = "3.1.0";
useDune2 = true;
src = fetchFromGitHub {
owner = "ocaml-community";
repo = pname;
rev = version;
sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p";
buildInputs = [ dune ];
propagatedBuildInputs = [ charInfo_width ];
extra = {
buildPhase = "dune build -p zed";
inherit (dune) installPhase; };
} else {
version = "1.4";
sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";
buildInputs = [ ocamlbuild ];
propagatedBuildInputs = [ camomile ];
extra = { createFindlibDestdir = true; };
}
; in
stdenv.mkDerivation (rec {
inherit (param) version;
name = "ocaml-zed-${version}";
src = fetchzip {
url = "https://github.com/diml/zed/archive/${version}.tar.gz";
inherit (param) sha256;
};
buildInputs = [ ocaml findlib ] ++ param.buildInputs;
propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs;
propagatedBuildInputs = [ charInfo_width react ];
meta = {
description = "Abstract engine for text edition in OCaml";
@ -41,11 +24,10 @@ stdenv.mkDerivation (rec {
To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.
'';
homepage = "https://github.com/diml/zed";
inherit (src.meta) homepage;
license = lib.licenses.bsd3;
platforms = ocaml.meta.platforms or [];
maintainers = [
lib.maintainers.gal_bolle
];
};
} // param.extra)
}

44
pkgs/development/python-modules/aiokef/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ lib
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pytest-cov
, pytestCheckHook
, pytest-mypy
, pythonOlder
, tenacity
}:
buildPythonPackage rec {
pname = "aiokef";
version = "0.2.17";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "basnijholt";
repo = pname;
rev = "v${version}";
sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9";
};
propagatedBuildInputs = [
async-timeout
tenacity
];
checkInputs = [
pytest-cov
pytest-mypy
pytestCheckHook
];
pytestFlagsArray = [ "tests" ];
pythonImportsCheck = [ "aiokef" ];
meta = with lib; {
description = "Python API for KEF speakers";
homepage = "https://github.com/basnijholt/aiokef";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

39
pkgs/development/python-modules/awesomeversion/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "awesomeversion";
version = "20.12.5";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "1jwlfqnrqlxjp30fj9bcqh7vgicmpdbn5kjdcmll4srnl87lalfg";
};
postPatch = ''
substituteInPlace setup.py --replace "main" ${version}
'';
propagatedBuildInputs = [ requests ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "awesomeversion" ];
meta = with lib; {
description = "Python module to deal with versions";
homepage = "https://github.com/ludeeus/awesomeversion";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/browser-cookie3/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "browser-cookie3";
version = "0.11.4";
version = "0.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "3d140c6b651dbd8b8555aca6472557fcfda4dd93afc26ea3a200be922a843e2c";
sha256 = "5f26422091ad0e97375d565f8fbacfaf314d0722db35c921635eab23686e4fc4";
};
disabled = !isPy3k;

4
pkgs/development/python-modules/casbin/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "0.15.0";
version = "0.16.0";
disabled = isPy27;
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
sha256 = "0w34xs9qpf1x4rq2ri4fhx3yi8h4inzavv9hjsx8mlkzid7gdx1b";
sha256 = "1983p8pkbdj6yaclkdng7fn0pmlbz1yc75a4a847ppw47075ryph";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/docker/default.nix
View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "docker";
version = "4.4.0";
version = "4.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "cffc771d4ea1389fc66bc95cb72d304aa41d1a1563482a9a000fba3a84ed5071";
sha256 = "sha256-BgSnRxnV0t5Dh1OTS3Vb/NpvYvSbjkswlppLCiqKEiA=";
};
nativeBuildInputs = lib.optional isPy27 mock;

28
pkgs/development/python-modules/pyfido/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pyfido";
version = "2.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "0b28bhyhscaw7dbc92dxswann05x8mz92cagyawdfm8jnc67gq4b";
};
propagatedBuildInputs = [ aiohttp ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pyfido" ];
meta = with lib; {
description = "Python client to get fido account data";
homepage = "https://github.com/titilambert/pyfido";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

28
pkgs/development/python-modules/pyfnip/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
}:
buildPythonPackage rec {
pname = "pyfnip";
version = "0.2";
src = fetchPypi {
inherit pname version;
sha256 = "0q52rb0kshgbligxjqrwz0v7kgqjbv6jahdb66ndxy93mfr0ig3a";
};
propagatedBuildInputs = [ requests ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pyfnip" ];
meta = with lib; {
description = "Python client to get fido account data";
homepage = "https://github.com/juhaniemi/pyfnip";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/pyftdi/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pyftdi";
version = "0.52.0";
version = "0.52.9";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "eblot";
repo = pname;
rev = "v${version}";
sha256 = "0nm4z7v9qcb9mxqbl21jgzica4faldnpy5qmbkrc6scnx55pxfm9";
sha256 = "07q9wmpl97a6laxfbcjqhv373msbsjppsyf5i77h0f6ccil0q1i6";
};
propagatedBuildInputs = [ pyusb pyserial ];

43
pkgs/development/python-modules/pyhaversion/default.nix
View file

@ -1,40 +1,49 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, aiohttp
, aresponses
, async-timeout
, semantic-version
, pytestrunner
, awesomeversion
, buildPythonPackage
, fetchFromGitHub
, pythonAtLeast
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyhaversion";
version = "3.4.2";
disabled = pythonOlder "3.8";
version = "20.12.1";
src = fetchPypi {
inherit pname version;
sha256 = "b4e49dfa0f9dae10edd072e630d902e5497daa312baad58b7df7618efe863377";
# Only 3.8.0 and beyond are supported
disabled = pythonAtLeast "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "17yl67dgw75dghljcfwzblm11kqnh6sxf47w62mxz86aq9zrvcxd";
};
propagatedBuildInputs = [
aiohttp
async-timeout
semantic-version
awesomeversion
];
buildInputs = [
pytestrunner
checkInputs = [
aresponses
awesomeversion
pytest-asyncio
pytestCheckHook
];
# no tests
doCheck = false;
pythonImportsCheck = [ "pyhaversion" ];
meta = with lib; {
description = "A python module to the newest version number of Home Assistant";
description = "Python module to the newest version number of Home Assistant";
homepage = "https://github.com/ludeeus/pyhaversion";
changelog = "https://github.com/ludeeus/pyhaversion/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = [ maintainers.makefu ];
maintainers = with maintainers; [ makefu ];
};
}

60
pkgs/development/python-modules/pyinsteon/default.nix Normal file
View file

@ -0,0 +1,60 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiofiles
, aiohttp
, async_generator
, pypubsub
, pyserial
, pyserial-asyncio
, pyyaml
, pytestCheckHook
, pythonOlder
, pytest-cov
, pytest-asyncio
, pytest-timeout
}:
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.0.8";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0d028fcqmdzxp0vsz7digx794s9l65ydsnsyvyx275z6577x7h4h";
};
propagatedBuildInputs = [
aiofiles
aiohttp
async_generator
pypubsub
pyserial
pyserial-asyncio
pyyaml
];
checkInputs = [
pytest-asyncio
pytest-cov
pytest-timeout
pytestCheckHook
];
pythonImportsCheck = [ "pyinsteon" ];
meta = with lib; {
description = "Python library to support Insteon home automation projects";
longDescription = ''
This is a Python package to interface with an Insteon Modem. It has been
tested to work with most USB or RS-232 serial based devices such as the
2413U, 2412S, 2448A7 and Hub models 2242 and 2245.
'';
homepage = "https://github.com/pyinsteon/pyinsteon";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

25
pkgs/development/python-modules/pylutron/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pylutron";
version = "0.2.6";
src = fetchPypi {
inherit pname version;
sha256 = "1q8qdy26s9hvfsh75pak7xiqjwrwsgq18p4d86dwf4dwmy5s4qj1";
};
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pylutron" ];
meta = with lib; {
description = "Python library for controlling a Lutron RadioRA 2 system";
homepage = "https://github.com/thecynic/pylutron";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

32
pkgs/development/python-modules/pytest-factoryboy/default.nix
View file

@ -1,42 +1,44 @@
{ lib, stdenv
, fetchFromGitHub
{ lib
, buildPythonPackage
, pytestCheckHook
, pytest
, inflection
, factory_boy
, pytestcache
, pytestcov
, fetchFromGitHub
, inflection
, mock
, pytest
, pytestcache
, pytestCheckHook
, pytestcov
}:
buildPythonPackage rec {
pname = "pytest-factoryboy";
version = "2.0.3";
version = "2.1.0";
src = fetchFromGitHub {
owner = "pytest-dev";
repo = "pytest-factoryboy";
rev = version;
sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn";
sha256 = "0v6b4ly0p8nknpnp3f4dbslfsifzzjx2vv27rfylx04kzdhg4m9p";
};
# TODO: remove in next release, it's removed in master.
postPatch = "substituteInPlace tox.ini --replace '--pep8' ''";
propagatedBuildInputs = [
factory_boy
inflection
pytest
];
propagatedBuildInputs = [ factory_boy inflection pytest ];
# The project uses tox, which we can't. So we simply run pytest manually.
checkInputs = [
mock
pytestCheckHook
pytestcache
pytestcov
];
pytestFlagsArray = [ "--ignore=docs" ];
pythonImportsCheck = [ "pytest_factoryboy" ];
meta = with lib; {
description = "Integration of factory_boy into the pytest runner.";
description = "Integration of factory_boy into the pytest runner";
homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/";
maintainers = with maintainers; [ winpat ];
license = licenses.mit;

17
pkgs/development/python-modules/pytmx/default.nix
View file

@ -1,21 +1,28 @@
{ lib, fetchFromGitHub, isPy3k, buildPythonPackage, pygame, pyglet, pysdl2, six }:
{ lib, fetchFromGitHub
, python, buildPythonPackage, isPy27
, pygame, pyglet, pysdl2, six
}:
buildPythonPackage rec {
pname = "pytmx";
version = "3.22.0";
version = "3.24.0";
disabled = isPy27;
src = fetchFromGitHub {
# The release was not git tagged.
owner = "bitcraft";
repo = "PyTMX";
rev = "187fd429dadcdc5828e78e6748a983aa1434e4d2";
sha256 = "0480pr61v54bwdyzb983sk0fqkyfbcgrdn8k11yf1yck4zb119gc";
rev = "eb96efea30d57b731654b2a167d86b8b553b147d";
sha256 = "1g1j4w75zw76p5f8m5v0hdigdlva2flf0ngyk8nvqcwzcl5vq5wc";
};
propagatedBuildInputs = [ pygame pyglet pysdl2 six ];
checkPhase = ''
python -m unittest tests.pytmx.test_pytmx
# Change into the test directory due to a relative resource path.
cd tests/pytmx
${python.interpreter} -m unittest test_pytmx
'';
meta = with lib; {

28
pkgs/development/python-modules/pyxeoma/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pyxeoma";
version = "1.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "0c9q6xdh2ciisv0crlz069haz01gfkhd5kasyr14jng4vjpzinc7";
};
propagatedBuildInputs = [ aiohttp ];
# Project doesn't have any tests
doCheck = false;
pythonImportsCheck = [ "pyxeoma" ];
meta = with lib; {
description = "Python wrapper for Xeoma web server API";
homepage = "https://github.com/jeradM/pyxeoma";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

50
pkgs/development/python-modules/tld/default.nix
View file

@ -1,39 +1,39 @@
{ lib, stdenv, fetchPypi, python }:
{ lib
, buildPythonPackage
, factory_boy
, faker
, fetchPypi
, pytest-cov
, pytestCheckHook
, six
, tox
}:
python.pkgs.buildPythonPackage rec {
pname = "tld";
version = "0.12.4";
buildPythonPackage rec {
pname = "tld";
version = "0.12.5";
src = fetchPypi {
inherit pname version;
sha256 = "0976g7jcpi3jv7snawmfis5ybb6737cv2xw7wlanlfkyqljip24x";
sha256 = "0d1lbbg2qdw5jjxks0dqlf69bki5885mhj8ysvgylmrni56hjqqv";
};
propagatedBuildInputs = with python.pkgs; [ six ];
checkInputs = with python.pkgs; [ factory_boy faker pytestcov tox pytestCheckHook];
# https://github.com/barseghyanartur/tld/issues/54
disabledTests = [
"test_1_update_tld_names"
"test_1_update_tld_names_command"
"test_2_update_tld_names_module"
checkInputs = [
factory_boy
faker
pytest-cov
pytestCheckHook
tox
];
preCheck = ''
export PATH="$PATH:$out/bin"
'';
dontUseSetuptoolsCheck = true;
pythonImportsCheck = [
"tld"
];
pythonImportsCheck = [ "tld" ];
meta = with lib; {
homepage = "https://github.com/barseghyanartur/tld";
description = "Extracts the top level domain (TLD) from the URL given";
license = licenses.lgpl21;
maintainers = with maintainers; [ ];
# https://github.com/barseghyanartur/tld/blob/master/README.rst#license
# MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
license = with licenses; [ lgpl21Plus mpl11 gpl2Only ];
maintainers = with maintainers; [ fab ];
};
}

8
pkgs/development/python-modules/xdg/default.nix
View file

@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
, clikit
, poetry
, poetry-core
, pytestCheckHook
}:
buildPythonPackage rec {
version = "4.0.1";
version = "5.0.1";
pname = "xdg";
disabled = isPy27;
format = "pyproject";
@ -14,10 +14,10 @@ buildPythonPackage rec {
owner = "srstevenson";
repo = pname;
rev = version;
sha256 = "13kgnbwam6wmdbig0m98vmyjcqrp0j62nmfknb6prr33ns2nxbs2";
sha256 = "sha256-WMY9Hs9SbErTp8hVBoCWTz4dLQhuzqTRpXFEyE7+woo=";
};
nativeBuildInputs = [ poetry ];
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
clikit

18
pkgs/development/tools/aws-sam-cli/default.nix
View file

@ -15,6 +15,22 @@ let
};
});
aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec {
version = "1.27.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ=";
};
});
dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec {
version = "0.7.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y=";
};
});
cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec {
version = "1.6.0";
src = oldAttrs.src.override {
@ -68,7 +84,7 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace requirements/base.txt \
--replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \
--replace "docker~=4.2.0" "docker~=4.3.1" \
--replace "docker~=4.2.0" "docker~=4.3" \
--replace "jmespath~=0.9.5" "jmespath~=0.10.0" \
--replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \
--replace "requests==2.23.0" "requests~=2.24" \

8
pkgs/development/tools/cask/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, emacsPackages }:
{ stdenv, fetchurl, python, emacs }:
stdenv.mkDerivation rec {
pname = "cask";
inherit (emacsPackages.melpaStablePackages.cask) src version;
inherit (emacs.pkgs.melpaStablePackages.cask) src version;
doCheck = true;
nativeBuildInputs = [ emacsPackages.emacs ];
buildInputs = with emacsPackages; [
nativeBuildInputs = [ emacs ];
buildInputs = with emacs.pkgs; [
s f dash ansi ecukes servant ert-runner el-mock
noflet ert-async shell-split-string git package-build
] ++ [

6
pkgs/development/tools/misc/tokei/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tokei";
version = "12.1.1";
version = "12.1.2";
src = fetchFromGitHub {
owner = "XAMPPRocky";
repo = pname;
rev = "v${version}";
sha256 = "1n5n7lxlw6zhrdf4jbmqpyn9k02dpn4wqm93qgiin4i8j8bxwjw8";
sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI=";
};
cargoSha256 = "0bph6n8i5dfy5ryr3nyd3pxyrl1032vvg63s4s44g01qjm9rfdvf";
cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994=";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security

11
pkgs/development/tools/ocaml/dune-release/default.nix
View file

@ -32,9 +32,14 @@ in buildDunePackage rec {
# to have a fixed path to the binary in nix store
sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml
# set bogus user info in git so git commit doesn't fail
sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' \
tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t
# fix problems with git invocations in tests
for f in tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t; do
# set bogus user info in git so git commit doesn't fail
sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' "$f"
# surpress hint to set default branch name
substituteInPlace "$f" --replace "git init" "git init -b main"
done
# ignore weird yes error message
sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t
'';

2
pkgs/misc/emulators/rpcs3/default.nix
View file

@ -47,7 +47,7 @@ mkDerivation {
meta = with lib; {
description = "PS3 emulator/debugger";
homepage = "https://rpcs3.net/";
maintainers = with maintainers; [ abbradar neonfuz nocent ];
maintainers = with maintainers; [ abbradar neonfuz ilian ];
license = licenses.gpl2;
platforms = [ "x86_64-linux" ];
};

54
pkgs/misc/vim-plugins/generated.nix
View file

@ -882,12 +882,12 @@ let
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
version = "2021-01-05";
version = "2021-01-10";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
rev = "9582a7dc191f3569644092fb0d3b2ad7bf608bca";
sha256 = "0kpnzzg1pigjrw8g58iajw8apb7dczapm7jwdh8q5ixhmh31xn6v";
rev = "ff083e4b6cdf55e1695b0e1a6f4fde1c1a61bc06";
sha256 = "0rj7mwgdqr6qwn4wz96ypw5l97badgzvcdmqwa83jik4k99gy7k7";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@ -2748,12 +2748,12 @@ let
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
version = "2020-11-25";
version = "2021-01-10";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
rev = "f94ec5a9259b4fd2deb495ead0341a38c19c2799";
sha256 = "1f7z23dn7vnldc82d6x1j8wqvj9vsi169rbcg0scfphh79fq61pc";
rev = "7ed43362582c7c202f9a3edc2293dbb87d96e5fc";
sha256 = "1bcl2cdsvafvlsh5d4a2cr3v1nzpdlh9whaasq2ac192a6hs0c3x";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@ -2784,12 +2784,12 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-01-01";
version = "2021-01-10";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "97f0ef219241ec8379feada8ab46c7da8c69f9ca";
sha256 = "10q0fdib4mcbih13f7wknfs99wjqf1flhrj13qwlw0p5sswjz0z3";
rev = "e971d2af33189bff941c9632aca51211dfca0869";
sha256 = "09h2kacqbqazllajacpfnlysvwb1ikg5gmymci3hp39g488i3kx6";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -4609,6 +4609,18 @@ let
meta.homepage = "https://github.com/guns/vim-clojure-static/";
};
vim-closer = buildVimPluginFrom2Nix {
pname = "vim-closer";
version = "2020-10-24";
src = fetchFromGitHub {
owner = "rstacruz";
repo = "vim-closer";
rev = "c61667d27280df171a285b1274dd3cf04cbf78d4";
sha256 = "1dgcag4dibckpvsm8hr28yw10z81ic52sdm5narcwr1k6hjidxpn";
};
meta.homepage = "https://github.com/rstacruz/vim-closer/";
};
vim-closetag = buildVimPluginFrom2Nix {
pname = "vim-closetag";
version = "2020-10-09";
@ -5151,12 +5163,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
version = "2021-01-09";
version = "2021-01-10";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
rev = "428a59e4ec5061cae34dacd865bd831ddee7a446";
sha256 = "0jfdbaxjizb127s8rhx2ilhz48cg5xahv77rhm9sa4v9lky8zgrr";
rev = "321354b5f6c2e4ec7247f73a8d47569363edeb86";
sha256 = "0r1a641az7wj6vqpk4sqii34x0k2xh2q74zsaa5iadjagidqcb54";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@ -5957,12 +5969,12 @@ let
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
version = "2021-01-09";
version = "2021-01-10";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
rev = "678c0592382c7073505650d30e71e9f9cbc3353c";
sha256 = "0s7yhgajjqavj0lfzwassrk0n83dckf41bca54p5833ds85vwnsz";
rev = "3ed0e7aa31d42fdb1551fd9471357203e8c2c8bc";
sha256 = "1d09i31rckdx4bqp7nf8v7kzax3xx7n021838fa1by1c2zvyzrhz";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@ -7831,12 +7843,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2021-01-09";
version = "2021-01-10";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "5303de81954b854161dffb76da37f8508c9c1476";
sha256 = "0xkgirbb2rw4b0h4qdv8f2lsvadqcyqrclxd8a3i8r2dc4xdgp3p";
rev = "52eff3265181bbbe5338818dc5bc196e234cea45";
sha256 = "1j4f3762zpw4qvqiyrq1ym4lk78w3r93ya70id7g6w4pviaqcv1j";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@ -8012,12 +8024,12 @@ let
yats-vim = buildVimPluginFrom2Nix {
pname = "yats-vim";
version = "2021-01-02";
version = "2021-01-10";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
rev = "9039d2421b8fe4c70b743d2c28df935290026dca";
sha256 = "1yv46b041340jq4s0471w5l1ryikkczp09rsnxh0piyp7fqmb0qh";
rev = "ac6057f57e0d96ee744635e35cacf2f2d3037d95";
sha256 = "037vmmnhir217ais2bnl6lskbpdh2wfmjq6qmjvrdp2ylwscm81d";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";

10
pkgs/misc/vim-plugins/overrides.nix
View file

@ -395,6 +395,16 @@ self: super: {
passthru.python3Dependencies = ps: with ps; [ beancount ];
});
vim-closer = super.vim-closer.overrideAttrs(old: {
patches = [
# Fix duplicate tag in doc
(fetchpatch {
url = "https://github.com/rstacruz/vim-closer/commit/a504be8c7050e41b7dfc50c2362948e2cf7c5422.patch";
sha256 = "065q30d913fm3pc7r5y53wmnb7q7bhv21qxavm65bkb91242d409";
})
];
});
vim-codefmt = super.vim-codefmt.overrideAttrs(old: {
dependencies = with super; [ vim-maktaba ];
});

1
pkgs/misc/vim-plugins/vim-plugin-names
View file

@ -476,6 +476,7 @@ roxma/nvim-yarp
roxma/vim-tmux-clipboard
RRethy/vim-hexokinase
RRethy/vim-illuminate
rstacruz/vim-closer
rust-lang/rust.vim
ryanoasis/vim-devicons
ryvnf/readline.vim

16
pkgs/misc/vscode-extensions/default.nix
View file

@ -155,6 +155,22 @@ let
};
};
github.github-vscode-theme = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "github-vscode-theme";
publisher = "github";
version = "1.1.5";
sha256 = "10f0098cce026d1f0c855fb7a66ea60b5d8acd2b76126ea94fe7361e49cd9ed2";
};
meta = with lib; {
description = "GitHub theme for VS Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme";
homepage = "https://github.com/primer/github-vscode-theme";
license = licenses.mit;
maintainers = with maintainers; [ hugolgst ];
};
};
golang.Go = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Go";

24
pkgs/os-specific/linux/kernel/hardened/patches.json
View file

@ -1,27 +1,27 @@
{
"4.14": {
"extra": ".a",
"name": "linux-hardened-4.14.214.a.patch",
"sha256": "14m075fnbzlshrz09vpyk9v9qbki896caj8f49am2z8dmm5hnr6b",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.214.a/linux-hardened-4.14.214.a.patch"
"name": "linux-hardened-4.14.215.a.patch",
"sha256": "1bk00y0cm05pzsshf1kmbxwcizi0lnq6ss1ig2bhxzgv2rxzj8cz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.215.a/linux-hardened-4.14.215.a.patch"
},
"4.19": {
"extra": ".a",
"name": "linux-hardened-4.19.166.a.patch",
"sha256": "0wkyd8k68qy378vj3937dk0valqb4sgdz5fg3107bjcgv7a4lvis",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.166.a/linux-hardened-4.19.166.a.patch"
"name": "linux-hardened-4.19.167.a.patch",
"sha256": "1ijdlkh1ad803i9dds46w2457jwigzlil9v37x793v4mx0rqb8ag",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.167.a/linux-hardened-4.19.167.a.patch"
},
"5.10": {
"extra": ".a",
"name": "linux-hardened-5.10.6.a.patch",
"sha256": "18ryh9zhrv5mmg876wss8k5fx8abm7ay0qpanvzmf5bjw7dc6qkq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.6.a/linux-hardened-5.10.6.a.patch"
"name": "linux-hardened-5.10.7.a.patch",
"sha256": "1b5djibfdqs0zhidh87hz9fhnvxyjxnz7lys0ks3a9a7ha5mina4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.7.a/linux-hardened-5.10.7.a.patch"
},
"5.4": {
"extra": ".a",
"name": "linux-hardened-5.4.88.a.patch",
"sha256": "0fz44izfmcsj205l7hjmkp78f5isy96fcjsz2bvrpb4x3h98bm5i",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.88.a/linux-hardened-5.4.88.a.patch"
"name": "linux-hardened-5.4.89.a.patch",
"sha256": "1rbk8j8f31j8jjb7p29q3sv538jjlrc9mgxrac4pga11dmxzgahk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.89.a/linux-hardened-5.4.89.a.patch"
},
"5.9": {
"extra": "",

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.214";
version = "4.14.215";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "07ir4yw7s5c6yb3gjbgjvcqqdgpbsjxrvapgh6zs22ffd8hrchpm";
sha256 = "1ni6p485dszi365rfflrwmjl6arbkhfvl1zm7p99vcv11hllx14s";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.19.166";
version = "4.19.167";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "03l86ykdjs5wa0n4wknpgy9dv2r6l92qfsyak373jkhs684z53mr";
sha256 = "00gddgr1jj9zkd10mbbkanfkgpqi2jqszibq80rc9bbmgiknfb1i";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View file

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.250";
version = "4.4.251";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "12m14j8654rawj2znkyhvcnwnf53x10zlghxd0mpl8dfzwvn2f5b";
sha256 = "13mnlwwcwvbyqn8lafjymq66qjfj7nksdiyrcgymx8s03z1why86";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View file

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.250";
version = "4.9.251";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "15vizxd2i2311skjank406ny3bc30c5rz2p9jvh5xz1yv12vzgcy";
sha256 = "03cn3yzyv8vwvv76nxj655i14s9avhr4hcc18mq2rh0qn6zcnkgg";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.10.6";
version = "5.10.7";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "02v91afra3pcwfws74wxdsm8pfc57vws659b7j6jmsxm3hnd0rvp";
sha256 = "1gpsdxq2gx40gpmm0zya0wxd7fdflbaq9j1j0hbffahgz44nxgsc";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.4.88";
version = "5.4.89";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1ci432xanm7glgg05012kh43pfi4k771kzih0816y5674v0hg02b";
sha256 = "1bqamd3z71h8jh3mxfisqiaxj5m027xjyifj9ryqdwbdgcbxb396";
};
} // (args.argsOverride or {}))

12
pkgs/servers/dex/default.nix
View file

@ -1,24 +1,24 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "dex";
version = "2.23.0";
version = "2.27.0";
src = fetchFromGitHub {
owner = "dexidp";
repo = pname;
rev = "v${version}";
sha256 = "1fr5r7d0xwj0b69jhszyyif4yc4kiy7zpfcpf83zdy12mh8f96c8";
sha256 = "0n66nm91qcmm00mz8f8x39xqr3y05qxk34fvka53s6xax1gxvxxi";
};
goPackagePath = "github.com/dexidp/dex";
vendorSha256 = "1k87q3ic02n2b632y3lmnclac1iaidmsl3f9py61myi5r02p03lp";
subPackages = [
"cmd/dex"
];
buildFlagsArray = [
"-ldflags=-w -X github.com/dexidp/dex/version.Version=${src.rev}"
"-ldflags=-w -s -X github.com/dexidp/dex/version.Version=${src.rev}"
];
postInstall = ''

12
pkgs/servers/home-assistant/component-packages.nix
View file

@ -247,7 +247,7 @@
"ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
"ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];
"fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3
"fido" = ps: with ps; [ ]; # missing inputs: pyfido
"fido" = ps: with ps; [ pyfido ];
"file" = ps: with ps; [ ];
"filesize" = ps: with ps; [ ];
"filter" = ps: with ps; [ aiohttp-cors sqlalchemy ];
@ -283,7 +283,7 @@
"fronius" = ps: with ps; [ ]; # missing inputs: pyfronius
"frontend" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend
"frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi
"futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip
"futurenow" = ps: with ps; [ pyfnip ];
"garadget" = ps: with ps; [ ];
"garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect
"gc100" = ps: with ps; [ ]; # missing inputs: python-gc100
@ -388,7 +388,7 @@
"input_number" = ps: with ps; [ ];
"input_select" = ps: with ps; [ ];
"input_text" = ps: with ps; [ ];
"insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon
"insteon" = ps: with ps; [ pyinsteon ];
"integration" = ps: with ps; [ ];
"intent" = ps: with ps; [ aiohttp-cors ];
"intent_script" = ps: with ps; [ ];
@ -413,7 +413,7 @@
"kankun" = ps: with ps; [ ];
"keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact
"keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client
"kef" = ps: with ps; [ getmac ]; # missing inputs: aiokef
"kef" = ps: with ps; [ aiokef getmac ];
"keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput
"keyboard_remote" = ps: with ps; [ aionotify evdev ];
"kira" = ps: with ps; [ ]; # missing inputs: pykira
@ -459,7 +459,7 @@
"luci" = ps: with ps; [ openwrt-luci-rpc ];
"luftdaten" = ps: with ps; [ luftdaten ];
"lupusec" = ps: with ps; [ ]; # missing inputs: lupupy
"lutron" = ps: with ps; [ ]; # missing inputs: pylutron
"lutron" = ps: with ps; [ pylutron ];
"lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta
"lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12
"lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides
@ -942,7 +942,7 @@
"xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper
"xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi
"xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi
"xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma
"xeoma" = ps: with ps; [ pyxeoma ];
"xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway
"xiaomi" = ps: with ps; [ ha-ffmpeg ];
"xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway

10
pkgs/tools/admin/awscli2/default.nix
View file

@ -8,12 +8,12 @@ let
py = python3.override {
packageOverrides = self: super: {
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0dev75";
version = "2.0.0dev85";
src = fetchFromGitHub {
owner = "boto";
repo = "botocore";
rev = "1a4caa8d1c232e9463febec406a8fedc71cb065c";
sha256 = "0z2c9i2ci3f8979si8gcgnsz44ylchjax1f3dhj7pzyb2kcw6zri";
rev = "962bb5d356096c57e25a5579d09e4b4d928c886d";
sha256 = "09bk8d0r3245kbi96641gvfl3q4jjhw55gjldc2cpml6mv36hhnb";
};
});
prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
@ -29,13 +29,13 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.1.7"; # N.B: if you change this, change botocore to a matching version too
version = "2.1.17"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
sha256 = "0sxdbc8y5yqcvsk2bxkywdh4fsq90vlsmcm45y0sa3rpza64xs3r";
sha256 = "1pla97sylzhvj7r5cschv4bg23hpl0ax1m5cx4291fppjnrn2yp9";
};
postPatch = ''

12
pkgs/tools/networking/go-shadowsocks2/default.nix
View file

@ -1,19 +1,17 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "go-shadowsocks2";
version = "0.0.11";
goPackagePath = "github.com/shadowsocks/go-shadowsocks2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "shadowsocks";
repo = "go-shadowsocks2";
rev = "v${version}";
sha256 = "1dprz84gmcp6xcsk873lhj32wm8b55vnqn0s984ggvwf1rjqw00c";
sha256 = "1wzy3ml4ld83iawcl6p313bskzs6zjhz8vlg8kpwgn71cnbv4pvi";
};
goDeps = ./deps.nix;
vendorSha256 = "0iyak8af708h3rdrslndladbcjrix35j3rlhpsb8ljchqp09lksg";
meta = with lib; {
description = "Fresh implementation of Shadowsocks in Go";

30
pkgs/tools/networking/go-shadowsocks2/deps.nix generated
View file

@ -1,30 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/aead/chacha20";
fetch = {
type = "git";
url = "https://github.com/aead/chacha20";
rev = "8b13a72661dae6e9e5dea04f344f0dc95ea29547";
sha256 = "0gbmgq5kbqmbyrsav57ql4jzbvqvp1q7yvcd5fl3wf5g94iyv56r";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "60c769a6c58655dab1b9adac0d58967dd517cfba";
sha256 = "1wy2pg38dz29vf1h48yfqf8m3jqvwnbdw8vkk3ldlj5d8fbbbmv8";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "fb81701db80f1745f51259b1f286de3fe2ec80c8";
sha256 = "1cgvyzkmsbvgyp75nxp10fpnpy08scz6ak60s9w0mkgibw7irhz3";
};
}
]

26
pkgs/tools/networking/socat/default.nix
View file

@ -1,11 +1,19 @@
{ stdenv, fetchurl, openssl, readline, which, nettools }:
{ lib
, fetchurl
, nettools
, openssl
, readline
, stdenv
, which
}:
stdenv.mkDerivation rec {
name = "socat-1.7.3.4";
pname = "socat";
version = "1.7.4.1";
src = fetchurl {
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
sha256 = "1z7xgnwiqpcv1j6aghhj9nqbx7cg3gpc4n9j7vi9hm7nhv5788wp";
url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2";
sha256 = "1sbmqqvni3ss9wyay6ik5v81kxffkra80mh4ypgj74g82iba5b1z";
};
postPatch = ''
@ -22,12 +30,12 @@ stdenv.mkDerivation rec {
checkInputs = [ which nettools ];
doCheck = false; # fails a bunch, hangs
meta = {
description = "A utility for bidirectional data transfer between two independent data channels";
meta = with lib; {
description = "Utility for bidirectional data transfer between two independent data channels";
homepage = "http://www.dest-unreach.org/socat/";
repositories.git = "git://repo.or.cz/socat.git";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = platforms.unix;
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ eelco ];
};
}

11
pkgs/tools/security/gopass/default.nix
View file

@ -12,7 +12,7 @@
buildGoModule rec {
pname = "gopass";
version = "1.10.1";
version = "1.11.0";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@ -20,10 +20,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
sha256 = "0dhh64mxfhk610wr7bpakzgmc4a4iyhfkkl3qhjp6a46g9iygana";
sha256 = "0plg3hck6yqxcazjczx9m5palzz5h3qs5minzmmq8yzvfwi0shic";
};
vendorSha256 = "07wv6yahx4yzr3h1x93x4r5rvw8wbfk836f04b4r9xjbnpq7lb2a";
vendorSha256 = "1sycbcld5qyriqb771l52drxy4vhzm4nh9q5s6kn70nq1s2a3h7x";
doCheck = false;
@ -46,12 +46,9 @@ buildGoModule rec {
ln -s $out/bin/gopass $out/bin/pass
'';
# --run to work around WONTFIX in https://github.com/gopasspw/gopass/issues/1662
postFixup = ''
for bin in $out/bin/*; do
wrapProgram $bin \
--prefix PATH : "${wrapperPath}" \
--run 'rm -f "''${XDG_CONFIG_HOME:-~/.config}/gopass/gpg-binary.loc"'
wrapProgram $bin --prefix PATH : "${wrapperPath}"
done
'';

30
pkgs/tools/security/hakrawler/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "hakrawler";
version = "20201224-${lib.strings.substring 0 7 rev}";
rev = "e39a514d0e179d33362ee244c017fb65cc2c12a5";
src = fetchFromGitHub {
owner = "hakluke";
repo = "hakrawler";
inherit rev;
sha256 = "0wpqfbpgnr94q5n7i4zh806k8n0phyg0ncnz43hqh4bbdh7l1y8a";
};
vendorSha256 = "18zs2l77ds0a3wxfqcd91h269g0agnwhginrx3j6gj30dbfls8a1";
meta = with lib; {
description = "Web crawler for the discovery of endpoints and assets";
homepage = "https://github.com/hakluke/hakrawler";
longDescription = ''
Simple, fast web crawler designed for easy, quick discovery of endpoints
and assets within a web application.
'';
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

33
pkgs/tools/security/terrascan/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "terrascan";
version = "1.2.0";
src = fetchFromGitHub {
owner = "accurics";
repo = pname;
rev = "v${version}";
sha256 = "1kjis0ylvmv1gvzp5qvi9a7x4611bjv8yx5mb6nkc0a8lscwb4c3";
};
vendorSha256 = "0yfybzwjvnan4qf5w25k22iwh5hp9v8si93p4jv9bx25rw91swws";
# tests want to download a vulnerable Terraform project
doCheck = false;
meta = with lib; {
description = "Detect compliance and security violations across Infrastructure";
longDescription = ''
Detect compliance and security violations across Infrastructure as Code to
mitigate risk before provisioning cloud native infrastructure. It contains
500+ polices and support for Terraform and Kubernetes.
'';
homepage = "https://github.com/accurics/terrascan";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

5
pkgs/tools/text/par/default.nix
View file

@ -18,7 +18,10 @@ stdenv.mkDerivation {
})
];
buildPhase = ''make -f protoMakefile'';
makefile = "protoMakefile";
preBuild = ''
makeFlagsArray+=(CC="${stdenv.cc.targetPrefix}cc -c" LINK1=${stdenv.cc.targetPrefix}cc)
'';
installPhase = ''
mkdir -p $out/bin

4
pkgs/tools/typesetting/lowdown/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lowdown";
version = "0.7.5";
version = "0.7.9";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
sha512 = "1wfbrydbk0f0blhg5my3m5gw8bspwh3rdg4w4mcalnrwpypzd4zrggc4aj3zm72c5jikx6pnjb2k9w1s075k84f6q8p8chlzb3s4qd2";
sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c";
};
nativeBuildInputs = [ which ];

13
pkgs/top-level/aliases.nix
View file

@ -85,8 +85,6 @@ mapAliases ({
buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26
bundler_HEAD = bundler; # added 2015-11-15
caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02
calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-12
calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-12
cantarell_fonts = cantarell-fonts; # added 2018-03-03
cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20
casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken.";
@ -144,7 +142,13 @@ mapAliases ({
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
emacsPackagesNg = emacsPackages; # added 2019-08-07
emacsPackagesNg = emacs.pkgs; # added 2019-08-07
emacs26Packages = emacs26.pkgs; # added 2020-12-18
emacs27Packages = emacs27.pkgs; # added 2020-12-18
emacs26WithPackages = emacs26.pkgs.withPackages; # added 2020-12-18
emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18
emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18
emacsPackages = emacs.pkgs; # added 2020-12-18
emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01
enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25
@ -669,6 +673,7 @@ mapAliases ({
uberwriter = apostrophe; # added 2020-04-23
ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
ucsFonts = ucs-fonts; # added 2016-07-15
ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # 2020-01-11
ultrastardx-beta = ultrastardx; # added 2017-08-12
unicorn-emu = unicorn; # added 2020-10-29
unifiStable = unifi6; # added 2020-12-28
@ -797,6 +802,8 @@ mapAliases ({
gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7.";
todolist = throw "todolist is now ultralist."; # added 2020-12-27
/* Cleanup before 21.03 */
riot-desktop = throw "riot-desktop is now element-desktop!";
riot-web = throw "riot-web is now element-web";

42
pkgs/top-level/all-packages.nix
View file

@ -500,7 +500,7 @@ in
mkShell = callPackage ../build-support/mkshell { };
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackages) inherit-local; };
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacs.pkgs) inherit-local; };
nix-gitignore = callPackage ../build-support/nix-gitignore { };
@ -1287,6 +1287,8 @@ in
google-amber = callPackage ../tools/graphics/amber { };
hakrawler = callPackage ../tools/security/hakrawler { };
hime = callPackage ../tools/inputmethods/hime {};
hostctl = callPackage ../tools/system/hostctl { };
@ -5373,6 +5375,10 @@ in
kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };
lagrange = callPackage ../applications/networking/browsers/lagrange {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { };
ma1sd = callPackage ../servers/ma1sd { };
@ -8156,10 +8162,6 @@ in
udptunnel = callPackage ../tools/networking/udptunnel { };
ufraw = callPackage ../applications/graphics/ufraw {
stdenv = gcc6Stdenv; # doesn't build with gcc7
};
uftrace = callPackage ../development/tools/uftrace { };
uget = callPackage ../tools/networking/uget { };
@ -9790,7 +9792,7 @@ in
# package. Wishing we could merge it into one irony package, to avoid this issue,
# but its emacs-side expression is autogenerated, and we can't hook into it (other
# than peek into its version).
inherit (emacsPackages.melpaStablePackages) irony;
inherit (emacs.pkgs.melpaStablePackages) irony;
};
hugs = callPackage ../development/interpreters/hugs { };
@ -12446,6 +12448,8 @@ in
terraformer = callPackage ../development/tools/misc/terraformer { };
terrascan = callPackage ../tools/security/terrascan { };
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
texinfo4 = texinfo413;
texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
@ -12472,8 +12476,6 @@ in
todoist-electron = callPackage ../applications/misc/todoist-electron { };
todolist = callPackage ../applications/misc/todolist { };
travis = callPackage ../development/tools/misc/travis { };
tree-sitter = callPackage ../development/tools/parsing/tree-sitter {
@ -15674,6 +15676,8 @@ in
pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
pe-parse = callPackage ../development/libraries/pe-parse { };
inherit (callPackage ../development/libraries/physfs { })
physfs_2
physfs;
@ -20396,6 +20400,8 @@ in
ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
ultralist = callPackage ../applications/misc/ultralist { };
undefined-medium = callPackage ../data/fonts/undefined-medium { };
uni-vga = callPackage ../data/fonts/uni-vga
@ -20825,7 +20831,11 @@ in
calculix = callPackage ../applications/science/math/calculix {};
calibre = libsForQt5.callPackage ../applications/misc/calibre {};
calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; };
calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; };
calibre = calibre-py3;
calligra = libsForQt5.callPackage ../applications/office/calligra {
openjpeg = openjpeg_1;
@ -21100,11 +21110,10 @@ in
};
inherit (callPackage ../applications/virtualization/docker {})
docker_18_09
docker_19_03;
docker_20_10;
docker = docker_19_03;
docker-edge = docker_19_03;
docker = docker_20_10;
docker-edge = docker_20_10;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
@ -21223,9 +21232,7 @@ in
elvis = callPackage ../applications/editors/elvis { };
emacs = emacs27;
emacsPackages = emacs27Packages;
emacs-nox = emacs27-nox;
emacsWithPackages = emacsPackages.emacsWithPackages;
emacs27 = callPackage ../applications/editors/emacs/27.nix {
# use override to enable additional features
@ -21296,11 +21303,6 @@ in
};
};
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26);
emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27);
emacs26WithPackages = emacs26Packages.emacsWithPackages;
emacs27WithPackages = emacs27Packages.emacsWithPackages;
inherit (gnome3) empathy;
enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };

1
pkgs/top-level/emacs-packages.nix
View file

@ -82,5 +82,6 @@ in lib.makeScope newScope (self: lib.makeOverridable ({
// {
inherit emacs melpaBuild trivialBuild;
emacsWithPackages = emacsWithPackages self;
withPackages = emacsWithPackages self;
})
) {})

Some files were not shown because too many files have changed in this diff Show more