JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2021-01-02 08:49:09 +01:00
commit e48db707e4
68 changed files with 17699 additions and 2105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/builders/packages/cataclysm-dda.section.md
View File

@ -1,4 +1,4 @@
# Cataclysm: Dark Days Ahead
# Cataclysm: Dark Days Ahead {#cataclysm-dark-days-ahead}
## How to install Cataclysm DDA

2
doc/builders/trivial-builders.chapter.md
View File

@ -37,7 +37,7 @@ This works just like `runCommand`. The only difference is that it also provides
Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.
::: {.note}
::: note
This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the `system` is usually the same as `builtins.currentSystem`.
:::

7
doc/languages-frameworks/agda.section.md
View File

@ -1,9 +1,4 @@
---
title: Agda
author: Alex Rice (alexarice)
date: 2020-01-06
---
# Agda
# Agda {#agda}
## How to use Agda

7
doc/languages-frameworks/android.section.md
View File

@ -1,9 +1,4 @@
---
title: Android
author: Sander van der Burg
date: 2018-11-18
---
# Android
# Android {#android}
The Android build environment provides three major features and a number of
supporting features.

2
doc/languages-frameworks/crystal.section.md
View File

@ -1,4 +1,4 @@
# Crystal
# Crystal {#crystal}
## Building a Crystal package

2
doc/languages-frameworks/emscripten.section.md
View File

@ -1,4 +1,4 @@
# Emscripten
# Emscripten {#emscripten}
[Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler

8
doc/languages-frameworks/haskell.section.md
View File

@ -1,10 +1,4 @@
---
title: User's Guide for Haskell in Nixpkgs
author: Peter Simons
date: 2015-06-01
---
# Haskell
# Haskell {#haskell}
The documentation for the Haskell infrastructure is published at
<https://haskell4nix.readthedocs.io/>. The source code for that

2
doc/languages-frameworks/idris.section.md
View File

@ -1,4 +1,4 @@
# Idris
# Idris {#idris}
## Installing Idris

7
doc/languages-frameworks/ios.section.md
View File

@ -1,9 +1,4 @@
---
title: iOS
author: Sander van der Burg
date: 2019-11-10
---
# iOS
# iOS {#ios}
This component is basically a wrapper/workaround that makes it possible to
expose an Xcode installation as a Nix package by means of symlinking to the

8
doc/languages-frameworks/lua.section.md
View File

@ -1,10 +1,4 @@
---
title: Lua
author: Matthieu Coudron
date: 2019-02-05
---
# User's Guide to Lua Infrastructure
# User's Guide to Lua Infrastructure {#users-guide-to-lua-infrastructure}
## Using Lua

8
doc/languages-frameworks/maven.section.md
View File

@ -1,10 +1,4 @@
---
title: Maven
author: Farid Zakaria
date: 2020-10-15
---
# Maven
# Maven {#maven}
Maven is a well-known build tool for the Java ecosystem however it has some challenges when integrating into the Nix build system.

4
doc/languages-frameworks/node.section.md
View File

@ -1,5 +1,5 @@
Node.js
=======
# Node.js {#node.js}
The `pkgs/development/node-packages` folder contains a generated collection of
[NPM packages](https://npmjs.com/) that can be installed with the Nix package
manager.

2
doc/languages-frameworks/python.section.md
View File

@ -1,4 +1,4 @@
# Python
# Python {#python}
## User Guide

3
doc/languages-frameworks/r.section.md
View File

@ -1,5 +1,4 @@
R
=
# R {#r}
## Installation

8
doc/languages-frameworks/rust.section.md
View File

@ -1,10 +1,4 @@
---
title: Rust
author: Matthias Beyer
date: 2017-03-05
---
# Rust
# Rust {#rust}
To install the rust compiler and cargo put

1
doc/languages-frameworks/texlive.section.md
View File

@ -1,4 +1,3 @@
# TeX Live {#sec-language-texlive}
Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute `texlive`.

7
doc/languages-frameworks/titanium.section.md
View File

@ -1,9 +1,4 @@
---
title: Titanium
author: Sander van der Burg
date: 2018-11-18
---
# Titanium
# Titanium {#titanium}
The Nixpkgs repository contains facilities to deploy a variety of versions of
the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform

7
doc/languages-frameworks/vim.section.md
View File

@ -1,9 +1,4 @@
---
title: User's Guide for Vim in Nixpkgs
author: Marc Weber
date: 2016-06-25
---
# Vim
# Vim {#vim}
Both Neovim and Vim can be configured to include your favorite plugins
and additional libraries.

8
doc/preface.chapter.md
View File

@ -1,10 +1,4 @@
---
title: Preface
author: Frederik Rietdijk
date: 2015-11-25
---
# Preface
# Preface {#preface}
The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the
[Nix package manager](https://nixos.org/nix/), released under a

60
lib/licenses.nix
View File

@ -817,14 +817,54 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
};
} // {
# TODO: remove legacy aliases
agpl3 = lib.licenses.agpl3Only;
fdl11 = lib.licenses.fdl11Only;
fdl12 = lib.licenses.fdl12Only;
fdl13 = lib.licenses.fdl13Only;
gpl1 = lib.licenses.gpl1Only;
gpl2 = lib.licenses.gpl2Only;
gpl3 = lib.licenses.gpl3Only;
lgpl2 = lib.licenses.lgpl2Only;
lgpl21 = lib.licenses.lgpl21Only;
lgpl3 = lib.licenses.lgpl3Only;
agpl3 = spdx {
spdxId = "AGPL-3.0";
fullName = "GNU Affero General Public License v3.0";
deprecated = true;
};
fdl11 = spdx {
spdxId = "GFDL-1.1";
fullName = "GNU Free Documentation License v1.1";
deprecated = true;
};
fdl12 = spdx {
spdxId = "GFDL-1.2";
fullName = "GNU Free Documentation License v1.2";
deprecated = true;
};
fdl13 = spdx {
spdxId = "GFDL-1.3";
fullName = "GNU Free Documentation License v1.3";
deprecated = true;
};
gpl1 = spdx {
spdxId = "GPL-1.0";
fullName = "GNU General Public License v1.0";
deprecated = true;
};
gpl2 = spdx {
spdxId = "GPL-2.0";
fullName = "GNU General Public License v2.0";
deprecated = true;
};
gpl3 = spdx {
spdxId = "GPL-3.0";
fullName = "GNU General Public License v3.0";
deprecated = true;
};
lgpl2 = spdx {
spdxId = "LGPL-2.0";
fullName = "GNU Library General Public License v2";
deprecated = true;
};
lgpl21 = spdx {
spdxId = "LGPL-2.1";
fullName = "GNU Lesser General Public License v2.1";
deprecated = true;
};
lgpl3 = spdx {
spdxId = "LGPL-3.0";
fullName = "GNU Lesser General Public License v3.0";
deprecated = true;
};
}

6
maintainers/maintainer-list.nix
View File

