mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Code Issues Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse source
This commit is contained in:
John Ericson 2020-04-18 15:40:49 -04:00
parent e3d50e5cb0 45b21b38a8
commit 1ea80c2cc3
55 changed files with 909 additions and 248 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/builders/images/appimagetools.xml
View file

@ -63,7 +63,7 @@ type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x)
appimageTools.wrapType2 { # or wrapType1
name = "patchwork"; <co xml:id='ex-appimageTools-wrapping-1' />
src = fetchurl { <co xml:id='ex-appimageTools-wrapping-2' />
url = https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage;
url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage";
sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s";
};
extraPkgs = pkgs: with pkgs; [ ]; <co xml:id='ex-appimageTools-wrapping-3' />

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

@ -412,7 +412,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
homepage = http://hgomersall.github.com/pyFFTW;
homepage = "http://hgomersall.github.com/pyFFTW";
license = with licenses; [ bsd2 bsd3 ];
maintainers = with maintainers; [ fridh ];
};

4
doc/languages-frameworks/ruby.xml
View file

@ -32,7 +32,7 @@ bundlerEnv rec {
meta = with lib; {
description = "A monitoring framework that aims to be simple, malleable, and scalable";
homepage = http://sensuapp.org/;
homepage = "http://sensuapp.org/";
license = with licenses; mit;
maintainers = with maintainers; [ theuni ];
platforms = platforms.unix;
@ -69,7 +69,7 @@ bundlerApp {
meta = with lib; {
description = "Tool and libraries for maintaining Ruby gems.";
homepage = https://github.com/nyarly/corundum;
homepage = "https://github.com/nyarly/corundum";
license = licenses.mit;
maintainers = [ maintainers.nyarly ];
platforms = platforms.unix;

4
doc/old/cross.txt
View file

@ -60,7 +60,7 @@ stdenv.mkDerivation {
name = "binutils-2.16.1-arm";
builder = ./builder.sh;
src = fetchurl {
url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2;
url = "http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2";
sha256 = "1ian3kwh2vg6hr3ymrv48s04gijs539vzrq62xr76bxbhbwnz2np";
};
inherit noSysDirs;
@ -84,7 +84,7 @@ stdenv.mkDerivation {
name = "linux-headers-2.6.13.1-arm";
builder = ./builder.sh;
src = fetchurl {
url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2;
url = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2";
sha256 = "12qxmc827fjhaz53kjy7vyrzsaqcg78amiqsb3qm20z26w705lma";
};
}

2
doc/release-notes.xml
View file

@ -190,7 +190,7 @@ preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";</programlisting>
The function <function>fetchurl</function> now has support for two different kinds of mirroring of files. First, it has support for <emphasis>content-addressable mirrors</emphasis>. For example, given the <function>fetchurl</function> call
<programlisting>
fetchurl {
url = http://releases.mozilla.org/<replaceable>...</replaceable>/firefox-2.0.0.6-source.tar.bz2;
url = "http://releases.mozilla.org/<replaceable>...</replaceable>/firefox-2.0.0.6-source.tar.bz2";
sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082";
}</programlisting>
<function>fetchurl</function> will first try to download this file from <link

2
doc/stdenv/stdenv.xml
View file

@ -14,7 +14,7 @@
stdenv.mkDerivation {
name = "libfoo-1.2.3";
src = fetchurl {
url = http://example.org/libfoo-1.2.3.tar.bz2;
url = "http://example.org/libfoo-1.2.3.tar.bz2";
sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m";
};
}</programlisting>

2
lib/licenses.nix
View file

@ -596,7 +596,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
psfl = spdx {
spdxId = "Python-2.0";
fullName = "Python Software Foundation License version 2";
#url = http://docs.python.org/license.html;
#url = "http://docs.python.org/license.html";
};
publicDomain = {

1
nixos/doc/manual/release-notes/rl-2009.xml
View file

@ -255,6 +255,7 @@ environment.systemPackages = [
# sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test
</programlisting>
</para>
</listitem>
</itemizedlist>
</section>

7
nixos/modules/security/acme.nix
View file

@ -343,7 +343,9 @@ in
# Test that existing cert is older than new cert
KEY=${spath}/certificates/${keyName}.key
KEY_CHANGED=no
if [ -e $KEY -a $KEY -nt key.pem ]; then
KEY_CHANGED=yes
cp -p ${spath}/certificates/${keyName}.key key.pem
cp -p ${spath}/certificates/${keyName}.crt fullchain.pem
cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem
@ -354,7 +356,10 @@ in
chmod ${fileMode} *.pem
chown '${data.user}:${data.group}' *.pem
${data.postRun}
if [ "$KEY_CHANGED" = "yes" ]; then
: # noop in case postRun is empty
${data.postRun}
fi
'';
in
"+${script}";

2
nixos/modules/services/mail/rss2email.nix
View file

@ -91,6 +91,8 @@ in {
};
};
environment.systemPackages = with pkgs; [ rss2email ];
services.rss2email.config.to = cfg.to;
systemd.tmpfiles.rules = [

16
nixos/modules/services/misc/nix-daemon.nix
View file

@ -430,6 +430,16 @@ in
'';
};
buildLocation = mkOption {
type = types.str;
default = "/tmp";
example = "/var/buildroot";
description = ''
Temporary directory, which used to unpack and build source packages.
(by default <filename>/tmp</filename> is used, which commonly reside on tmpfs,
and big packages (like browsers) can just not fit there)
'';
};
};
};
@ -476,7 +486,9 @@ in
++ optionals cfg.distributedBuilds [ pkgs.gzip ];
environment = cfg.envVars
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt";
TMPDIR = cfg.buildLocation;
}
// config.networking.proxy.envVars;
unitConfig.RequiresMountsFor = "/nix/store";
@ -490,6 +502,8 @@ in
restartTriggers = [ nixConf ];
};
systemd.tmpfiles.rules = [ "d ${cfg.buildLocation} 0775 root root -" ];
# Set up the environment variables for running Nix.
environment.sessionVariables = cfg.envVars //
{ NIX_PATH = cfg.nixPath;

4
nixos/modules/services/misc/redmine.nix
View file

@ -132,7 +132,7 @@ in
example = literalExample ''
{
dkuk-redmine_alex_skin = builtins.fetchurl {
url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip;
url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip";
sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl";
};
}
@ -146,7 +146,7 @@ in
example = literalExample ''
{
redmine_env_auth = builtins.fetchurl {
url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip;
url = "https://github.com/Intera/redmine_env_auth/archive/0.6.zip";
sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak";
};
}

2
nixos/modules/services/security/bitwarden_rs/default.nix
View file

@ -58,7 +58,7 @@ in {
default = {};
example = literalExample ''
{
domain = https://bw.domain.tld:8443;
domain = "https://bw.domain.tld:8443";
signupsAllowed = true;
rocketPort = 8222;
rocketLog = "critical";

4
nixos/modules/services/web-apps/wordpress.nix
View file

@ -105,7 +105,7 @@ let
name = "embed-pdf-viewer-plugin";
# Download the theme from the wordpress site
src = pkgs.fetchurl {
url = https://downloads.wordpress.org/plugin/embed-pdf-viewer.2.0.3.zip;
url = "https://downloads.wordpress.org/plugin/embed-pdf-viewer.2.0.3.zip";
sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd";
};
# We need unzip to build this package
@ -132,7 +132,7 @@ let
name = "responsive-theme";
# Download the theme from the wordpress site
src = pkgs.fetchurl {
url = https://downloads.wordpress.org/theme/responsive.3.14.zip;
url = "https://downloads.wordpress.org/theme/responsive.3.14.zip";
sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3";
};
# We need unzip to build this package

1
nixos/tests/installed-tests/default.nix
View file

@ -91,6 +91,7 @@ in
ibus = callInstalledTest ./ibus.nix {};
libgdata = callInstalledTest ./libgdata.nix {};
glib-testing = callInstalledTest ./glib-testing.nix {};
libjcat = callInstalledTest ./libjcat.nix {};
libxmlb = callInstalledTest ./libxmlb.nix {};
malcontent = callInstalledTest ./malcontent.nix {};
ostree = callInstalledTest ./ostree.nix {};

5
nixos/tests/installed-tests/libjcat.nix Normal file
View file

@ -0,0 +1,5 @@
{ pkgs, makeInstalledTest, ... }:
makeInstalledTest {
tested = pkgs.libjcat;
}

2
pkgs/applications/audio/polyphone/default.nix
View file

@ -41,7 +41,7 @@ mkDerivation rec {
meta = with stdenv.lib; {
description = "A soundfont editor for creating musical instruments";
homepage = https://www.polyphone-soundfonts.com/;
homepage = "https://www.polyphone-soundfonts.com/";
license = licenses.gpl3;
maintainers = [ maintainers.maxdamantus ];
platforms = platforms.linux;

7
pkgs/applications/blockchains/go-ethereum.nix
View file

@ -2,18 +2,19 @@
buildGoModule rec {
pname = "go-ethereum";
version = "1.9.12";
version = "1.9.13";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "143imiphyzk3009cfnqj7q013pb1wva13zq63byfj3d204b58cg6";
sha256 = "1yqqflp73yvjy6bp05xd1nv5fc6p1nx7g4spbssxf3ws96pdh425";
};
modSha256 = "15a8if5gx361nrqgv201jy8saq1ir1g18rpqzdmavg4ic75si5x1";
modSha256 = "07xrw3fivfpbkg4mp8ghrj1bishfas82dbd780fymgs2h74iigf3";
subPackages = [
"cmd/abidump"
"cmd/abigen"
"cmd/bootnode"
"cmd/checkpoint-admin"

12
pkgs/applications/editors/android-studio/default.nix
View file

@ -8,9 +8,9 @@ let
inherit (gnome2) GConf gnome_vfs;
};
stableVersion = {
version = "3.6.2.0"; # "Android Studio 3.6.2"
build = "192.6308749";
sha256Hash = "04r4iwlmns1lf3wfd32cqmndbdz9rf7hfbi5r6qmvpi8j83fghvr";
version = "3.6.3.0"; # "Android Studio 3.6.3"
build = "192.6392135";
sha256Hash = "0apxmp341m7mbpm2df3qvsbaifwy6yqq746kbhbwlw8bn9hrzv1k";
};
betaVersion = {
version = "4.0.0.13"; # "Android Studio 4.0 Beta 4"
@ -18,9 +18,9 @@ let
sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2";
};
latestVersion = { # canary & dev
version = "4.1.0.5"; # "Android Studio 4.1 Canary 5"
build = "193.6362631";
sha256Hash = "1q9wbqnwpq0mz8rz4c0v7mfaazymq6xv20dv4fll6p2q63qk71qp";
version = "4.1.0.6"; # "Android Studio 4.1 Canary 6"
build = "193.6381907";
sha256Hash = "0sa5plr96m90wv5hi9bqwa11j6k8k9wa0ji8qmlimdhnpyzhsdrx";
};
in {
# Attributes are named by their corresponding release channels

8
pkgs/applications/editors/micro/default.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "micro";
version = "1.4.1";
version = "2.0.3";
goPackagePath = "github.com/zyedidia/micro";
@ -10,13 +10,15 @@ buildGoPackage rec {
owner = "zyedidia";
repo = "micro";
rev = "v${version}";
sha256 = "0m9p6smb5grdazsgr3m1x4rry9ihhlgl9ildhvfp53czrifbx0m5";
sha256 = "017m9kb3gfrgzd06f1nma1i3m5rb0hzpgdikb86lsyv8ik18y12z";
fetchSubmodules = true;
};
subPackages = [ "cmd/micro" ];
buildFlagsArray = [ "-ldflags=" "-X main.Version=${version}" ];
buildFlagsArray = [ "-ldflags=" "-X ${goPackagePath}/internal/util.Version=${version}" ];
goDeps = ./deps.nix;
meta = with stdenv.lib; {
homepage = "https://micro-editor.github.io";

336
pkgs/applications/editors/micro/deps.nix generated Normal file
View file

@ -0,0 +1,336 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/blang/semver";
fetch = {
type = "git";
url = "https://github.com/blang/semver";
rev = "v3.5.1";
sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
};
}
{
goPackagePath = "github.com/chzyer/logex";
fetch = {
type = "git";
url = "https://github.com/chzyer/logex";
rev = "v1.1.10";
sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4";
};
}
{
goPackagePath = "github.com/chzyer/readline";
fetch = {
type = "git";
url = "https://github.com/chzyer/readline";
rev = "2972be24d48e";
sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
};
}
{
goPackagePath = "github.com/chzyer/test";
fetch = {
type = "git";
url = "https://github.com/chzyer/test";
rev = "a1ea475d72b1";
sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.1";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/dustin/go-humanize";
fetch = {
type = "git";
url = "https://github.com/dustin/go-humanize";
rev = "v1.0.0";
sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
};
}
{
goPackagePath = "github.com/gdamore/encoding";
fetch = {
type = "git";
url = "https://github.com/gdamore/encoding";
rev = "v1.0.0";
sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
rev = "v1.0.1";
sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
};
}
{
goPackagePath = "github.com/kballard/go-shellquote";
fetch = {
type = "git";
url = "https://github.com/kballard/go-shellquote";
rev = "95032a82bc51";
sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80";
};
}
{
goPackagePath = "github.com/kr/pretty";
fetch = {
type = "git";
url = "https://github.com/kr/pretty";
rev = "v0.1.0";
sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
};
}
{
goPackagePath = "github.com/kr/pty";
fetch = {
type = "git";
url = "https://github.com/kr/pty";
rev = "v1.1.1";
sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
};
}
{
goPackagePath = "github.com/kr/text";
fetch = {
type = "git";
url = "https://github.com/kr/text";
rev = "v0.1.0";
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
};
}
{
goPackagePath = "github.com/lucasb-eyer/go-colorful";
fetch = {
type = "git";
url = "https://github.com/lucasb-eyer/go-colorful";
rev = "v1.0.3";
sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "v0.0.11";
sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "v0.0.7";
sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "v1.1.0";
sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/robertkrimen/otto";
fetch = {
type = "git";
url = "https://github.com/robertkrimen/otto";
rev = "c382bd3c16ff";
sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa";
};
}
{
goPackagePath = "github.com/sergi/go-diff";
fetch = {
type = "git";
url = "https://github.com/sergi/go-diff";
rev = "v1.1.0";
sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2";
};
}
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
rev = "v0.1.0";
sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.4.0";
sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
};
}
{
goPackagePath = "github.com/yuin/gopher-lua";
fetch = {
type = "git";
url = "https://github.com/yuin/gopher-lua";
rev = "ab39c6098bdb";
sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja";
};
}
{
goPackagePath = "github.com/zyedidia/clipboard";
fetch = {
type = "git";
url = "https://github.com/zyedidia/clipboard";
rev = "241f98e9b197";
sha256 = "1glc8w30sijpbppcvaf3503rmx5nxqkcgw87dr2pr3q3vv1bg3zi";
};
}
{
goPackagePath = "github.com/zyedidia/glob";
fetch = {
type = "git";
url = "https://github.com/zyedidia/glob";
rev = "dd4023a66dc3";
sha256 = "1vqw4xbqq6j8p5m7mwxvb448w69vjvgzx0ndsfzdh2cxfirwp3y7";
};
}
{
goPackagePath = "github.com/zyedidia/highlight";
fetch = {
type = "git";
url = "https://github.com/zyedidia/highlight";
rev = "201131ce5cf5";
sha256 = "0blaynf32swmqddx2hcrifrfssj9c04kwnbdy42h3kzxihrwz4ps";
};
}
{
goPackagePath = "github.com/zyedidia/json5";
fetch = {
type = "git";
url = "https://github.com/zyedidia/json5";
rev = "2da050b1a98d";
sha256 = "1sgydazf3npr788b4w17ydmlh3fd1zmpriv9b69967ww90ckh2kz";
};
}
{
goPackagePath = "github.com/zyedidia/poller";
fetch = {
type = "git";
url = "https://github.com/zyedidia/poller";
rev = "v1.0.1";
sha256 = "10cjrqfk1j0l55bdbpm7kv4mqc665pngc8avai0p9chq03y2654g";
};
}
{
goPackagePath = "github.com/zyedidia/pty";
fetch = {
type = "git";
url = "https://github.com/zyedidia/pty";
rev = "v2.0.0";
sha256 = "1n946ld8y2v2wfbwsxv8rfaicxbw3w8pk11ryc8iybmw7hkmmf79";
};
}
{
goPackagePath = "github.com/zyedidia/tcell";
fetch = {
type = "git";
url = "https://github.com/zyedidia/tcell";
rev = "v1.4.4";
sha256 = "0d62a9csab15b64y09jcbvq71065wliw4bd5m7lfpl5k8rmrrdyi";
};
}
{
goPackagePath = "github.com/zyedidia/terminal";
fetch = {
type = "git";
url = "https://github.com/zyedidia/terminal";
rev = "533c623e2415";
sha256 = "16l628f3zgl5yp9z5zkfy2hyl2sckw4d6mg3iqv2jjvh4i8yhrsm";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "33540a1f6037";
sha256 = "0fjcv0vzvi6za0b4xmnk3932pr9f9gczzf03y0kgq3ry9rqg169y";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.2";
sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "90fa682c2a6e";
sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
};
}
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "41f04d3bba15";
sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy";
};
}
{
goPackagePath = "gopkg.in/sourcemap.v1";
fetch = {
type = "git";
url = "https://gopkg.in/sourcemap.v1";
rev = "v1.0.5";
sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.7";
sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj";
};
}
{
goPackagePath = "layeh.com/gopher-luar";
fetch = {
type = "git";
url = "https://github.com/layeh/gopher-luar";
rev = "v1.0.7";
sha256 = "1rdbni3q7zajmiy62ccvbfgqjzppk5212wpwks2ba726hvyf85mj";
};
}
]

2
pkgs/applications/misc/termpdf.py/default.nix
View file

@ -44,7 +44,7 @@ buildPythonApplication {
A graphical pdf (and epub, cbz, ...) reader that works
inside the kitty terminal.
'';
homepage = https://github.com/dsanson/termpdf.py;
homepage = "https://github.com/dsanson/termpdf.py";
maintainers = with maintainers; [ teto ];
license = licenses.mit;
};

17
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -24,8 +24,13 @@
, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone
# package customization
, useVaapi ? false
, useOzone ? false
, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper
# VA-API TODOs:
# - Ozone: M81 fails to build due to "ozone_platform_gbm = false"
# - Possible solutions: Write a patch to fix the build (wrong gn dependencies)
# or build with minigbm
# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879)
, gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
, proprietaryCodecs ? true
@ -127,10 +132,10 @@ let
libXScrnSaver libXcursor libXtst libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core
jre
] ++ optional gnomeKeyringSupport libgnome-keyring3
] ++ optional useVaapi libva
++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
++ optional useVaapi libva
++ optional pulseSupport libpulseaudio
++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
@ -149,9 +154,9 @@ let
#
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (useVaapi) ([
# source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
./patches/vaapi-fix.patch
] ++ optionals (useVaapi) ([ # Fixes for the VA-API build:
./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
] ++ optionals (versionRange "81" "82") [
(githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902")
(githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064")

19
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -6,13 +6,15 @@
, lib
# package customization
# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
, channel ? "stable"
, gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false
, proprietaryCodecs ? true
, enablePepperFlash ? false
, enableWideVine ? false
, useVaapi ? false # test video on radeon, before enabling this
, useVaapi ? false # Deprecated, use enableVaapi instead!
, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon
, useOzone ? false
, cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux
@ -33,7 +35,7 @@ let
upstream-info = (callPackage ./update.nix {}).getChannel channel;
mkChromiumDerivation = callPackage ./common.nix ({
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone;
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;
gnChromium = gn;
} // lib.optionalAttrs (channel != "stable") {
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
@ -127,6 +129,14 @@ let
cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/
''
else browser;
optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09:
then throw ''
Chromium's useVaapi was replaced by enableVaapi and you don't need to pass
"--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore).
'' else lib.optionalString
(!enableVaapi)
"--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode";
in stdenv.mkDerivation {
name = "chromium${suffix}-${version}";
inherit version;
@ -146,15 +156,14 @@ in stdenv.mkDerivation {
buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
libPath = stdenv.lib.makeLibraryPath ([]
++ stdenv.lib.optional useVaapi libva
);
libPath = stdenv.lib.makeLibraryPath [ libva ];
in with stdenv.lib; ''
mkdir -p "$out/bin"
eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
--add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
${optionalVaapiFlags} \
${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
ed -v -s "$out/bin/chromium" << EOF

0
pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch → pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch
View file

48
pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch Normal file
View file

@ -0,0 +1,48 @@
From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 14 Apr 2020 14:16:10 +0200
Subject: [PATCH] Enable accelerated video decode on Linux
This will enable accelerated video decode on Linux by default (i.e.
without "--ignore-gpu-blacklist"), but on NixOS we'll provide
"--disable-accelerated-video-decode" and
"--disable-accelerated-video-encode" by default to avoid regressions
(e.g. VA-API doesn't work properly for some radeon drivers).
Video acceleration can then be enabled via:
chromium.override { enableVaapi = true; }
without rebuilding Chromium.
---
gpu/config/software_rendering_list.json | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
index 22712bdbf38f..a06dd19a50e4 100644
--- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json
@@ -336,22 +336,6 @@
]
},
{
- "id": 48,
- "description": "Accelerated video decode is unavailable on Linux",
- "cr_bugs": [137247, 1032907],
- "os": {
- "type": "linux"
- },
- "exceptions": [
- {
- "machine_model_name": ["Chromecast"]
- }
- ],
- "features": [
- "accelerated_video_decode"
- ]
- },
- {
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
--
2.11.0

2
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -180,7 +180,7 @@ stdenv.mkDerivation ({
$(< ${stdenv.cc}/nix-support/cc-cflags) \
${stdenv.cc.default_cxx_stdlib_compile} \
${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \
${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/$(cc -dumpmachine)"} \
${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \
$NIX_CFLAGS_COMPILE"
echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file

@ -191,7 +191,7 @@ stdenv.mkDerivation rec {
lib.getVersion stdenv.cc.cc
} -isystem ${stdenv.cc.cc}/include/c++/${
lib.getVersion stdenv.cc.cc
}/$(cc -dumpmachine)"
}/${stdenv.hostPlatform.config}"
} \
$NIX_CFLAGS_COMPILE"

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

@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "msmtp";
version = "1.8.7";
version = "1.8.8";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
sha256 = "1waiiksa57byb7gvx1zmh6srvl6r8rvwqklk0slb3iaf4kfbqlws";
sha256 = "1rarck61mz3mwg0l30vjj6j9fq6gc7gic0r1c1ppwpq2izj57jzc";
};
patches = [

2
pkgs/build-support/cc-wrapper/default.nix
View file

@ -48,7 +48,7 @@ let
coreutils_bin = if nativeTools then "" else getBin coreutils;
default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then
"-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"
"-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/${targetPlatform.config}"
else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then
"-isystem ${libcxx}/include/c++/v1"
else "";

2
pkgs/development/compilers/graalvm/default.nix
View file

@ -150,7 +150,7 @@ let
];
graal-mxcache = jvmci8-mxcache ++ [
# rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz; }
# rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; }
rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_COMPILER_RT_LINUX_${sha1}/llvm-org-compiler-rt-linux.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; }
rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar"; }
rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar"; }

6
pkgs/development/compilers/tinygo/default.nix
View file

@ -3,16 +3,16 @@
buildGoModule rec {
pname = "tinygo";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "tinygo-org";
repo = "tinygo";
rev = "v${version}";
sha256 = "0dw3kxf55p617pb0bj3knsqcfvap5scxlvhh3a9g9ia92kann4v1";
sha256 = "0x59j56y704m2hfkg78illgw9f6czrx265x887jfd989lnxphyqa";
};
modSha256 = "1bjq4vaf38hi204lr9w3r3wcy1rzj06ygi5gzfa7dl3kx10hw6p0";
modSha256 = "0y8n4mcr4jhas29ahvk8k4zbj1iz65fdpsgq61qa8kcsm8m5kqa6";
enableParallelBuilding = true;
subPackages = [ "." ];
buildInputs = [ llvm clang-unwrapped makeWrapper ];

4
pkgs/development/haskell-modules/configuration-tensorflow.nix
View file

@ -55,12 +55,12 @@ in
haskell-src-exts_1_19_1 = appendPatches (doJailbreak super.haskell-src-exts_1_19_1) [
# Adapt to the Semigroup–Monoid Proposal (enables building on GHC >= 8.4)
(pkgs.fetchpatch {
url = https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch;
url = "https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch";
sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff";
})
# Adapt to MonadFail proposal (enables building on GHC >= 8.8)
(pkgs.fetchpatch {
url = https://gist.githubusercontent.com/mikesperber/0f2addaf3fbe97ffb4a5234d8711ba41/raw/e09e20998283c7195e82d546ba9266d290eb000d/gistfile1.txt;
url = "https://gist.githubusercontent.com/mikesperber/0f2addaf3fbe97ffb4a5234d8711ba41/raw/e09e20998283c7195e82d546ba9266d290eb000d/gistfile1.txt";
sha256 = "18clvli7vpqsqlf2f3qidn71738j9zdlpana6wha3x0dxwan5ly0";
}) ];

2
pkgs/development/libraries/biblesync/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libuuid ];
meta = with stdenv.lib; {
homepage = http://www.crosswire.org/wiki/BibleSync;
homepage = "http://www.crosswire.org/wiki/BibleSync";
description = "A multicast protocol to Bible software shared conavigation";
longDescription = ''
BibleSync is a multicast protocol to support Bible software shared

91
pkgs/development/libraries/libjcat/default.nix Normal file
View file

@ -0,0 +1,91 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, docbook_xml_dtd_43
, docbook-xsl-nons
, glib
, json-glib
, gnutls
, gpgme
, gobject-introspection
, vala
, help2man
, gtk-doc
, meson
, ninja
, pkg-config
, python3
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "libjcat";
version = "0.1.1";
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
src = fetchFromGitHub {
owner = "hughsie";
repo = "libjcat";
rev = version;
sha256 = "hWJUzpQvy2V4pS8C/nW7Xrs9U9LQWMsGuTVOnm5UJc0=";
};
patches = [
# Installed tests are installed to different output
./installed-tests-path.patch
# Fix version file generation
(fetchpatch {
url = "https://github.com/hughsie/libjcat/commit/cf2d9298a5fab7278ee040bc0b4be384a7b5538e.patch";
sha256 = "3749qih+wfhU8ECklh5BvReJ7pS+Ao1Q7YueZ1tT0Is=";
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
docbook_xml_dtd_43
docbook-xsl-nons
gobject-introspection
vala
help2man
gtk-doc
(python3.withPackages (pkgs: with pkgs; [
setuptools
]))
];
buildInputs = [
glib
json-glib
gnutls
gpgme
];
mesonFlags = [
"-Dgtkdoc=true"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
postPatch = ''
patchShebangs contrib/generate-version-script.py
'';
doCheck = true;
passthru = {
tests = {
installed-tests = nixosTests.installed-tests.libjcat;
};
};
meta = with stdenv.lib; {
description = "Library for reading and writing Jcat files";
homepage = "https://github.com/hughsie/libjcat";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.all;
};
}

24
pkgs/development/libraries/libjcat/installed-tests-path.patch Normal file
View file

@ -0,0 +1,24 @@
diff --git a/meson.build b/meson.build
index f69968d..d1d6c6e 100644
--- a/meson.build
+++ b/meson.build
@@ -114,8 +114,8 @@ else
datadir = join_paths(prefix, get_option('datadir'))
localstatedir = join_paths(prefix, get_option('localstatedir'))
libexecdir = join_paths(prefix, get_option('libexecdir'))
- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
+ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
+ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
diff --git a/meson_options.txt b/meson_options.txt
index 4784300..d382fc1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
option('gtkdoc', type : 'boolean', value : false, description : 'enable developer documentation')
option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
option('tests', type : 'boolean', value : true, description : 'enable tests')

178
pkgs/development/node-packages/node-packages-v10.nix
View file

@ -15293,7 +15293,7 @@ let
version = "1.0.1";
src = fetchurl {
name = "emitter-1.0.1.tar.gz";
url = https://codeload.github.com/component/emitter/tar.gz/1.0.1;
url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1";
sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
};
};
@ -19632,7 +19632,7 @@ let
version = "2.0.1";
src = fetchurl {
name = "global-2.0.1.tar.gz";
url = https://codeload.github.com/component/global/tar.gz/v2.0.1;
url = "https://codeload.github.com/component/global/tar.gz/v2.0.1";
sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785";
};
};
@ -31657,7 +31657,7 @@ let
version = "0.9.15";
src = fetchurl {
name = "oauth-0.9.15.tar.gz";
url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master";
sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
};
};
@ -48868,7 +48868,7 @@ let
version = "1.5.0";
src = fetchurl {
name = "xmlhttprequest-1.5.0.tar.gz";
url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433;
url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433";
sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f";
};
};
@ -49891,7 +49891,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "CLI tool for Angular";
homepage = https://github.com/angular/angular-cli;
homepage = "https://github.com/angular/angular-cli";
license = "MIT";
};
production = true;
@ -49935,7 +49935,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The command line interface for Antora.";
homepage = https://antora.org/;
homepage = "https://antora.org/";
license = "MPL-2.0";
};
production = true;
@ -50264,7 +50264,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The default site generator pipeline for producing and publishing static documentation sites with Antora.";
homepage = https://antora.org/;
homepage = "https://antora.org/";
license = "MPL-2.0";
};
production = true;
@ -50427,7 +50427,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "A secure and free password manager for all of your devices.";
homepage = https://bitwarden.com/;
homepage = "https://bitwarden.com/";
license = "GPL-3.0";
};
production = true;
@ -52016,7 +52016,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Command line interface for rapid Vue.js development";
homepage = https://cli.vuejs.org/;
homepage = "https://cli.vuejs.org/";
license = "MIT";
};
production = true;
@ -52378,7 +52378,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Creating Electron app packages";
homepage = https://github.com/electron/asar;
homepage = "https://github.com/electron/asar";
license = "MIT";
};
production = true;
@ -52536,7 +52536,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The browser package manager";
homepage = http://bower.io/;
homepage = "http://bower.io/";
license = "MIT";
};
production = true;
@ -52666,7 +52666,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Generate nix expressions to fetch bower dependencies";
homepage = https://github.com/rvl/bower2nix;
homepage = "https://github.com/rvl/bower2nix";
license = "GPL-3.0";
};
production = true;
@ -53275,7 +53275,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "A well-tested CSS minifier";
homepage = https://github.com/jakubpawlowicz/clean-css;
homepage = "https://github.com/jakubpawlowicz/clean-css";
license = "MIT";
};
production = true;
@ -56498,7 +56498,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Unfancy JavaScript";
homepage = http://coffeescript.org/;
homepage = "http://coffeescript.org/";
license = "MIT";
};
production = true;
@ -57893,7 +57893,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Create React Native apps with no build configuration.";
homepage = https://github.com/expo/create-react-native-app;
homepage = "https://github.com/expo/create-react-native-app";
license = "BSD-3-Clause";
};
production = true;
@ -57915,7 +57915,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "CSSLint";
homepage = http://csslint.net/;
homepage = "http://csslint.net/";
license = "MIT";
};
production = true;
@ -58570,7 +58570,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Dat is the package manager for data. Easily share and version control data.";
homepage = https://datproject.org/;
homepage = "https://datproject.org/";
license = "BSD-3-Clause";
};
production = true;
@ -58591,7 +58591,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "A DHCP server written in JavaScript";
homepage = https://github.com/infusion/node-dhcp;
homepage = "https://github.com/infusion/node-dhcp";
license = "MIT OR GPL-2.0";
};
production = true;
@ -58736,7 +58736,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!";
homepage = https://github.com/okTurtles/dnschain;
homepage = "https://github.com/okTurtles/dnschain";
license = "MPL-2.0";
};
production = true;
@ -59269,7 +59269,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images.";
homepage = https://www.emojione.com/;
homepage = "https://www.emojione.com/";
};
production = true;
bypassCache = true;
@ -59445,7 +59445,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "An AST-based pattern checker for JavaScript.";
homepage = https://eslint.org/;
homepage = "https://eslint.org/";
license = "MIT";
};
production = true;
@ -59627,7 +59627,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Makes eslint the fastest linter on the planet";
homepage = https://github.com/mantoni/eslint_d.js;
homepage = "https://github.com/mantoni/eslint_d.js";
license = "MIT";
};
production = true;
@ -60652,7 +60652,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "git hosting on secure-scuttlebutt (ssb)";
homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256;
homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256";
license = "Fair";
};
production = true;
@ -62504,7 +62504,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The streaming build system.";
homepage = https://gulpjs.com/;
homepage = "https://gulpjs.com/";
license = "MIT";
};
production = true;
@ -62849,7 +62849,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Command line interface for gulp";
homepage = http://gulpjs.com/;
homepage = "http://gulpjs.com/";
license = "MIT";
};
production = true;
@ -62880,7 +62880,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Highly configurable, well-tested, JavaScript-based HTML minifier.";
homepage = https://kangax.github.io/html-minifier/;
homepage = "https://kangax.github.io/html-minifier/";
license = "MIT";
};
production = true;
@ -63250,7 +63250,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "High precision scientific calculator with support for physical units";
homepage = https://github.com/sharkdp/insect;
homepage = "https://github.com/sharkdp/insect";
license = "MIT";
};
production = true;
@ -63571,7 +63571,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "A tool for creating and developing Ionic Framework mobile apps.";
homepage = https://ionicframework.com/;
homepage = "https://ionicframework.com/";
license = "MIT";
};
production = true;
@ -64112,7 +64112,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Implementation of the Language Server Protocol for JavaScript and TypeScript";
homepage = https://github.com/sourcegraph/javascript-typescript-langserver;
homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
license = "Apache-2.0";
};
production = true;
@ -64962,7 +64962,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "beautifier.io for node";
homepage = https://beautifier.io/;
homepage = "https://beautifier.io/";
license = "MIT";
};
production = true;
@ -64985,7 +64985,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "YAML 1.2 parser and serializer";
homepage = https://github.com/nodeca/js-yaml;
homepage = "https://github.com/nodeca/js-yaml";
license = "MIT";
};
production = true;
@ -65081,7 +65081,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Static analysis tool for JavaScript";
homepage = http://jshint.com/;
homepage = "http://jshint.com/";
license = "(MIT AND JSON)";
};
production = true;
@ -65124,7 +65124,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "JSON diff";
homepage = https://github.com/andreyvit/json-diff;
homepage = "https://github.com/andreyvit/json-diff";
};
production = true;
bypassCache = true;
@ -65179,7 +65179,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03).";
homepage = https://github.com/whitlockjc/json-refs;
homepage = "https://github.com/whitlockjc/json-refs";
license = "MIT";
};
production = true;
@ -65460,7 +65460,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Get a full fake REST API with zero coding in less than 30 seconds";
homepage = https://github.com/typicode/json-server;
homepage = "https://github.com/typicode/json-server";
license = "MIT";
};
production = true;
@ -65487,7 +65487,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Validate JSON";
homepage = http://zaach.github.com/jsonlint/;
homepage = "http://zaach.github.com/jsonlint/";
};
production = true;
bypassCache = true;
@ -65687,7 +65687,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Spectacular Test Runner for JavaScript.";
homepage = http://karma-runner.github.io/;
homepage = "http://karma-runner.github.io/";
license = "MIT";
};
production = true;
@ -65781,7 +65781,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Merges multiple lcov results into one";
homepage = https://github.com/mweibel/lcov-result-merger;
homepage = "https://github.com/mweibel/lcov-result-merger";
license = "MIT";
};
production = true;
@ -67083,7 +67083,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Leaner CSS";
homepage = http://lesscss.org/;
homepage = "http://lesscss.org/";
license = "Apache-2.0";
};
production = true;
@ -67108,7 +67108,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "clean-css plugin for less.js";
homepage = http://lesscss.org/;
homepage = "http://lesscss.org/";
};
production = true;
bypassCache = true;
@ -67949,7 +67949,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Live Markdown previews for your favourite editor.";
homepage = https://github.com/shime/livedown;
homepage = "https://github.com/shime/livedown";
license = "MIT";
};
production = true;
@ -69107,7 +69107,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Madoko is a fast scholarly Markdown processor written in Koka";
homepage = http://madoko.codeplex.com/;
homepage = "http://madoko.codeplex.com/";
};
production = true;
bypassCache = true;
@ -69247,7 +69247,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined.";
homepage = https://bitbucket.org/aahmed/meat;
homepage = "https://bitbucket.org/aahmed/meat";
};
production = true;
bypassCache = true;
@ -70105,7 +70105,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "simple, flexible, fun test framework";
homepage = https://mochajs.org/;
homepage = "https://mochajs.org/";
license = "MIT";
};
production = true;
@ -70229,7 +70229,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Neovim client API and neovim remote plugin provider";
homepage = https://github.com/neovim/node-client;
homepage = "https://github.com/neovim/node-client";
license = "MIT";
};
production = true;
@ -70388,7 +70388,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Build tool and bindings loader for node-gyp that supports prebuilds";
homepage = https://github.com/prebuild/node-gyp-build;
homepage = "https://github.com/prebuild/node-gyp-build";
license = "MIT";
};
production = true;
@ -70684,7 +70684,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Web Inspector based nodeJS debugger";
homepage = http://github.com/node-inspector/node-inspector;
homepage = "http://github.com/node-inspector/node-inspector";
};
production = true;
bypassCache = true;
@ -71251,7 +71251,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Low-code programming for event-driven applications";
homepage = http://nodered.org/;
homepage = "http://nodered.org/";
license = "Apache-2.0";
};
production = true;
@ -71441,7 +71441,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Generate Nix expressions to build NPM packages";
homepage = https://github.com/svanderburg/node2nix;
homepage = "https://github.com/svanderburg/node2nix";
license = "MIT";
};
production = true;
@ -71605,7 +71605,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Simple monitor script for use during development of a node.js app.";
homepage = http://nodemon.io/;
homepage = "http://nodemon.io/";
license = "MIT";
};
production = true;
@ -71623,7 +71623,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "a package manager for JavaScript";
homepage = https://docs.npmjs.com/;
homepage = "https://docs.npmjs.com/";
license = "Artistic-2.0";
};
production = true;
@ -71919,7 +71919,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Find newer versions of dependencies than what your package.json or bower.json allows";
homepage = https://github.com/tjunnone/npm-check-updates;
homepage = "https://github.com/tjunnone/npm-check-updates";
license = "Apache-2.0";
};
production = true;
@ -72093,7 +72093,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Generate nix expressions to build npm packages";
homepage = https://github.com/NixOS/npm2nix;
homepage = "https://github.com/NixOS/npm2nix";
};
production = true;
bypassCache = true;
@ -72134,7 +72134,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "OCaml language server";
homepage = https://github.com/freebroccolo/ocaml-language-server;
homepage = "https://github.com/freebroccolo/ocaml-language-server";
license = "Apache-2.0";
};
production = true;
@ -73695,7 +73695,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Streaming torrent client for Node.js";
homepage = https://github.com/mafintosh/peerflix;
homepage = "https://github.com/mafintosh/peerflix";
license = "MIT";
};
production = true;
@ -74084,7 +74084,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Fast, disk space efficient package manager";
homepage = https://pnpm.js.org/;
homepage = "https://pnpm.js.org/";
license = "MIT";
};
production = true;
@ -74261,7 +74261,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Prettier is an opinionated code formatter";
homepage = https://prettier.io/;
homepage = "https://prettier.io/";
license = "MIT";
};
production = true;
@ -74648,7 +74648,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "A build system for PureScript projects";
homepage = https://github.com/purescript-contrib/pulp;
homepage = "https://github.com/purescript-contrib/pulp";
license = "LGPL-3.0+";
};
production = true;
@ -74820,7 +74820,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "A set of complementary tools to React, including the JSX transformer.";
homepage = https://facebook.github.io/react;
homepage = "https://facebook.github.io/react";
license = "BSD-3-Clause";
};
production = true;
@ -74838,7 +74838,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The HTML Presentation Framework";
homepage = http://revealjs.com/;
homepage = "http://revealjs.com/";
license = "MIT";
};
production = true;
@ -76486,7 +76486,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more";
homepage = https://serverless.com/framework/docs/;
homepage = "https://serverless.com/framework/docs/";
license = "MIT";
};
production = true;
@ -78588,7 +78588,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "network protocol layer for secure-scuttlebutt";
homepage = https://github.com/ssbc/ssb-server;
homepage = "https://github.com/ssbc/ssb-server";
license = "MIT";
};
production = true;
@ -78606,7 +78606,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Send metric data from statsd to Stackdriver";
homepage = https://www.stackdriver.com/;
homepage = "https://www.stackdriver.com/";
license = "MIT";
};
production = true;
@ -79525,7 +79525,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Nodejs-based tool for optimizing SVG vector graphics files";
homepage = https://github.com/svg/svgo;
homepage = "https://github.com/svg/svgo";
license = "MIT";
};
production = true;
@ -80560,7 +80560,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The pluggable linting tool for text and markdown.";
homepage = https://github.com/textlint/textlint/;
homepage = "https://github.com/textlint/textlint/";
license = "MIT";
};
production = true;
@ -80582,7 +80582,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Latex plugin for [textlint](https://github.com/textlint/textlint &#34;textlint&#34;).";
homepage = https://github.com/elzup/textlint-plugin-latex;
homepage = "https://github.com/elzup/textlint-plugin-latex";
license = "MIT";
};
production = true;
@ -80621,7 +80621,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "textlint rule check that abbreviations within parentheses.";
homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses;
homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses";
license = "MIT";
};
production = true;
@ -80935,7 +80935,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "textlint rule for alex";
homepage = https://github.com/textlint-rule/textlint-rule-alex;
homepage = "https://github.com/textlint-rule/textlint-rule-alex";
license = "MIT";
};
production = true;
@ -80960,7 +80960,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "textlint rule to check common misspellings";
homepage = https://github.com/io-monad/textlint-rule-common-misspellings;
homepage = "https://github.com/io-monad/textlint-rule-common-misspellings";
license = "GPL-3.0";
};
production = true;
@ -80982,7 +80982,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Textlint rule to check correct usage of diacritics";
homepage = https://github.com/sapegin/textlint-rule-diacritics;
homepage = "https://github.com/sapegin/textlint-rule-diacritics";
license = "MIT";
};
production = true;
@ -81019,7 +81019,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "textlint rule that specify the maximum word count of a sentence.";
homepage = https://github.com/azu/textlint-rule-en-max-word-count;
homepage = "https://github.com/azu/textlint-rule-en-max-word-count";
license = "MIT";
};
production = true;
@ -81112,7 +81112,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "textlint rule that check no start with duplicated conjunction.";
homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction;
homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction";
license = "MIT";
};
production = true;
@ -81153,7 +81153,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "textlint rule that check with or without period in list item.";
homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item;
homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item";
license = "MIT";
};
production = true;
@ -81183,7 +81183,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Textlint rule to find filler words, buzzwords and chiches";
homepage = https://github.com/sapegin/textlint-rule-stop-words;
homepage = "https://github.com/sapegin/textlint-rule-stop-words";
license = "MIT";
};
production = true;
@ -81213,7 +81213,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "TextLint rule to check correct terms spelling";
homepage = https://github.com/sapegin/textlint-rule-terminology;
homepage = "https://github.com/sapegin/textlint-rule-terminology";
license = "MIT";
};
production = true;
@ -81253,7 +81253,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "textlint rule that check unexpanded acronym word.";
homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym;
homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym";
license = "MIT";
};
production = true;
@ -81293,7 +81293,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "textlint rule to check your English style with write good";
homepage = https://github.com/textlint-rule/textlint-rule-write-good;
homepage = "https://github.com/textlint-rule/textlint-rule-write-good";
license = "MIT";
};
production = true;
@ -81728,7 +81728,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The self-hosted Web IRC client";
homepage = https://thelounge.chat/;
homepage = "https://thelounge.chat/";
license = "MIT";
};
production = true;
@ -81746,7 +81746,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "JavaScript 3D library";
homepage = https://threejs.org/;
homepage = "https://threejs.org/";
license = "MIT";
};
production = true;
@ -82087,7 +82087,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Joyent Triton CLI and client (https://www.joyent.com/triton)";
homepage = https://github.com/joyent/node-triton;
homepage = "https://github.com/joyent/node-triton";
license = "MPL-2.0";
};
production = true;
@ -82136,7 +82136,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "TSUN: a repl for TypeScript Upgraded Node";
homepage = https://github.com/HerringtonDarkholme/typescript-repl;
homepage = "https://github.com/HerringtonDarkholme/typescript-repl";
license = "MIT";
};
production = true;
@ -82177,7 +82177,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "TypeScript is a language for application scale JavaScript development";
homepage = https://www.typescriptlang.org/;
homepage = "https://www.typescriptlang.org/";
license = "Apache-2.0";
};
production = true;
@ -83941,7 +83941,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "vue-language-server";
homepage = https://github.com/vuejs/vetur/tree/master/server;
homepage = "https://github.com/vuejs/vetur/tree/master/server";
license = "MIT";
};
production = true;
@ -85040,7 +85040,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "A command line tool to help build, run, and test web extensions";
homepage = https://github.com/mozilla/web-ext;
homepage = "https://github.com/mozilla/web-ext";
license = "MPL-2.0";
};
production = true;
@ -85516,7 +85516,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.";
homepage = https://github.com/webpack/webpack;
homepage = "https://github.com/webpack/webpack";
license = "MIT";
};
production = true;
@ -86581,7 +86581,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Copy files && directories with webpack";
homepage = https://github.com/webpack-contrib/copy-webpack-plugin;
homepage = "https://github.com/webpack-contrib/copy-webpack-plugin";
license = "MIT";
};
production = true;
@ -86878,7 +86878,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "WebTorrent, the streaming torrent client. For the command line.";
homepage = https://webtorrent.io/;
homepage = "https://webtorrent.io/";
license = "MIT";
};
production = true;
@ -87917,11 +87917,11 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "CLI tool for running Yeoman generators";
homepage = http://yeoman.io/;
homepage = "http://yeoman.io/";
license = "BSD-2-Clause";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}
}