@ -76,6 +76,12 @@
githubId = 882455;
name = "Elliot Cameron";
};
_6AA4FD = {
email = "f6442954@gmail.com";
github = "6AA4FD";
githubId = 12578560;
name = "Quinn Bohner";
};
a1russell = {
email = "adamlr6+pub@gmail.com";
github = "a1russell";

27
pkgs/applications/audio/new-session-manager/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, meson, pkg-config, ninja, liblo, libjack2, fltk }:
stdenv.mkDerivation rec {
pname = "new-session-manager";
version = "1.4.0";
src = fetchFromGitHub {
owner = "linuxaudio";
repo = "new-session-manager";
rev = "v${version}";
sha256 = "PqOv4tx3NLxL2+GWIUVgL72EQYMyDPIMrAkyby3TZ+0=";
};
nativeBuildInputs = [ meson pkg-config ninja ];
buildInputs = [ liblo libjack2 fltk ];
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
homepage = "https://linuxaudio.github.io/new-session-manager/";
description = "A session manager designed for audio applications.";
maintainers = [ maintainers._6AA4FD ];
license = licenses.gpl3Plus;
platforms = ["x86_64-linux"];
};
}

163
pkgs/applications/editors/emacs-modes/elpa-generated.nix generated
View File

@ -223,10 +223,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "12.3.1";
version = "13.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-12.3.1.tar";
sha256 = "0kn48mmsvp1yp8fjcl4lriymhyskv5s70wscmf596xf56s7mqas4";
url = "https://elpa.gnu.org/packages/auctex-13.0.1.tar";
sha256 = "1y5q3phd0xr7342i757hr4hic8nad4kkdf1zk56mlj5snwr0g0w7";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -264,16 +264,16 @@
license = lib.licenses.free;
};
}) {};
auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }:
auto-overlays = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "auto-overlays";
ename = "auto-overlays";
version = "0.10.9";
version = "0.10.10";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auto-overlays-0.10.9.tar";
sha256 = "0aqjp3bkd7mi191nm971z857s09py390ikcd93hyhmknblk0v14p";
url = "https://elpa.gnu.org/packages/auto-overlays-0.10.10.tar";
sha256 = "0wln6b4j3pd3mhx6sx0bnz74c4n6fidmkg77cqfpxs4j5l1zjp2z";
};
packageRequires = [];
packageRequires = [ cl-lib ];
meta = {
homepage = "https://elpa.gnu.org/packages/auto-overlays.html";
license = lib.licenses.free;
@ -437,10 +437,10 @@
elpaBuild {
pname = "chess";
ename = "chess";
version = "2.0.4";
version = "2.0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/chess-2.0.4.tar";
sha256 = "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js";
url = "https://elpa.gnu.org/packages/chess-2.0.5.tar";
sha256 = "1a4iwjdh6k348df6qywjws9z9f862d62m0b2sz57z4xhywiyxpr7";
};
packageRequires = [ cl-lib ];
meta = {
@ -685,10 +685,10 @@
elpaBuild {
pname = "csv-mode";
ename = "csv-mode";
version = "1.13";
version = "1.14";
src = fetchurl {
url = "https://elpa.gnu.org/packages/csv-mode-1.13.tar";
sha256 = "0g9rj8sgdbzqnqqvhx3022zz665wqam2nlxsbhzz2393cz11y0d2";
url = "https://elpa.gnu.org/packages/csv-mode-1.14.tar";
sha256 = "1jz4134pk8dwzsqih9wybx4l9yl244cgcilw8rdnnqmm8i6vxgrp";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -790,10 +790,10 @@
elpaBuild {
pname = "dict-tree";
ename = "dict-tree";
version = "0.14";
version = "0.16";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dict-tree-0.14.el";
sha256 = "1k00k3510bgq7rijvrxbx4b7qlq2abq1dyyn51zgm8q0qk68p5jq";
url = "https://elpa.gnu.org/packages/dict-tree-0.16.tar";
sha256 = "1myf26g3jjk2v8yp3k2n8m45vi20452wd7w2bja8csfkk0qx3300";
};
packageRequires = [ heap tNFA trie ];
meta = {
@ -805,10 +805,10 @@
elpaBuild {
pname = "diff-hl";
ename = "diff-hl";
version = "1.8.7";
version = "1.8.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/diff-hl-1.8.7.tar";
sha256 = "1qcwicflvm6dxcflnlg891hyzwp2q79fdkdbdwp1440a0j09riam";
url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar";
sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1026,21 +1026,24 @@
license = lib.licenses.free;
};
}) {};
eglot = callPackage ({ elpaBuild
eglot = callPackage ({ eldoc
, elpaBuild
, emacs
, fetchurl
, flymake ? null
, jsonrpc
, lib }:
, lib
, project
, xref }:
elpaBuild {
pname = "eglot";
ename = "eglot";
version = "1.6";
version = "1.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eglot-1.6.tar";
sha256 = "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx";
url = "https://elpa.gnu.org/packages/eglot-1.7.tar";
sha256 = "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk";
};
packageRequires = [ emacs flymake jsonrpc ];
packageRequires = [ eldoc emacs flymake jsonrpc project xref ];
meta = {
homepage = "https://elpa.gnu.org/packages/eglot.html";
license = lib.licenses.free;
@ -1130,10 +1133,10 @@
elpaBuild {
pname = "emms";
ename = "emms";
version = "6.2";
version = "6.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/emms-6.2.tar";
sha256 = "0d95sjrh9vpl41vz26y8clgji987z15lj4ky2kr9yrl0zpa8yv35";
url = "https://elpa.gnu.org/packages/emms-6.3.tar";
sha256 = "12cfq503li0gcqmm5bmqz8yjvfdif5xvz0l9vx3g5jl6ljygwgmf";
};
packageRequires = [ cl-lib seq ];
meta = {
@ -1746,10 +1749,10 @@
elpaBuild {
pname = "ivy-posframe";
ename = "ivy-posframe";
version = "0.5.3";
version = "0.5.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.3.el";
sha256 = "03ydfb155p5lak7nw4s79ab9zadwsjw1zggzwxgnlydsqdqbr6l6";
url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.5.tar";
sha256 = "184730grclxmlw6nfs41d4g6fvz9c6xnclvwgqx1ii0xm7p9xy95";
};
packageRequires = [ emacs ivy posframe ];
meta = {
@ -1791,10 +1794,10 @@
elpaBuild {
pname = "js2-mode";
ename = "js2-mode";
version = "20190219";
version = "20201220";
src = fetchurl {
url = "https://elpa.gnu.org/packages/js2-mode-20190219.tar";
sha256 = "0jgqs7cwykw5ihdq9wp5qc05y6br9gsyfiylqhjq43z59673chcc";
url = "https://elpa.gnu.org/packages/js2-mode-20201220.tar";
sha256 = "0zdrp8lap1ijrmsn9jsnvm44b6vxlgh9vcla5ysh1ga95zkjxrwm";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1847,6 +1850,21 @@
license = lib.licenses.free;
};
}) {};
kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }:
elpaBuild {
pname = "kiwix";
ename = "kiwix";
version = "1.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/kiwix-1.0.1.tar";
sha256 = "1dly6pilf71hq3mra9kc63i6iynzkxjmp9gwy0rhnvhq4b4qr01d";
};
packageRequires = [ emacs request ];
meta = {
homepage = "https://elpa.gnu.org/packages/kiwix.html";
license = lib.licenses.free;
};
}) {};
kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "kmb";
@ -2430,10 +2448,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.4";
version = "9.4.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.4.tar";
sha256 = "1awkrh3y90q7c0as3327rqj0zylf5cpjzr1pyvbzymli16irhwb6";
url = "https://elpa.gnu.org/packages/org-9.4.4.tar";
sha256 = "05ma8n6hr10323d85ay8ai0xrpc9q2m93n8avqh7j9fmmb3bhr0b";
};
packageRequires = [];
meta = {
@ -2460,10 +2478,10 @@
elpaBuild {
pname = "org-translate";
ename = "org-translate";
version = "0.1.2";
version = "0.1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-translate-0.1.2.el";
sha256 = "1087h6l5d8946dl4bg7g7is5pwc6004l4k9i2qcki4ahglvzdkz4";
url = "https://elpa.gnu.org/packages/org-translate-0.1.3.el";
sha256 = "0m52vv1961kf8f1gw8c4n02hxcvhdw3wgzmcxvjcdijfnjkarm33";
};
packageRequires = [ emacs org ];
meta = {
@ -2670,10 +2688,10 @@
elpaBuild {
pname = "project";
ename = "project";
version = "0.5.2";
version = "0.5.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/project-0.5.2.el";
sha256 = "181hls4phhj8kgpfcky6h0mgzpl9xj616abvcvx8mrn4nmpyh655";
url = "https://elpa.gnu.org/packages/project-0.5.3.el";
sha256 = "0cpf69m41h8gfcqnq72h11925zdk35b7hw7bfy83xm83xwp12rxx";
};
packageRequires = [ emacs xref ];
meta = {
@ -2715,10 +2733,10 @@
elpaBuild {
pname = "python";
ename = "python";
version = "0.27";
version = "0.27.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/python-0.27.el";
sha256 = "03k527p1jp47hmm7rmld3cn9dls1smyspvgii2xn95jfvrp9klvv";
url = "https://elpa.gnu.org/packages/python-0.27.1.el";
sha256 = "0jygl2w8x73v22w0rzq75i2hnm3f46dzgg5x1ckz720nznvwwkka";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -3040,10 +3058,10 @@
elpaBuild {
pname = "rt-liberation";
ename = "rt-liberation";
version = "1.31";
version = "2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rt-liberation-1.31.tar";
sha256 = "0qqqqwdkb0h8137rqsr08179skl1475cg4hl7a987rmccys0j83c";
url = "https://elpa.gnu.org/packages/rt-liberation-2.1.tar";
sha256 = "1ahl1ys72rvqs2bf9zv9648h65fx0283ibqlk1b8ayahc04w6qbl";
};
packageRequires = [];
meta = {
@ -3076,10 +3094,10 @@
elpaBuild {
pname = "scanner";
ename = "scanner";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/scanner-0.1.tar";
sha256 = "0hv4w7yzfdnz8vrfhw6i6agj9hs09vzsqr63nrp6dd93q0gk71mw";
url = "https://elpa.gnu.org/packages/scanner-0.2.tar";
sha256 = "1nbfpgndjkv7mr81bxy58k4y13lc4cidyz9mbwh7433r8rfhymb5";
};
packageRequires = [ dash emacs ];
meta = {
@ -3147,21 +3165,6 @@
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";
@ -3545,10 +3548,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.4.4.4";
version = "2.5.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.4.4.4.tar";
sha256 = "1f2d02xz3kpy50186wcy688lx76dv0gmrbkj2qdvifcwhyc26sz8";
url = "https://elpa.gnu.org/packages/tramp-2.5.0.tar";
sha256 = "1jpnqyk108nksaym2b9v243y5zkpr4px9d070wsb9cwm3xrcd8rh";
};
packageRequires = [ emacs ];
meta = {
@ -3590,10 +3593,10 @@
elpaBuild {
pname = "trie";
ename = "trie";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/trie-0.4.el";
sha256 = "0869fh3bghxil94wd9vgbb5bk1hx2qkh75vbvp0psmcima8dgzgw";
url = "https://elpa.gnu.org/packages/trie-0.5.tar";
sha256 = "1qbzxw7h3p3k3r3fzq66pj223vjiw20dvaljkb8w3r5q16fnav3p";
};
packageRequires = [ heap tNFA ];
meta = {
@ -3704,10 +3707,10 @@
elpaBuild {
pname = "vcard";
ename = "vcard";
version = "0.1";
version = "0.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vcard-0.1.tar";
sha256 = "1awcm2s292r2nkyz5bwjaga46jsh5rn92469wrg1ag843mlyxbd0";
url = "https://elpa.gnu.org/packages/vcard-0.2.1.tar";
sha256 = "0nfrh1mz2h7h259kf7sj13z30kmjywfvs83ax5qjkfwxhqm03abf";
};
packageRequires = [ emacs ];
meta = {
@ -4074,10 +4077,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-1.0.3.el";
sha256 = "1r531gl73y1br8g4n77gxbyj26yiaw7snjad21fgs5m80cka8fi3";
url = "https://elpa.gnu.org/packages/xref-1.0.4.el";
sha256 = "0hkm59qqlsfw3w9ws9xhpmmz30ylifmh05a00ba58zvv1kz04x1g";
};
packageRequires = [ emacs ];
meta = {

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

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

4319
pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/graphics/drawio/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "13.9.9";
version = "14.1.5";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
hash = "sha256-+rNbLHpkFnvM7gDFbZ9AItPIA2IVTmscz+gTXF8riIY=";
hash = "sha256-dM/DGtUDnJBD4Cfhm/zbxfgBhUcIlEzlF4z3cmQuW14=";
};
nativeBuildInputs = [

25
pkgs/applications/misc/ctodo/default.nix
View File

@ -1,25 +1,24 @@
{ stdenv, cmake, fetchurl, ncurses, readline }:
{ stdenv, fetchFromGitHub, cmake, ncurses, readline }:
stdenv.mkDerivation rec {
pname = "ctodo";
version = "1.3";
src = fetchurl {
url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz";
sha256 = "1k3raigcgpwa0h8zkv5x9rycnn2iqkb9qim4q9ydqy9wbv3m32jb";
src = fetchFromGitHub {
owner = "Acolarh";
repo = pname;
rev = "v${version}";
sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna";
};
buildInputs = [ stdenv cmake ncurses readline ];
nativeBuildInputs = [ cmake ];
buildInputs = [ ncurses readline ];
configurePhase = ''
cmake -DCMAKE_INSTALL_PREFIX=$out .
'';
meta = {
meta = with stdenv.lib; {
homepage = "http://ctodo.apakoh.dk/";
description = "A simple ncurses-based task list manager";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = stdenv.lib.platforms.linux;
license = licenses.mit;
maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.unix;
};
}

1091
pkgs/applications/misc/elfx86exts/cargo-lock.patch Normal file
View File

File diff suppressed because it is too large Load Diff

30
pkgs/applications/misc/elfx86exts/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "elfx86exts";
version = "0.4.3";
src = fetchFromGitHub {
owner = "pkgw";
repo = pname;
rev = "${pname}@${version}";
sha256 = "1j9ca2lyxjsrf0rsfv83xi53vj6jz5nb76xibh367brcsc26mvd6";
};
cargoSha256 = "1dfhx40jr5llqa554wifd920mqdbm8s5fns98m6vcqdjxzan4nr2";
meta = with stdenv.lib; {
description = "Decode x86 binaries and print out which instruction set extensions they use.";
longDescription = ''
Disassemble a binary containing x86 instructions and print out which extensions it uses.
Despite the utterly misleading name, this tool supports ELF and MachO binaries, and
perhaps PE-format ones as well. (It used to be more limited.)
'';
homepage = "https://github.com/pkgw/elfx86exts";
maintainers = with maintainers; [ rmcgibbo ];
license = with licenses; [ mit ];
};
}

7
pkgs/applications/misc/printrun/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, python27Packages, fetchFromGitHub }:
python27Packages.buildPythonApplication rec {
name = "printrun-20150310";
pname = "printrun";
version = "1.6.0";
src = fetchFromGitHub {
owner = "kliment";
repo = "Printrun";
rev = name;
sha256 = "09ijv8h4k5h15swg64s7igamvynawz7gdi7hiymzrzywdvr0zwsa";
rev = "${pname}-${version}";
sha256 = "0nhcx1bi1hals0a6d6994y0kcwsfqx3hplwbmn9136hgrplg0l2l";
};
propagatedBuildInputs = with python27Packages; [

4
pkgs/applications/networking/msmtp/default.nix
View File

@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "msmtp";
version = "1.8.13";
version = "1.8.14";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
sha256 = "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd";
sha256 = "1W8GXXEUhunCNGGFFaAqSKSNq0BRs08+EI++y2+3c7Q=";
};
patches = [

4
pkgs/applications/science/electronics/nanovna-saver/default.nix
View File

@ -2,7 +2,7 @@
, qtbase }:
let
version = "0.3.7";
version = "0.3.8";
pname = "nanovna-saver";
in mkDerivationWith python3Packages.buildPythonApplication {
@ -12,7 +12,7 @@ in mkDerivationWith python3Packages.buildPythonApplication {
owner = "NanoVNA-Saver";
repo = pname;
rev = "v${version}";
sha256 = "0c22ckyypg91gfb2sdc684msw28nnb6r8cq3b362gafvv00a35mi";
sha256 = "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv";
};
nativeBuildInputs = [ wrapQtAppsHook ];

57
pkgs/applications/window-managers/wio/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ stdenv, fetchgit
, meson
, ninja
, pkg-config
, alacritty
, cage
, cairo
, libxkbcommon
, udev
, wayland
, wayland-protocols
, wlroots
, xwayland
, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "wio";
version = "unstable-2020-11-02";
src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/wio";
rev = "31b742e473b15a2087be740d1de28bc2afd47a4d";
sha256 = "1vpvlahv6dmr7vfb11p5cc5ds2y2vfvcb877nkqx18yin6pg357l";
};
nativeBuildInputs = [ meson ninja pkg-config makeWrapper ];
buildInputs = [
cairo
libxkbcommon
udev
wayland
wayland-protocols
wlroots
xwayland
];
postInstall = ''
wrapProgram $out/bin/wio \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ alacritty cage ]}"
'';
meta = with stdenv.lib; {
description = "That Plan 9 feel, for Wayland";
longDescription = ''
Wio is a Wayland compositor for Linux and FreeBSD which has a similar look
and feel to plan9's rio.
'';
homepage = "https://wio-project.org/";
license = licenses.mit;
platforms = with platforms; linux;
maintainers = with maintainers; [ AndersonTorres ];
};
passthru.providedSessions = [ "wio" ];
}
# TODO: factor Linux-specific options

2
pkgs/development/haskell-modules/non-hackage-packages.nix
View File

@ -9,6 +9,8 @@ self: super: {
dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { };
ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { };
# https://github.com/channable/vaultenv/issues/1
vaultenv = self.callPackage ../tools/haskell/vaultenv { };

4
pkgs/development/libraries/aml/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aml";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
sha256 = "1pmiflkd9idnf6p0rnmccqqlj87k8crz9ixpx6rix671vnpk0xzi";
sha256 = "0mxmzlhiv88hm4sf8kyawyrml8qy1xis019hdyb5skl9g95z9yyf";
};
nativeBuildInputs = [ meson pkg-config ninja ];

9
pkgs/development/libraries/ffmpegthumbnailer/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkgconfig, libjpeg
{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg
}:
stdenv.mkDerivation rec {
@ -12,13 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ffmpeg_3 libpng libjpeg ];
cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ];
meta = with stdenv.lib; {
homepage = "https://github.com/dirkvdb/ffmpegthumbnailer";
description = "A lightweight video thumbnailer";
longDescription = "FFmpegthumbnailer is a lightweight video
longDescription = "FFmpegthumbnailer is a lightweight video
thumbnailer that can be used by file managers to create thumbnails
for your video files. The thumbnailer uses ffmpeg o decode frames
from the video files, so supported videoformats depend on the
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
The only dependencies are ffmpeg and libpng.
";
platforms = platforms.linux;
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = [ maintainers.jagajaga ];
};

9
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@ -51,7 +51,7 @@ let
patches = {
qtbase =
optionals stdenv.isDarwin [
[
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
./qtbase.patch.d/0002-qtbase-mac.patch
./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
@ -59,8 +59,7 @@ let
# Patch framework detection to support X.framework/X.tbd,
# extending the current support for X.framework/X.
./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
]
++ [
./qtbase.patch.d/0003-qtbase-mkspecs.patch
./qtbase.patch.d/0004-qtbase-replace-libdir.patch
./qtbase.patch.d/0005-qtbase-cmake.patch
@ -97,7 +96,7 @@ let
stripLen = 1;
extraPrefix = "src/3rdparty/";
})
] ++ optionals stdenv.isDarwin [
./qtwebengine-darwin-no-platform-check.patch
./qtwebengine-darwin-fix-failed-static-assertion.patch
];
@ -108,7 +107,7 @@ let
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
})
./qtwebkit.patch
] ++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch
];

30
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
View File

@ -1,18 +1,5 @@
From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:34:00 -0500
Subject: [PATCH 01/12] qtbase-mkspecs-mac
---
mkspecs/common/mac.conf | 2 +-
mkspecs/features/mac/default_post.prf | 202 ----------------------------------
mkspecs/features/mac/default_pre.prf | 58 ----------
mkspecs/features/mac/sdk.mk | 25 -----
mkspecs/features/mac/sdk.prf | 61 ----------
5 files changed, 1 insertion(+), 347 deletions(-)
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index b77494ec9b..470c38e772 100644
index b77494ec..470c38e7 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \
@ -25,7 +12,7 @@ index b77494ec9b..470c38e772 100644
QMAKE_LFLAGS_REL_RPATH =
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 993f4d56a9..b80ec1e801 100644
index d052808c..b80ec1e8 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -68,208 +68,6 @@ qt {
@ -161,7 +148,7 @@ index 993f4d56a9..b80ec1e801 100644
- -isysroot$$xcodeSDKInfo(Path, $$sdk)
- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \
- -Xarch_$${arch} \
- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk)
- -isysroot$$xcodeSDKInfo(Path, $$sdk)
-
- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})
- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})
@ -182,7 +169,7 @@ index 993f4d56a9..b80ec1e801 100644
- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag
- QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
- }
-
- # Enable precompiled headers for multiple architectures
@ -238,7 +225,7 @@ index 993f4d56a9..b80ec1e801 100644
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
generate_xcode_project.target = xcodeproj
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index e3534561a5..3b01424e67 100644
index e3534561..3b01424e 100644
--- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf
@@ -1,60 +1,2 @@
@ -303,7 +290,7 @@ index e3534561a5..3b01424e67 100644
-xcode_copy_phase_strip_setting.value = NO
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
index c40f58c987..e69de29bb2 100644
index c40f58c9..e69de29b 100644
--- a/mkspecs/features/mac/sdk.mk
+++ b/mkspecs/features/mac/sdk.mk
@@ -1,25 +0,0 @@
@ -333,7 +320,7 @@ index c40f58c987..e69de29bb2 100644
- endif
-endif
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 3a9c2778bb..e69de29bb2 100644
index 3a9c2778..e69de29b 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -1,61 +0,0 @@
@ -398,6 +385,3 @@ index 3a9c2778bb..e69de29bb2 100644
- $$tool = $$sysrooted $$member(value, 1, -1)
- cache($$tool_variable, set stash, $$tool)
-}
--
2.23.GIT

16
pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch
View File

@ -1,5 +1,5 @@
diff --git a/configure.pri b/configure.pri
index 897bea54..6f834c20 100644
index 897bea540..6f834c202 100644
--- a/configure.pri
+++ b/configure.pri
@@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) {
@ -12,7 +12,7 @@ index 897bea54..6f834c20 100644
}
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
index 35eb6b89..7eed640a 100644
index 35eb6b89c..7eed640a5 100644
--- a/mkspecs/features/platform.prf
+++ b/mkspecs/features/platform.prf
@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) {
@ -43,10 +43,10 @@ index 35eb6b89..7eed640a 100644
isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) {
skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.")
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index 4426901c..3aa6057e 100644
index 7b77a8bf7..0e1284ee4 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -5,16 +5,16 @@ load(functions)
@@ -5,7 +5,7 @@ load(functions)
# otherwise query for it.
QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
isEmpty(QMAKE_MAC_SDK_VERSION) {
@ -55,17 +55,15 @@ index 4426901c..3aa6057e 100644
isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
}
@@ -14,11 +14,6 @@ isEmpty(QMAKE_MAC_SDK_VERSION) {
QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1)
QMAKE_CLANG_DIR = "/usr"
-QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
-!isEmpty(QMAKE_CLANG_PATH) {
- clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
- exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
-}
+# QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
+# !isEmpty(QMAKE_CLANG_PATH) {
+# clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
+# exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
+# }
QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++"
message("Using clang++ from $${QMAKE_CLANG_PATH}")

6
pkgs/development/ocaml-modules/jingoo/default.nix
View File

@ -3,7 +3,9 @@
buildDunePackage rec {
pname = "jingoo";
version = "1.4.1";
version = "1.4.2";
useDune2 = true;
minimumOCamlVersion = "4.04";
@ -11,7 +13,7 @@ buildDunePackage rec {
owner = "tategakibunko";
repo = "jingoo";
rev = "v${version}";
sha256 = "16wzggwi3ri13v93mjk8w7zxwp65qmi1rnng2kpk9vffx5g1kv6f";
sha256 = "0q947aik4i4z5wjllhwlkxh60qczwgra21yyrrzwhi9y5bnf8346";
};
buildInputs = [ menhir ];

2
pkgs/development/ocaml-modules/mirage-vnetif/default.nix
View File

@ -35,6 +35,6 @@ buildDunePackage rec {
description = "Virtual network interface and software switch for Mirage";
homepage = "https://github.com/mirage/${pname}";
license = licenses.isc;
mantainers = [ maintainers.sternenseemann ];
maintainers = [ maintainers.sternenseemann ];
};
}

4
pkgs/development/python-modules/boto3/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.16.46"; # N.B: if you change this, change botocore too
version = "1.16.47"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
sha256 = "0qlcmzpgmcp9cwrwni750yw9jlhzm407fs428bwkpxnhsxpix6fn";
sha256 = "sha256-BXlrpsZfeSFOphvsrlEm1ckk7tihGHS8VTbWEd6rvkc=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

4
pkgs/development/python-modules/botocore/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.19.46"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.19.47"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-hcppFa1Ucef2zRsAYQt0YB0pcMv46bG/JVaXFUz2IaM=";
sha256 = "sha256-FVhKhtbLH5TqeF6NPJj67/jd0BBTVuHBBhGNmsEvqJE=";
};
propagatedBuildInputs = [

30
pkgs/development/python-modules/cfn-lint/default.nix
View File

@ -14,25 +14,25 @@
, requests
, setuptools
, six
# Test inputs
, pytestCheckHook
, mock
, pydot
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "cfn-lint";
version = "0.35.1";
version = "0.42.0";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = "cfn-python-lint";
repo = "cfn-python-lint";
rev = "v${version}";
sha256 = "1ajb0412hw9fg9m4b3xbpfbp8cixmnpjxrkaks6k749xinzsv7qk";
sha256 = "0cqpq7pxpslpd7am6mp6nmwhsb2p2a5lq3hjjxi8imv3wv7zql98";
};
postPatch = ''
substituteInPlace setup.py --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"'
substituteInPlace setup.py \
--replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"'
'';
propagatedBuildInputs = [
@ -48,6 +48,21 @@ buildPythonPackage rec {
six
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ];
checkInputs = [
mock
pydot
pytestCheckHook
];
preCheck = ''
export PATH=$out/bin:$PATH
'';
disabledTests = [
# requires git directory
"test_update_docs"
];
pythonImportsCheck = [
"cfnlint"
"cfnlint.conditions"
@ -64,9 +79,6 @@ buildPythonPackage rec {
"cfnlint.transform"
];
checkInputs = [ pytestCheckHook mock pydot ];
preCheck = "export PATH=$out/bin:$PATH";
meta = with lib; {
description = "Checks cloudformation for practices and behaviour that could potentially be improved";
homepage = "https://github.com/aws-cloudformation/cfn-python-lint";

4
pkgs/development/python-modules/channels/default.nix
View File

@ -3,11 +3,11 @@
}:
buildPythonPackage rec {
pname = "channels";
version = "3.0.2";
version = "3.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "f50a6e79757a64c1e45e95e144a2ac5f1e99ee44a0718ab182c501f5e5abd268";
sha256 = "056b72e51080a517a0f33a0a30003e03833b551d75394d6636c885d4edb8188f";
};
# Files are missing in the distribution

27
pkgs/development/python-modules/confuse/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ buildPythonPackage
, enum34
, fetchPypi
, isPy27
, lib
, pathlib
, pyyaml
}:
buildPythonPackage rec {
pname = "confuse";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kvwEUcbiwnMqw2PQ9Z1+pgir3b7QYt2o6Y6ajJhs5GQ=";
};
propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ;
meta = with lib; {
description = "Confuse is a configuration library for Python that uses YAML.";
homepage = "https://github.com/beetbox/confuse";
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault ];
};
}