8
pkgs/development/node-packages/node-packages-v12.nix
View file

@ -2475,7 +2475,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Unfancy JavaScript";
homepage = http://coffeescript.org/;
homepage = "http://coffeescript.org/";
license = "MIT";
};
production = true;
@ -2953,7 +2953,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Generate Nix expressions to build NPM packages";
homepage = https://github.com/svanderburg/node2nix;
homepage = "https://github.com/svanderburg/node2nix";
license = "MIT";
};
production = true;
@ -3090,7 +3090,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Build tool and bindings loader for node-gyp that supports prebuilds";
homepage = https://github.com/prebuild/node-gyp-build;
homepage = "https://github.com/prebuild/node-gyp-build";
license = "MIT";
};
production = true;
@ -3182,4 +3182,4 @@ in
bypassCache = true;
reconstructLock = true;
};
}
}

4
pkgs/development/node-packages/node-packages-v13.nix
View file

@ -1441,11 +1441,11 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Generate Nix expressions to build NPM packages";
homepage = https://github.com/svanderburg/node2nix;
homepage = "https://github.com/svanderburg/node2nix";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}
}

20
pkgs/development/python-modules/pdfposter/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, pypdf2 }:
buildPythonPackage rec {
pname = "pdftools.pdfposter";
version = "0.7.post1";
propagatedBuildInputs = [ pypdf2 ];
src = fetchPypi {
inherit pname version;
sha256 = "0c1avpbr9q53yzq5ar2x485rmp9d0l3z27aham32bg7gplzd7w0j";
};
meta = with stdenv.lib; {
description = "Split large pages of a PDF into smaller ones for poster printing";
homepage = "https://pdfposter.readthedocs.io";
license = licenses.gpl3;
maintainers = with maintainers; [ wamserma ];
};
}