41
pkgs/development/python-modules/dnachisel/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, biopython
, docopt
, flametree
, numpy
, proglog
, python-codon-tables
}:
buildPythonPackage rec {
pname = "dnachisel";
version = "3.2.5";
src = fetchPypi {
inherit pname version;
sha256 = "35301c5eda0baca5902403504e0b5a22eb65da92c2bbd23199d95c4a6bf0ef37";
};
propagatedBuildInputs = [
biopython
docopt
flametree
numpy
proglog
python-codon-tables
];
# no tests in tarball
doCheck = false;
pythonImportsCheck = [ "dnachisel" ];
meta = with lib; {
homepage = "https://github.com/Edinburgh-Genome-Foundry/DnaChisel";
description = "Optimize DNA sequences under constraints";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
};
}

26
pkgs/development/python-modules/flametree/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "flametree";
version = "0.1.11";
src = fetchPypi {
inherit pname version;
sha256 = "c8eb81dea8c7f8261a2aa03d2bac98b1d21ebceec9c67efaac423f7c1b4fe061";
};
# no tests in tarball
doCheck = false;
pythonImportsCheck = [ "flametree" ];
meta = with lib; {
homepage = "https://github.com/Edinburgh-Genome-Foundry/Flametree";
description = "Python file and zip operations made easy";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
};
}

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