2
pkgs/development/python-modules/requests_download/default.nix
View file

@ -11,7 +11,7 @@ buildPythonPackage rec {
format = "wheel";
#src = pkgs.fetchurl {
# url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl;
# url = "https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl";
# sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr";
#};

22
pkgs/misc/cups/drivers/brlaser/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "brlaser";
version = "5";
version = "6";
src = fetchFromGitHub {
owner = "pdewacht";
repo = "brlaser";
rev = "v${version}";
sha256 = "133fx49wkg1v8r4kcishd035hlsscv8kc2q4jnln5qmyhpyygjyy";
sha256 = "1995s69ksq1fz0vb34v0ndiqncrinbrlpmp70rkl6az7kag99s80";
};
nativeBuildInputs = [ cmake ];
@ -34,13 +34,19 @@ stdenv.mkDerivation rec {
Brother DCP-7065DN
Brother DCP-7080
Brother DCP-L2500D
Brother DCP-L2520D
Brother DCP-L2540DW
Brother HL-1110 series
Brother HL-1200 series
Brother HL-L2300D series
Brother HL-L2320D series
Brother HL-L2340D series
Brother HL-L2360D series
Brother HL-1110
Brother HL-1200
Brother HL-2030
Brother HL-2140
Brother HL-2220
Brother HL-2270DW
Brother HL-5030
Brother HL-L2300D
Brother HL-L2320D
Brother HL-L2340D
Brother HL-L2360D
Brother MFC-1910W
Brother MFC-7240
Brother MFC-7360N

86
pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
View file

@ -1,5 +1,5 @@
diff --git a/data/meson.build b/data/meson.build
index 0667bd78..92d6c7b9 100644
index bb749fd4..b611875b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -17,7 +17,7 @@ endif
@ -12,41 +12,38 @@ index 0667bd78..92d6c7b9 100644
endif
diff --git a/data/pki/meson.build b/data/pki/meson.build
index eefcc914..dc801fa1 100644
index 94bb0b6f..1ea6a9ac 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
@@ -4,14 +4,14 @@ if get_option('gpg')
'GPG-KEY-Linux-Foundation-Firmware',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
)
@@ -3,24 +3,23 @@ install_data([
'GPG-KEY-Linux-Foundation-Firmware',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
)
install_data([
'GPG-KEY-Linux-Foundation-Metadata',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
endif
@@ -19,12 +19,12 @@ if get_option('pkcs7')
install_data([
'LVFS-CA.pem',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
)
install_data([
'LVFS-CA.pem',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
endif
install_data([
'GPG-KEY-Linux-Foundation-Metadata',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
install_data([
'LVFS-CA.pem',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
)
install_data([
'LVFS-CA.pem',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
-
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
index 826a3c1d..b78db663 100644
--- a/data/remotes.d/meson.build
@ -76,10 +73,10 @@ index 826a3c1d..b78db663 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index b1a523d2..aacb8e0a 100644
index 87ea67e5..3a4374db 100644
--- a/meson.build
+++ b/meson.build
@@ -169,6 +169,12 @@ endif
@@ -175,6 +175,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
@ -93,10 +90,10 @@ index b1a523d2..aacb8e0a 100644
gio = dependency('gio-2.0', version : '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
diff --git a/meson_options.txt b/meson_options.txt
index be0adfef..73983333 100644
index 3da9b6c4..6c80275b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -26,6 +26,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable
@@ -24,6 +24,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable
option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
@ -104,6 +101,19 @@ index be0adfef..73983333 100644
option('tests', type : 'boolean', value : true, description : 'enable tests')
option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build
index 8444bb8a..fa4a8ad1 100644
--- a/plugins/ata/meson.build
+++ b/plugins/ata/meson.build
@@ -7,7 +7,7 @@ install_data([
)
install_data(['ata.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
shared_module('fu_plugin_ata',
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
index ed4eee70..76dbdb1d 100644
--- a/plugins/dell-esrt/meson.build
@ -142,10 +152,10 @@ index 06ab34ee..297a9182 100644
# we use functions from 2.52 in the tests
if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
index 7252580d..7188d1c5 100644
index 5838cecc..9ba3d5cd 100644
--- a/plugins/uefi/meson.build
+++ b/plugins/uefi/meson.build
@@ -104,7 +104,7 @@ if get_option('man')
@@ -101,7 +101,7 @@ if get_option('man')
endif
install_data(['uefi.conf'],

75
pkgs/os-specific/linux/firmware/fwupd/default.nix
View file

@ -2,6 +2,7 @@
{ stdenv
, fetchurl
, fetchpatch
, substituteAll
, gtk-doc
, pkgconfig
@ -16,7 +17,7 @@
, glib-networking
, libsoup
, help2man
, gpgme
, libjcat
, libxslt
, elfutils
, libsmbios
@ -31,7 +32,6 @@
, docbook_xsl
, ninja
, gcab
, gnutls
, python3
, wrapGAppsHook
, json-glib
@ -87,11 +87,11 @@ in
stdenv.mkDerivation rec {
pname = "fwupd";
version = "1.3.9";
version = "1.4.0";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "ZuRG+UN8ebXv5Z8fOYWT0eCtHykGXoB8Ysu3wAeqx0A=";
sha256 = "V131/l05FKYFavRMXRaiW1bQkTCEn7MTyyD+bqYClU4=";
};
# libfwupd goes to lib
@ -130,9 +130,8 @@ stdenv.mkDerivation rec {
libyaml
libgudev
colord
gpgme
libjcat
libuuid
gnutls
glib-networking
json-glib
umockdev
@ -151,15 +150,43 @@ stdenv.mkDerivation rec {
./fix-paths.patch
./add-option-for-installation-sysconfdir.patch
# install plug-ins and libfwupdplugin to out,
# they are not really part of the library
# Install plug-ins and libfwupdplugin to out,
# they are not really part of the library.
./install-fwupdplugin-to-out.patch
# installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle
# Make it easier to patch installed-tests directory.
# https://github.com/fwupd/fwupd/pull/2002
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/2f12e38e61d982dea63778736e2b71d16f0e9925.patch";
sha256 = "goTyDj0v50FOQYCS+LhPjo0AEugubr6aBIGfO9ztZOA=";
})
# Install systemd files to our prefix.
# https://github.com/fwupd/fwupd/pull/2006
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/463db5162fe4f6fea417973ff95a44ed51ec6402.patch";
sha256 = "I0TIfnCca83QpINABUINtl8nIB78dG8OR9MC/hP2hg8=";
})
# Fix installed tests.
# https://github.com/fwupd/fwupd/issues/2007
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/c727742df3702fc934e2d9488c883dcbdfa59e9c.patch";
sha256 = "b9D2Xblf1VbpS5XZpHtwEJhzuq7+840l7skW5w0NMBU=";
})
# Fix build with bash-completion 2.10
# https://github.com/fwupd/fwupd/pull/2014
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/0f035013dfb150c2c3fc7f51090103ba84bd1c06.patch";
sha256 = "VXRf5N3inaWThudk6pc4mtp6cMEIyybkdfqKin+9XSw=";
})
# Installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
(substituteAll {
src = ./installed-tests-path.patch;
# needs a different set of modules than po/make-images
# Needs a different set of modules than po/make-images.
inherit installedTestsPython;
})
];
@ -172,14 +199,6 @@ stdenv.mkDerivation rec {
po/make-images \
po/make-images.sh \
po/test-deps
# we cannot use placeholder in substituteAll
# https://github.com/NixOS/nix/issues/1846
substituteInPlace data/installed-tests/meson.build --subst-var installedTests
substituteInPlace data/meson.build --replace \
"install_dir: systemd.get_pkgconfig_variable('systemdshutdowndir')" \
"install_dir: '${placeholder "out"}/lib/systemd/system-shutdown'"
'';
# /etc/os-release not available in sandbox
@ -203,7 +222,8 @@ stdenv.mkDerivation rec {
"-Dgtkdoc=true"
"-Dplugin_dummy=true"
"-Dudevdir=lib/udev"
"-Dsystemdunitdir=lib/systemd/system"
"-Dsystemd_root_prefix=${placeholder "out"}"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
"-Defi-libdir=${gnu-efi}/lib"
"-Defi-ldsdir=${gnu-efi}/lib"
"-Defi-includedir=${gnu-efi}/include/efi"
@ -225,23 +245,19 @@ stdenv.mkDerivation rec {
"-Dplugin_flashrom=true"
];
postInstall = ''
moveToOutput share/installed-tests "$installedTests"
wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \
--prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0"
'';
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
# error: “PolicyKit files are missing”
# https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428
PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions";
# cannot install to systemd prefix
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMPRESETDIR = "${placeholder "out"}/lib/systemd/system-preset";
# TODO: wrapGAppsHook wraps efi capsule even though it is not elf
dontWrapGApps = true;
preCheck = ''
addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share"
'';
# so we need to wrap the executables manually
postFixup = ''
find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
@ -256,6 +272,7 @@ stdenv.mkDerivation rec {
# /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module
passthru = {
filesInstalledToEtc = [
"fwupd/ata.conf"
# "fwupd/daemon.conf" # already created by the module
"fwupd/redfish.conf"
"fwupd/remotes.d/dell-esrt.conf"

27
pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
View file

@ -1,5 +1,5 @@
--- a/data/installed-tests/hardware.py
+++ b/data/installed-tests/hardware.py
--- a/data/device-tests/hardware.py
+++ b/data/device-tests/hardware.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!@installedTestsPython@/bin/python3
@ -8,18 +8,23 @@
# Copyright (C) 2017 Richard Hughes <richard@hughsie.com>
--- a/data/installed-tests/meson.build
+++ b/data/installed-tests/meson.build
@@ -1,6 +1,6 @@
con2 = configuration_data()
con2.set('installedtestsdir',
- join_paths(datadir, 'installed-tests', 'fwupd'))
+ join_paths('@installedTests@', 'share', 'installed-tests', 'fwupd'))
con2.set('bindir', bindir)
@@ -1,4 +1,4 @@
-installed_test_datadir = join_paths(datadir, 'installed-tests', 'fwupd')
+installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'fwupd')
configure_file(
@@ -52,5 +52,5 @@
con2 = configuration_data()
con2.set('installedtestsdir', installed_test_datadir)
@@ -52,5 +52,5 @@ configure_file(
output : 'fwupd-tests.conf',
configuration : con2,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths('@installedTests@', 'etc', 'fwupd', 'remotes.d'),
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent')
option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')

2
pkgs/os-specific/linux/gogoclient/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "${baseName}-${version}";
src = fetchurl {
#url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz;
#url = "http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz";
url = "https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz";
sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49";
};

4
pkgs/os-specific/linux/lxc/default.nix
View file

@ -9,11 +9,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "lxc";
version = "4.0.1";
version = "4.0.2";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
sha256 = "178kqjz0n5nnjw0z8ac5lbfpqprna9xfd9ckakp34zq9vz0smfvh";
sha256 = "1c2wbbcvs58slyq0skxizx61q1lb4yvak28x4gzsbzh3yg6nscya";
};
nativeBuildInputs = [

4
pkgs/servers/asterisk/default.nix
View file

@ -141,11 +141,11 @@ in rec {
# # provided here verbatim for the convenience of anyone wanting to build
# # Asterisk from other sources. Include in externals.
# "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl {
# url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;
# url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz";
# sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
# };
# "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl {
# url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
# url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz";
# sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538";
# };
# # TODO: Sounds for other languages could be added here

8
pkgs/tools/filesystems/fuse-overlayfs/default.nix
View file

@ -1,21 +1,21 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }:
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
version = "0.7.8";
version = "1.0.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "10wsssf9mxgkgcqks3z02y9ya8xh4wd45lsb1jrvw31wmz9zpalc";
sha256 = "0h1ay2l7zyiqplh8whanw68mcfri79lc03wjjrhqji5ddwznv6fa";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ fuse3 ];
meta = with lib; {
meta = with stdenv.lib; {
description = "FUSE implementation for overlayfs";
longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers.";
license = licenses.gpl3;

24
pkgs/tools/misc/3mux/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "3mux";
version = "0.2.0";
src = fetchFromGitHub {
owner = "aaronjanse";
repo = pname;
rev = "v${version}";
sha256 = "02ry066psvlqdyhimci7nskw4sfb70dw5z7ag7s7rz36gmx1vnmr";
};
modSha256 = "1ag9lx8xcp2z9lrg404914zin45n8f4s08365yk71q5vyiwxjj3i";
meta = with stdenv.lib; {
description = "Terminal multiplexer inspired by i3";
homepage = "https://github.com/aaronjanse/3mux";
license = licenses.mit;
maintainers = with maintainers; [ aaronjanse filalex77 ];
# TODO: fix modules build on darwin
broken = stdenv.isDarwin;
};
}

4
pkgs/tools/networking/httpie/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "httpie";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "jakubroztocil";
repo = "httpie";
rev = version;
sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0";
sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2";
};
outputs = [ "out" "doc" "man" ];

27
pkgs/tools/networking/sniffglue/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkgconfig }:
rustPlatform.buildRustPackage rec {
pname = "sniffglue";
version = "0.10.1";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
sha256 = "0vyxlqwh90shihp80fk0plnkjix9i37n2dnypzyz6nx44xd5737s";
};
cargoSha256 = "162p3a696k281cygqpl6gg4makwk2v0g2jnf1gd108dnz4jya11l";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libpcap libseccomp ];
meta = with lib; {
description = "Secure multithreaded packet sniffer";
homepage = "https://github.com/kpcyrd/sniffglue";
license = licenses.gpl3;
maintainers = with maintainers; [ xrelkd ];
platforms = platforms.linux;
};
}

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

@ -510,6 +510,8 @@ in
_3llo = callPackage ../tools/misc/3llo { };
_3mux = callPackage ../tools/misc/3mux { };
_1password = callPackage ../applications/misc/1password { };
_6tunnel = callPackage ../tools/networking/6tunnel { };
@ -6633,6 +6635,8 @@ in
libpng = libpng12;
};
sniffglue = callPackage ../tools/networking/sniffglue { };
snort = callPackage ../applications/networking/ids/snort { };
soapui = callPackage ../applications/networking/soapui { };
@ -9139,7 +9143,7 @@ in
tinycc = callPackage ../development/compilers/tinycc { };
tinygo = callPackage ../development/compilers/tinygo {
inherit (llvmPackages_9) llvm clang-unwrapped lld;
inherit (llvmPackages_10) llvm clang-unwrapped lld;
avrgcc = pkgsCross.avr.buildPackages.gcc;
};
@ -12984,6 +12988,8 @@ in
libiptcdata = callPackage ../development/libraries/libiptcdata { };
libjcat = callPackage ../development/libraries/libjcat { };
libjpeg_original = callPackage ../development/libraries/libjpeg { };
# also known as libturbojpeg
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };

2
pkgs/top-level/perl-packages.nix
View file

@ -16811,7 +16811,7 @@ let
sha256 = "f98a10c625640170cdda408cccc72bdd7f66f8ebe5f59dec1b96185171ef11d0";
};
meta = {
#homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement
#homepage = "http://web-cpan.berlios.de/modules/Statistics-Descriptive/"; # berlios shut down; I found no replacement
description = "Module of basic descriptive statistical functions";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};

2
pkgs/top-level/python-packages.nix
View file

@ -1025,6 +1025,8 @@ in {
pdfminer = callPackage ../development/python-modules/pdfminer_six { };
pdfposter = callPackage ../development/python-modules/pdfposter { };
pdftotext = callPackage ../development/python-modules/pdftotext { };
pdfx = callPackage ../development/python-modules/pdfx { };