@ -0,0 +1,44 @@
{ buildPythonPackage
, enum34
, fetchpatch
, fetchPypi
, isPy27
, lib
, mutagen
, six
}:
buildPythonPackage rec {
pname = "mediafile";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-o/tSAHu8FTr6LZoMHvegr9uCZovNLHS9KkP2U9y4uko=";
};
propagatedBuildInputs = [ mutagen six ] ++ lib.optional isPy27 enum34;
# NB: Remove in the next release
patches = [
(fetchpatch {
url = "https://github.com/beetbox/mediafile/commit/0ff753d493a1a7f406cb3378545ffe2c85a9afa3.patch";
sha256 = "sha256-AQ7YedoYPmLqt4a/odgghIKOY61i9YfA0To0RVFqlk8=";
})
(fetchpatch {
url = "https://github.com/beetbox/mediafile/commit/f0fb4e5111d9dfaa3b38d196ec41fcd237d97953.patch";
sha256 = "sha256-5O6RiAqkQEz3Bvqjwwv/LOS33nSIBnT2H/vasGGVrpI=";
})
(fetchpatch {
url = "https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4.patch";
sha256 = "sha256-SMH0XhCaKLDNB4M8VmZWfGuuelfY5xladZyQYtXtP18=";
})
];
meta = with lib; {
description = "MediaFile is a simple interface to the metadata tags for many audio file formats.";
homepage = "https://github.com/beetbox/mediafile";
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault ];
};
}

37
pkgs/development/python-modules/opensensemap-api/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, aiohttp
, async-timeout
}:
buildPythonPackage rec {
pname = "opensensemap-api";
version = "0.1.5";
src = fetchPypi {
inherit pname version;
sha256 = "1f3iqwl8ynvrkdd961v2hjsbldwbr217pv5pay2m5f0m974bhblx";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
# no tests are present
doCheck = false;
pythonImportsCheck = [ "opensensemap_api" ];
meta = with lib; {
description = "OpenSenseMap API Python client";
longDescription = ''
Python Client for interacting with the openSenseMap API. All
available information from the sensor can be retrieved.
'';
homepage = "https://github.com/home-assistant-ecosystem/python-opensensemap-api";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

27
pkgs/development/python-modules/python-codon-tables/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "python-codon-tables";
version = "0.1.10";
src = fetchPypi {
pname = "python_codon_tables";
inherit version;
sha256 = "265beac928cbb77c6745bc728471adc7ffef933b794be303d272ecb9ad37d3d4";
};
# no tests in tarball
doCheck = false;
pythonImportsCheck = [ "python_codon_tables" ];
meta = with lib; {
homepage = "https://github.com/Edinburgh-Genome-Foundry/codon-usage-tables";
description = "Codon Usage Tables for Python, from kazusa.or.jp";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
};
}

36
pkgs/development/python-modules/python-opendata-transport/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, aiohttp
, async-timeout
, urllib3
}:
buildPythonPackage rec {
pname = "python-opendata-transport";
version = "0.2.1";
src = fetchPypi {
pname = "python_opendata_transport";
inherit version;
sha256 = "0pxs9zqk00vn1s74cx1416mqmixrr74wb0jb0j6b1c3xpvzlfbks";
};
propagatedBuildInputs = [
aiohttp
async-timeout
urllib3
];
# no tests are present
doCheck = false;
pythonImportsCheck = [ "opendata_transport" ];
meta = with lib; {
description = "Python client for interacting with transport.opendata.ch";
homepage = "https://github.com/home-assistant-ecosystem/python-opendata-transport";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/misc/drivers/utsushi/default.nix
View File

@ -12,13 +12,13 @@ let
'';
in stdenv.mkDerivation rec {
pname = "utsushi";
version = "unstable-2020-11-10";
version = "unstable-2021-01-01";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "04700043e2d16062eb8bd27f4efff3024f387d32";
sha256 = "0rxv5n0985d414i6hwichsn7hybwgwsimpy5s4hmcsvxqcpks4li";
rev = "1646d7d301f3d2aeb24930696688853fed5f0d43";
sha256 = "1g9m00qljhlw56h3hgfq67ywf4r92nl37m7x5mxa7ygaxc0dyb14";
};
nativeBuildInputs = [

4
pkgs/servers/home-assistant/component-packages.nix
View File

@ -586,7 +586,7 @@
"opengarage" = ps: with ps; [ ]; # missing inputs: open-garage
"openhardwaremonitor" = ps: with ps; [ ];
"openhome" = ps: with ps; [ ]; # missing inputs: openhomedevice
"opensensemap" = ps: with ps; [ ]; # missing inputs: opensensemap-api
"opensensemap" = ps: with ps; [ opensensemap-api ];
"opensky" = ps: with ps; [ ];
"opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw
"openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv
@ -796,7 +796,7 @@
"supla" = ps: with ps; [ ]; # missing inputs: asyncpysupla
"surepetcare" = ps: with ps; [ ]; # missing inputs: surepy
"swiss_hydrological_data" = ps: with ps; [ ]; # missing inputs: swisshydrodata
"swiss_public_transport" = ps: with ps; [ ]; # missing inputs: python_opendata_transport
"swiss_public_transport" = ps: with ps; [ python-opendata-transport ];
"swisscom" = ps: with ps; [ ];
"switch" = ps: with ps; [ ];
"switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@ -5,15 +5,15 @@
, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2020-12-31";
version = "2021-01-01";
pname = "oh-my-zsh";
rev = "0e7c81316cab30d28d362f69ddc72be83029ac34";
rev = "0f6aa0182c8d13a2ff909b650d790f83373dc412";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "cdI0R7F41/UJV0ur8iTH0DQw+L+YvaCVmyGTJEMZr04=";
sha256 = "HZmomTPS9k1aKgSibdZfF6BxTsLAYTmBx9Gx5T3Circ=";
};
installPhase = ''

4
pkgs/tools/admin/awscli/default.nix
View File

@ -28,11 +28,11 @@ let
in with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.18.206"; # N.B: if you change this, change botocore to a matching version too
version = "1.18.207"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-+BEiIuhZ0L8WXNN0hkOMVH2eTojyAiuj3zahuiGkx7I=";
sha256 = "sha256-E6emaaPxIgYk5Zwh3oBHUrbye43/mGjzvVeMx/Re33w=";
};
postPatch = ''

37
pkgs/tools/graphics/ldgallery/compiler/default.nix Normal file
View File

@ -0,0 +1,37 @@
# generated with cabal2nix by ./generate.sh
{ mkDerivation, aeson, base, cmdargs, containers, data-ordlist
, directory, fetchgit, filepath, Glob, hpack, parallel-io, process
, safe, stdenv, text, time, yaml
}:
mkDerivation {
pname = "ldgallery-compiler";
version = "2.0";
src = fetchgit {
url = "https://github.com/pacien/ldgallery.git";
sha256 = "1a82wy6ns1434gdba2l04crvr5waf03y02bappcxqci2cfb1cznz";
rev = "e93f7b1eb84c083d67567115284c0002a3a7d5fc";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/compiler; echo source root reset to $sourceRoot";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base cmdargs containers data-ordlist directory filepath Glob
parallel-io process safe text time yaml
];
libraryToolDepends = [ hpack ];
executableHaskellDepends = [
aeson base cmdargs containers data-ordlist directory filepath Glob
parallel-io process safe text time yaml
];
testHaskellDepends = [
aeson base cmdargs containers data-ordlist directory filepath Glob
parallel-io process safe text time yaml
];
prePatch = "hpack";
homepage = "https://ldgallery.pacien.org";
description = "A static generator which turns a collection of tagged pictures into a searchable web gallery";
license = stdenv.lib.licenses.agpl3;
maintainers = with stdenv.lib.maintainers; [ pacien ];
}

19
pkgs/tools/graphics/ldgallery/compiler/generate.sh Executable file
View File

@ -0,0 +1,19 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p cabal2nix
set -euo pipefail
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates the nix file for the ldgallery-compiler package."
echo "Usage: $0 <git release tag>"
exit 1
fi
echo "# generated with cabal2nix by ./generate.sh" > default.nix
cabal2nix \
--maintainer pacien \
--subpath compiler \
--revision $1 \
"https://github.com/pacien/ldgallery.git" \
>> default.nix

53
pkgs/tools/graphics/ldgallery/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick7 }:
with lib;
with haskell.lib;
let
ldgallery-viewer = pkgs.callPackage ./viewer { };
inherit (haskellPackages) ldgallery-compiler;
in
# making sure that the versions of the compiler and viewer parts are in sync
assert ldgallery-compiler.version == versions.majorMinor ldgallery-viewer.version;
justStaticExecutables (overrideCabal ldgallery-compiler (oldAttrs: {
pname = "ldgallery"; # bundled viewer + compiler
buildTools = (oldAttrs.buildTools or []) ++ [ makeWrapper pandoc ];
prePatch = ''
# add viewer dist to data
ln -s "${ldgallery-viewer}/share/ldgallery/viewer" "data/"
${oldAttrs.prePatch or ""}
'';
postInstall = ''
${oldAttrs.postInstall or ""}
# wrapper for runtime dependencies registration
wrapProgram "$out/bin/ldgallery" \
--prefix PATH : ${lib.makeBinPath [ imagemagick7 ]}
# bash completion
mkdir -p "$out/share/bash-completion/completions"
"$out/bin/ldgallery" \
--help=bash \
> "$out/share/bash-completion/completions/ldgallery"
# man pages
mkdir -p $out/share/man/man{1,7}
ln -s ${ldgallery-viewer}/share/man/man7/* "$out/share/man/man7/"
pandoc --standalone --to man \
"../ldgallery-quickstart.7.md" \
--output "$out/share/man/man7/ldgallery-quickstart.7"
pandoc --standalone --to man \
"ldgallery.1.md" \
--output "$out/share/man/man1/ldgallery.1"
'';
# other package metadata (maintainer, description, license, ...)
# are inherited from the compiler package
}))

53
pkgs/tools/graphics/ldgallery/viewer/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc }:
with lib;
let
# Note for maintainers:
# * keep version in sync with the ldgallery compiler
# * regenerate node-*.nix with `./generate.sh <git release tag>`
sourcePkg = fetchFromGitHub {
owner = "pacien";
repo = "ldgallery";
rev = "v2.0";
sha256 = "1a82wy6ns1434gdba2l04crvr5waf03y02bappcxqci2cfb1cznz";
};
nodePackages = import ./node-composition.nix {
inherit pkgs;
inherit (stdenv.hostPlatform) system;
# some native node dependencies still require NodeJS 12 with Python 2
nodejs = nodejs-12_x;
};
nodePkg = nodePackages.package.override {
src = "${sourcePkg}/viewer";
postInstall = "npm run build";
};
in
# making sure that the source and the node package are in sync
assert versions.majorMinor nodePkg.version == removePrefix "v" sourcePkg.rev;
stdenv.mkDerivation {
pname = nodePkg.packageName;
version = nodePkg.version;
src = nodePkg;
buildInputs = [ pandoc ];
installPhase = ''
mkdir -p "$out/share/ldgallery"
cp -rp "lib/node_modules/ldgallery-viewer/dist" \
"$out/share/ldgallery/viewer/"
cp -rp "lib/node_modules/ldgallery-viewer/examples" \
"$out/share/ldgallery/viewer/"
mkdir -p "$out/share/man/man7"
pandoc --standalone --to man \
"lib/node_modules/ldgallery-viewer/ldgallery-viewer.7.md" \
--output "$out/share/man/man7/ldgallery-viewer.7"
'';
}

34
pkgs/tools/graphics/ldgallery/viewer/generate.sh Executable file
View File

@ -0,0 +1,34 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix
# TODO: merge with other node packages in nixpkgs/pkgs/development/node-packages once
# * support for npm projects in sub-directories is added to node2nix:
# https://github.com/svanderburg/node2nix/issues/177
# * we find a way to enable development dependencies for some of the packages
set -euo pipefail
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates the node composition and package nix files for the ldgallery-viewer package."
echo "Usage: $0 <git release tag>"
exit 1
fi
wget https://github.com/pacien/ldgallery/raw/$1/viewer/package.json
wget https://github.com/pacien/ldgallery/raw/$1/viewer/package-lock.json
# Development dependencies are required for this Vue application to build
node2nix \
--node-env ../../../../development/node-packages/node-env.nix \
--development \
--input ./package.json \
--lock ./package-lock.json \
--output node-packages.nix \
--composition node-composition.nix
rm package.json package-lock.json
# Temporary quickfix to accomodate for the util-linux package rename.
# See https://github.com/svanderburg/node2nix/issues/213
git restore :/pkgs/development/node-packages/node-env.nix
sed -i 's/utillinux/util-linux/g' node-composition.nix

17
pkgs/tools/graphics/ldgallery/viewer/node-composition.nix Normal file
View File

@ -0,0 +1,17 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}

13269
pkgs/tools/graphics/ldgallery/viewer/node-packages.nix generated Normal file
View File

File diff suppressed because it is too large Load Diff

13
pkgs/tools/package-management/nix/default.nix
View File

@ -33,7 +33,6 @@ common =
version = lib.getVersion name;
is24 = lib.versionAtLeast version "2.4pre";
isExactly24 = lib.versionAtLeast version "2.4" && lib.versionOlder version "2.4";
VERSION_SUFFIX = suffix;
@ -93,9 +92,15 @@ common =
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
''}
'' +
# For Nix 2.4, patch around an issue where the Nix configure step pulls in the
# build system's bash and other utilities when cross-compiling
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly24) ''
# On all versions before c9f51e87057652db0013289a95deffba495b35e7,
# released with 2.3.8, we need to patch around an issue where the Nix
# configure step pulls in the build system's bash and other utilities
# when cross-compiling.
lib.optionalString (
stdenv.buildPlatform != stdenv.hostPlatform &&
(lib.versionOlder "2.3.8" (lib.traceVal version) && !is24)
# The additional is24 condition is required as versionOlder doesn't understand nixUnstable version strings
) ''
mkdir tmp/
substitute corepkgs/config.nix.in tmp/config.nix.in \
--subst-var-by bash ${bash}/bin/bash \

1
pkgs/tools/text/groff/default.nix
View File

@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
"--with-gs=${ghostscript}/bin/gs"
] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"ac_cv_path_PERL=${buildPackages.perl}/bin/perl"
"gl_cv_func_signbit=yes"
];
makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

8
pkgs/top-level/all-packages.nix
View File

@ -5205,6 +5205,8 @@ in
ldc = callPackage ../development/compilers/ldc { };
ldgallery = callPackage ../tools/graphics/ldgallery { };
lbreakout2 = callPackage ../games/lbreakout2 { };
lefthook = gitAndTools.lefthook;
@ -21207,6 +21209,8 @@ in
elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { };
elfx86exts = callPackage ../applications/misc/elfx86exts { };
elinks = callPackage ../applications/networking/browsers/elinks {
autoreconfHook = buildPackages.autoreconfHook269;
};
@ -25054,6 +25058,8 @@ in
weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
wio = callPackage ../applications/window-managers/wio { };
whitebox-tools = callPackage ../applications/gis/whitebox-tools {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -29142,6 +29148,8 @@ in
gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc;
};
new-session-manager = callPackage ../applications/audio/new-session-manager { };
newlib = callPackage ../development/misc/newlib { };
newlibCross = callPackage ../development/misc/newlib {
stdenv = crossLibcStdenv;

4
pkgs/top-level/haxe-packages.nix
View File

@ -61,8 +61,8 @@ let
hxcpp = buildHaxeLib rec {
libname = "hxcpp";
version = "3.4.64";
sha256 = "04gyjm6wqmsm0ifcfkxmq1yv8xrfzys3z5ajqnvvjrnks807mw8q";
version = "4.1.15";
sha256 = "1ybxcvwi4655563fjjgy6xv5c78grjxzadmi3l1ghds48k1rh50p";
postFixup = ''
for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do
chmod +w "$f"

14
pkgs/top-level/python-packages.nix
View File

@ -1332,6 +1332,8 @@ in {
confluent-kafka = callPackage ../development/python-modules/confluent-kafka { };
confuse = callPackage ../development/python-modules/confuse { };
connexion = callPackage ../development/python-modules/connexion { };
consonance = callPackage ../development/python-modules/consonance { };
@ -1793,6 +1795,8 @@ in {
dm-sonnet = callPackage ../development/python-modules/dm-sonnet { };
dnachisel = callPackage ../development/python-modules/dnachisel { };
dnslib = callPackage ../development/python-modules/dnslib { };
dnspython = if isPy3k then
@ -2139,6 +2143,8 @@ in {
flaky = callPackage ../development/python-modules/flaky { };
flametree = callPackage ../development/python-modules/flametree { };
flammkuchen = callPackage ../development/python-modules/flammkuchen { };
flask-admin = callPackage ../development/python-modules/flask-admin { };
@ -3804,6 +3810,8 @@ in {
mechanize = callPackage ../development/python-modules/mechanize { };
mediafile = callPackage ../development/python-modules/mediafile { };
meinheld = callPackage ../development/python-modules/meinheld { };
meld3 = callPackage ../development/python-modules/meld3 { };
@ -4359,6 +4367,8 @@ in {
openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { };
opensensemap-api = callPackage ../development/python-modules/opensensemap-api { };
opentimestamps = callPackage ../development/python-modules/opentimestamps { };
opentracing = callPackage ../development/python-modules/opentracing { };
@ -4685,6 +4695,8 @@ in {
pysbd = callPackage ../development/python-modules/pysbd { };
python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };
python-csxcad = callPackage ../development/python-modules/python-csxcad { };
python-openems = callPackage ../development/python-modules/python-openems { };
@ -6044,6 +6056,8 @@ in {
python-olm = callPackage ../development/python-modules/python-olm { };
python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { };
python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; };
python-otr = callPackage ../development/python-modules/python-otr { };