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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-08-30 09:14:40 +02:00
commit 8d8146807b
41 changed files with 2041 additions and 738 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.github/workflows/editorconfig.yml vendored Normal file
View File

@ -0,0 +1,27 @@
name: "Checking EditorConfig"
on:
pull_request:
jobs:
tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: technote-space/get-diff-action@v3.1.0
- name: Fetch editorconfig-checker
if: env.GIT_DIFF
env:
ECC_VERSION: "2.1.0"
ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download"
run: |
curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \
tar xzf ec-linux-amd64.tar.gz && \
mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker
- name: Checking EditorConfig
if: env.GIT_DIFF
run: |
./bin/editorconfig-checker -disable-indentation \
${{ env.GIT_DIFF }}

5
nixos/modules/installer/tools/nixos-rebuild.sh
View File

@ -288,7 +288,10 @@ fi
if [ "$action" = edit ]; then
if [[ -z $flake ]]; then
NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)}
exec "${EDITOR:-nano}" "$NIXOS_CONFIG"
if [[ -d $NIXOS_CONFIG ]]; then
NIXOS_CONFIG=$NIXOS_CONFIG/default.nix
fi
exec ${EDITOR:-nano} "$NIXOS_CONFIG"
else
exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr"
fi

7
nixos/modules/services/misc/nix-daemon.nix
View File

@ -500,13 +500,6 @@ in
config = {
assertions = [
{
assertion = config.nix.distributedBuilds || config.nix.buildMachines == [];
message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines";
}
];
nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
nix.binaryCaches = [ "https://cache.nixos.org/" ];

2
nixos/tests/systemd-networkd.nix
View File

@ -18,7 +18,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
wireguardConfig = {
PrivateKeyFile = "/run/wg_priv";
ListenPort = 51820;
FwMark = 42;
FirewallMark = 42;
};
wireguardPeers = [ {wireguardPeerConfig={
Endpoint = "192.168.1.${peerId}:51820";

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

@ -7,11 +7,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "feh";
version = "3.4.1";
version = "3.5";
src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q";
sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq";
};
outputs = [ "out" "man" "doc" ];

43
pkgs/applications/graphics/gcolor3/default.nix
View File

@ -1,31 +1,40 @@
{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook
, fetchpatch }:
{ stdenv
, fetchFromGitLab
, meson
, ninja
, gettext
, pkg-config
, libxml2
, gtk3
, libportal
, wrapGAppsHook
}:
let
version = "2.3.1";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "gcolor3";
inherit version;
version = "2.4.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gcolor3";
rev = "v${version}";
sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU=";
};
patches = [
# Remove useage of deprecrated G_PARAM_PRIVATE
(fetchpatch {
url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch";
sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9";
})
nativeBuildInputs = [
meson
ninja
gettext
pkg-config
libxml2 # xml-stripblanks preprocessing of GResource
wrapGAppsHook
];
nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
buildInputs = [ gtk3 hicolor-icon-theme ];
buildInputs = [
gtk3
libportal
];
postPatch = ''
chmod +x meson_install.sh # patchShebangs requires executable file
@ -34,7 +43,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A simple color chooser written in GTK3";
homepage = "https://www.hjdskes.nl/projects/gcolor3/";
homepage = "https://gitlab.gnome.org/World/gcolor3";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;

21
pkgs/applications/misc/electrum/default.nix
View File

@ -3,7 +3,6 @@
, fetchFromGitHub
, wrapQtAppsHook
, python3
, python3Packages
, zbar
, secp256k1
, enableQt ? true
@ -22,6 +21,20 @@
let
version = "4.0.2";
# electrum is not compatible with dnspython 2.0.0 yet
# use the latest 1.x release instead
py = python3.override {
packageOverrides = self: super: {
dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec {
version = "1.16.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
};
});
};
};
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
else if stdenv.isDarwin then "libsecp256k1.0.dylib"
@ -45,7 +58,7 @@ let
};
in
python3Packages.buildPythonApplication {
py.pkgs.buildPythonApplication {
pname = "electrum";
inherit version;
@ -61,7 +74,7 @@ python3Packages.buildPythonApplication {
nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [
propagatedBuildInputs = with py.pkgs; [
aiohttp
aiohttp-socks
aiorpcx
@ -116,7 +129,7 @@ python3Packages.buildPythonApplication {
wrapQtApp $out/bin/electrum
'';
checkInputs = with python3Packages; [ pytest ];
checkInputs = with py.pkgs; [ pytest ];
checkPhase = ''
py.test electrum/tests

770
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

8
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -141,6 +141,14 @@ stdenv.mkDerivation ({
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
'' + lib.optionalString (lib.versionAtLeast ffversion "80") ''
substituteInPlace dom/system/IOUtils.h \
--replace '#include "nspr/prio.h"' '#include "prio.h"'
substituteInPlace dom/system/IOUtils.cpp \
--replace '#include "nspr/prio.h"' '#include "prio.h"' \
--replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \
--replace '#include "nspr/prtypes.h"' '#include "prtypes.h"'
'';
nativeBuildInputs =

12
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "79.0";
ffversion = "80.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r";
sha512 = "3rw30gs1wvd6m2sgsp1wm29rrbkxyf3jsdy8i0azfz9w7hqcfwnv76j3cdf18xghh954hpn3q6w1hr7pgab3z9zjxzyfcnh2mbabyvc";
};
patches = [
@ -35,10 +35,10 @@ rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
ffversion = "78.1.0esr";
ffversion = "78.2.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa";
sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q";
};
patches = [
@ -63,10 +63,10 @@ rec {
firefox-esr-68 = (common rec {
pname = "firefox-esr";
ffversion = "68.11.0esr";
ffversion = "68.12.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx";
sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3";
};
patches = [

4
pkgs/development/compilers/sagittarius-scheme/default.nix
View File

@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
in
stdenv.mkDerivation rec {
pname = "sagittarius-scheme";
version = "0.9.6";
version = "0.9.7";
src = fetchurl {
url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz";
sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr";
sha256 = "18pjj6f5qvixv5hbl1k4d3jqfcmi9qyx0gz0cjwrzpxa8brpwld8";
};
preBuild = ''
# since we lack rpath during build, need to explicitly add build path

8
pkgs/development/coq-modules/gappalib/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, which, coq, flocq }:
stdenv.mkDerivation {
name = "coq${coq.coq-version}-gappalib-1.4.3";
name = "coq${coq.coq-version}-gappalib-1.4.4";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz";
sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370";
url = "https://gforge.inria.fr/frs/download.php/file/38338/gappalib-coq-1.4.4.tar.gz";
sha256 = "1ds9qp3ml07w5ali0rsczlwgdx4xcgasgbcnpi2lssgj1xpxgfpn";
};
nativeBuildInputs = [ which ];
@ -24,7 +24,7 @@ stdenv.mkDerivation {
};
passthru = {
compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ];
compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" "8.12" ];
};
}

26
pkgs/development/ocaml-modules/webbrowser/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
, astring, bos, cmdliner, rresult
}:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-webbrowser-${version}";
version = "0.6.1";
src = fetchurl {
url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
buildInputs = [];
propagatedBuildInputs = [ astring bos cmdliner rresult ];
inherit (topkg) buildPhase installPhase;
meta = {
description = "Open and reload URIs in browsers from OCaml";
homepage = "https://erratique.ch/software/webbrowser";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
};
}

8
pkgs/development/python-modules/deepdiff/default.nix
View File

@ -3,6 +3,7 @@
, fetchPypi
, mock
, jsonpickle
, mmh3
, ordered-set
, numpy
, pytestCheckHook
@ -24,14 +25,9 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# skipped tests require murmur module
"test_prep_str_murmur3_64bit"
"test_prep_str_murmur3_128bit"
];
propagatedBuildInputs = [
jsonpickle
mmh3
ordered-set
];

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

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
, pytest, pytestcov, mock, Mako, decorator
, pytest, pytestcov, mock, Mako, decorator, stevedore
}:
buildPythonPackage rec {
@ -26,7 +26,7 @@ buildPythonPackage rec {
checkInputs = [ pytest pytestcov mock Mako ];
propagatedBuildInputs = [ decorator ];
propagatedBuildInputs = [ decorator stevedore ];
meta = with stdenv.lib; {
description = "A caching front-end based on the Dogpile lock";

30
pkgs/development/python-modules/lml/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, mock
}:
buildPythonPackage rec {
pname = "lml";
version = "0.0.9";
src = fetchPypi {
inherit pname version;
sha256 = "6luoF7Styen1whclzSR1+RKTO34t/fB5Ku2AB3FU9j8=";
};
checkInputs = [
nose
mock
];
checkPhase = "nosetests";
meta = {
description = "Load me later. A lazy plugin management system for Python";
homepage = "http://lml.readthedocs.io/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ jtojnar ];
};
}

23
pkgs/development/python-modules/mmh3/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib
, fetchPypi
, buildPythonPackage
}:
buildPythonPackage rec {
pname = "mmh3";
version = "2.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "0265pvfbcsijf51szsh14qk3l3zgs0rb5rbrw11zwan52yi0jlhq";
};
pythonImportsCheck = [ "mmh3" ];
meta = with lib; {
description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions";
homepage = "https://pypi.org/project/mmh3/";
license = licenses.cc0;
maintainers = [ maintainers.danieldk ];
};
}

31
pkgs/development/python-modules/pyexcel-io/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchPypi
, lml
}:
buildPythonPackage rec {
pname = "pyexcel-io";
version = "0.5.20";
src = fetchPypi {
inherit pname version;
sha256 = "CN/jlVO5ljWbFD3j2exD4ZbxE41HyrtzrwShaCG4TXk=";
};
propagatedBuildInputs = [
lml
];
# Tests depend on stuff that depends on this.
doCheck = false;
pythonImportsCheck = [ "pyexcel_io" ];
meta = {
description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases";
homepage = "http://docs.pyexcel.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ jtojnar ];
};
}

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

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, pyexcel-io
, odfpy
, nose
, pyexcel
, pyexcel-xls
, psutil
}:
buildPythonPackage rec {
pname = "pyexcel-ods";
version = "0.5.6";
src = fetchPypi {
inherit pname version;
sha256 = "O+Uv2KrdvYvJKG9+sUj0VT1MlyUtaVw6nse5XmZmoiM=";
};
propagatedBuildInputs = [
pyexcel-io
odfpy
];
checkInputs = [
nose
pyexcel
pyexcel-xls
psutil
];
checkPhase = "nosetests";
meta = {
description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy";
homepage = "http://docs.pyexcel.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ jtojnar ];
};
}

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

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, pyexcel-io
, xlrd
, xlwt
, nose
, pyexcel
, mock
}:
buildPythonPackage rec {
pname = "pyexcel-xls";
version = "0.5.9";
src = fetchPypi {
inherit pname version;
sha256 = "1Wyt6gpmBoRFaXbZgFJVTTu+KnivxfmpHIaR9iZghVU=";
};
propagatedBuildInputs = [
pyexcel-io
xlrd
xlwt
];
checkInputs = [
nose
pyexcel
mock
];
checkPhase = "nosetests";
meta = {
description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt";
homepage = "http://docs.pyexcel.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ jtojnar ];
};
}

45
pkgs/development/python-modules/pyexcel/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, lml
, pyexcel-io
, texttable
, nose
}:
buildPythonPackage rec {
pname = "pyexcel";
version = "0.6.4";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "pPNYnimHhW7SL6X6OLwagZoadTD7IdUSbO7vAqQPQu8=";
};
propagatedBuildInputs = [
lml
pyexcel-io
texttable
];
checkInputs = [
nose
];
# Tests depend on pyexcel-xls & co. causing circular dependency.
# https://github.com/pyexcel/pyexcel/blob/dev/tests/requirements.txt
doCheck = false;
pythonImportsCheck = [ "pyexcel" ];
checkPhase = "nosetests";
meta = {
description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files";
homepage = "http://docs.pyexcel.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ jtojnar ];
};
}

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

@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "pyipp";
version = "0.10.1";
version = "0.11.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "ctalkington";
repo = "python-ipp";
rev = version;
sha256 = "0y9mkrx66f4m77jzfgdgmvlqismvimb6hm61j2va7zapm8dyabvr";
sha256 = "0ar3mkyfa9qi3av3885bvacpwlxh420if9ymdj8i4x06ymzc213d";
};
propagatedBuildInputs = [

29
pkgs/development/python-modules/samsungctl/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, buildPythonPackage, fetchPypi
, websocket_client
}:
buildPythonPackage rec {
pname = "samsungctl";
version = "0.7.1";
src = fetchPypi {
inherit pname version;
sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g";
};
propagatedBuildInputs = [
websocket_client
];
# no tests
doCheck = false;
pythonImportsCheck = [ "samsungctl" ];
meta = with lib; {
description = "Remote control Samsung televisions via a TCP/IP connection";
homepage = "https://github.com/Ape/samsungctl";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}

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

@ -0,0 +1,36 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, requests
, websocket_client
}:
buildPythonPackage rec {
pname = "samsungtvws";
version = "1.5.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n";
};
patchPhase = ''
substituteInPlace setup.py --replace "websocket-client==" "websocket-client>="
'';
propagatedBuildInputs = [
websocket_client
requests
];
# no tests
doCheck = false;
pythonImportsCheck = [ "samsungtvws" ];
meta = with lib; {
description = "Samsung Smart TV WS API wrapper";
homepage = "https://github.com/xchwarze/samsung-tv-ws-api";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}

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

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "splinter";
version = "0.13.0";
version = "0.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "9e92535f273622507ac157612c3bb0e9cee7b5ccd2aa097d47b408e34c2ca356";
sha256 = "459e39e7a9f7572db6f1cdb5fdc5ccfc6404f021dccb969ee6287be2386a40db";
};
propagatedBuildInputs = [ selenium ];

28
pkgs/development/tools/dot-http/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }:
rustPlatform.buildRustPackage rec {
pname = "dot-http";
version = "0.2.0";
src = fetchFromGitHub {
owner = "bayne";
repo = pname;
rev = "v${version}";
sha256 = "1s2q4kdldhb5gd14g2h6vzrbjgbbbs9zp2dgmna0rhk1h4qv0mml";
};
cargoSha256 = "0an3hskq1k2j4gdn8wvhfb9pqsc34ibs5bv7sjznkp5jma6fdr9w";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
libiconv Security
];
meta = with stdenv.lib; {
description = "Text-based scriptable HTTP client";
homepage = "https://github.com/bayne/dot-http";
license = licenses.asl20;
maintainers = with maintainers; [ mredaelli ];
};
}

6
pkgs/development/tools/rust/cargo-make/default.nix
View File

@ -4,11 +4,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.32.3";
version = "0.32.4";
src = fetchCrate {
inherit pname version;
sha256 = "0qcwhmba83rrwqnlkcmvnmbj9jb2bwm0mka8rcp26y4yxmjm431n";
sha256 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoSha256 = "1dmcdzdm7kzmrq2xsiaikns2xzjpdmh9w8pw653nlqfjjr2h6pxp";
cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

19
pkgs/games/gemrb/default.nix
View File

@ -4,24 +4,27 @@
stdenv.mkDerivation rec {
pname = "gemrb";
version = "0.8.6";
version = "0.8.7";
src = fetchFromGitHub {
owner = "gemrb";
repo = "gemrb";
rev = "v${version}";
sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4";
owner = "gemrb";
repo = "gemrb";
rev = "v${version}";
sha256 = "14j9mhrbi4gnrbv25nlsvcxzkylijzrnwbqqnrg7pr452lb3srpb";
};
# TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional
# TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl
# reqs) optional
buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ];
nativeBuildInputs = [ cmake ];
enableParallelBuilding = true;
# TODO: add proper OpenGL support. We are currently (0.8.7) getting a shader
# error on execution when enabled.
cmakeFlags = [
"-DLAYOUT=opt"
# "-DOPENGL_BACKEND=GLES"
# "-DOpenGL_GL_PREFERENCE=GLVND"
];
meta = with stdenv.lib; {

5
pkgs/os-specific/linux/nvidia-x11/generic.nix
View File

@ -19,6 +19,9 @@
# nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux.
libsOnly ? false
, # don't include the bundled 32-bit libraries on 64-bit platforms,
# even if it’s in downloaded binary
disable32Bit ? false
}:
with stdenv.lib;
@ -30,7 +33,7 @@ assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-lin
let
nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
i686bundled = versionAtLeast version "391";
i686bundled = versionAtLeast version "391" && !disable32Bit;
libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11
pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ];

59
pkgs/servers/gonic/default.nix Normal file
View File

@ -0,0 +1,59 @@
{ lib, buildGoPackage, fetchFromGitHub
, pkg-config, taglib, alsaLib
# Disable on-the-fly transcoding,
# removing the dependency on ffmpeg.
# The server will (as of 0.11.0) gracefully fall back
# to the original file, but if transcoding is configured
# that takes a while. So best to disable all transcoding
# in the configuration if you disable transcodingSupport.
, transcodingSupport ? true, ffmpeg
# udpater
, writers, vgo2nix }:
assert transcodingSupport -> ffmpeg != null;
let
# update these, then run `updateScript` to update dependencies
version = "0.11.0";
rev = "056fb54a703ef5b5194ce112cbbdd8fb53dbb1ea";
sha256 = "0hd794wrz29nh89lfnq67w1rc23sg085rqf1agwlgpqycns2djl9";
src = fetchFromGitHub {
owner = "sentriz";
repo = "gonic";
inherit rev sha256;
};
in
buildGoPackage {
pname = "gonic-${version}";
inherit version src;
goPackagePath = "go.senan.xyz/gonic";
goDeps = ./deps.nix;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ taglib alsaLib ];
postPatch = lib.optionalString transcodingSupport ''
substituteInPlace \
server/encode/encode.go \
--replace \
'ffmpegPath = "/usr/bin/ffmpeg"' \
'ffmpegPath = "${ffmpeg}/bin/ffmpeg"' \
'';
passthru.updateScript = writers.writeDash "update-gonic" ''
${vgo2nix}/bin/vgo2nix \
-dir ${src} \
-outfile ${lib.escapeShellArg (toString ./deps.nix)}
'';
meta = {
homepage = "https://github.com/sentriz/gonic";
description = "Music streaming server / subsonic server API implementation";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ Profpatsch ];
};
}

795
pkgs/servers/gonic/deps.nix generated Normal file
View File

@ -0,0 +1,795 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "cloud.google.com/go";
fetch = {
type = "git";
url = "https://github.com/googleapis/google-cloud-go";
rev = "v0.33.1";
sha256 = "1xs487sqajpvnhlwp130sfaajyinhxxq2yvmv2533mwf0zhcpz6v";
};
}
{
goPackagePath = "dmitri.shuralyov.com/gpu/mtl";
fetch = {
type = "git";
url = "https://dmitri.shuralyov.com/gpu/mtl";
rev = "666a987793e9";
sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "v0.3.1";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
goPackagePath = "github.com/BurntSushi/xgb";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/xgb";
rev = "27f122750802";
sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj";
};
}
{
goPackagePath = "github.com/Masterminds/goutils";
fetch = {
type = "git";
url = "https://github.com/Masterminds/goutils";
rev = "v1.1.0";
sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq";
};
}
{
goPackagePath = "github.com/Masterminds/semver";
fetch = {
type = "git";
url = "https://github.com/Masterminds/semver";
rev = "v1.5.0";
sha256 = "1i169xscsxsh8lsw8bz2apnsqixld37xdnfh36i30xy5wnf0iwfx";
};
}
{
goPackagePath = "github.com/Masterminds/sprig";
fetch = {
type = "git";
url = "https://github.com/Masterminds/sprig";
rev = "v2.22.0";
sha256 = "09dzwhj4zh3p6f1jhyic16n4qdnvpamz7hyk9fycpm4b1jfq63gd";
};
}
{
goPackagePath = "github.com/OneOfOne/xxhash";
fetch = {
type = "git";
url = "https://github.com/OneOfOne/xxhash";
rev = "v1.2.2";
sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6";
};
}
{
goPackagePath = "github.com/cespare/xxhash";
fetch = {
type = "git";
url = "https://github.com/cespare/xxhash";
rev = "v1.1.0";
sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x";
};
}
{
goPackagePath = "github.com/d4l3k/messagediff";
fetch = {
type = "git";
url = "https://github.com/d4l3k/messagediff";
rev = "7e0a312ae40b";
sha256 = "1ab2gm7ys33rs84fjzqcb7b4jy2rr1a0w5a9kakfaf80wd0rjrah";
};
}
{
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/denisenkom/go-mssqldb";
fetch = {
type = "git";
url = "https://github.com/denisenkom/go-mssqldb";
rev = "732737034ffd";
sha256 = "0k1inn33lbfj97d5ir3k5gffjcpb39kairq91jfrz6pnbq0w3zlf";
};
}
{
goPackagePath = "github.com/disintegration/imaging";
fetch = {
type = "git";
url = "https://github.com/disintegration/imaging";
rev = "v1.6.2";
sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5";
};
}
{
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/erikstmartin/go-testdb";
fetch = {
type = "git";
url = "https://github.com/erikstmartin/go-testdb";
rev = "8d10e4a1bae5";
sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq";
};
}
{
goPackagePath = "github.com/faiface/beep";
fetch = {
type = "git";
url = "https://github.com/faiface/beep";
rev = "v1.0.2";
sha256 = "07j0k0ynw1q8f7fzsan4kvfmdlda11583sck66hxfsk9zbp8vpxv";
};
}
{
goPackagePath = "github.com/gdamore/encoding";
fetch = {
type = "git";
url = "https://github.com/gdamore/encoding";
rev = "v1.0.0";
sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
};
}
{
goPackagePath = "github.com/gdamore/tcell";
fetch = {
type = "git";
url = "https://github.com/gdamore/tcell";
rev = "v1.1.1";
sha256 = "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d";
};
}
{
goPackagePath = "github.com/go-audio/audio";
fetch = {
type = "git";
url = "https://github.com/go-audio/audio";
rev = "v1.0.0";
sha256 = "05ai13yc8wwk2zlk9br62lh4z9hs1q685l7ij618bknf449vjsf3";
};
}
{
goPackagePath = "github.com/go-audio/riff";
fetch = {
type = "git";
url = "https://github.com/go-audio/riff";
rev = "v1.0.0";
sha256 = "0wg3p3gsad1rql7bzx7pwwsyd00a5gdb8f1h7zfr7hlqja5skwb4";
};
}
{
goPackagePath = "github.com/go-audio/wav";
fetch = {
type = "git";
url = "https://github.com/go-audio/wav";
rev = "v1.0.0";
sha256 = "058mgc5ahjibnsqayk3k75l04gg9mv27bpmj79jyrya3kaczpamk";
};
}
{
goPackagePath = "github.com/go-gl/glfw";
fetch = {
type = "git";
url = "https://github.com/go-gl/glfw";
rev = "6f7a984d4dc4";
sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq";
};
}
{
goPackagePath = "github.com/go-sql-driver/mysql";
fetch = {
type = "git";
url = "https://github.com/go-sql-driver/mysql";
rev = "v1.5.0";
sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v";
};
}
{
goPackagePath = "github.com/gofrs/uuid";
fetch = {
type = "git";
url = "https://github.com/gofrs/uuid";
rev = "v3.2.0";
sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz";
};
}
{
goPackagePath = "github.com/golang-sql/civil";
fetch = {
type = "git";
url = "https://github.com/golang-sql/civil";
rev = "cb61b32ac6fe";
sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "v1.2.0";
sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
};
}
{
goPackagePath = "github.com/google/go-cmp";
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "v0.2.0";
sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
};
}
{
goPackagePath = "github.com/google/uuid";
fetch = {
type = "git";
url = "https://github.com/google/uuid";
rev = "v1.1.1";
sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
};
}
{
goPackagePath = "github.com/gopherjs/gopherjs";
fetch = {
type = "git";
url = "https://github.com/gopherjs/gopherjs";
rev = "0210a2f0f73c";
sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j";
};
}
{
goPackagePath = "github.com/gopherjs/gopherwasm";
fetch = {
type = "git";
url = "https://github.com/gopherjs/gopherwasm";
rev = "v1.0.0";
sha256 = "0q20il68gqnrc0s8jndc8mw1ynln60a4xy1lrqakzmp8whyilwri";
};
}
{
goPackagePath = "github.com/gorilla/context";
fetch = {
type = "git";
url = "https://github.com/gorilla/context";
rev = "v1.1.1";
sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
};
}
{
goPackagePath = "github.com/gorilla/mux";
fetch = {
type = "git";
url = "https://github.com/gorilla/mux";
rev = "v1.7.4";
sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh";
};
}
{
goPackagePath = "github.com/gorilla/securecookie";
fetch = {
type = "git";
url = "https://github.com/gorilla/securecookie";
rev = "v1.1.1";
sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410";
};
}
{
goPackagePath = "github.com/gorilla/sessions";
fetch = {
type = "git";
url = "https://github.com/gorilla/sessions";
rev = "v1.2.0";
sha256 = "1kz6ydgp7vamhl2ak02hvzp2yv1dbfbwzsdxn6271lyzzdvz4pp1";
};
}
{
goPackagePath = "github.com/hajimehoshi/go-mp3";
fetch = {
type = "git";
url = "https://github.com/hajimehoshi/go-mp3";
rev = "v0.2.1";
sha256 = "0dxqpyj4xbq570if25g5wqbbp6frhq733h2ny3b2z3z8hw4q7vgg";
};
}
{
goPackagePath = "github.com/hajimehoshi/oto";
fetch = {
type = "git";
url = "https://github.com/hajimehoshi/oto";
rev = "v0.6.1";
sha256 = "1k3c0y8gdxn2c8fqc8rbjrn7nbbbhii3krma267jg01qq2zpsm8h";
};
}
{
goPackagePath = "github.com/huandu/xstrings";
fetch = {
type = "git";
url = "https://github.com/huandu/xstrings";
rev = "v1.3.1";
sha256 = "0j5vsyjxclk7g7vfr3mfybbimywf3khr8yx07dsdcm1zjwb092iy";
};
}
{
goPackagePath = "github.com/icza/bitio";
fetch = {
type = "git";
url = "https://github.com/icza/bitio";
rev = "v1.0.0";
sha256 = "1c4ps4a9khx2bqp6v0p7b7l0s0gly3vj8rkh816vznj4mdlgk76w";
};
}
{
goPackagePath = "github.com/icza/mighty";
fetch = {
type = "git";
url = "https://github.com/icza/mighty";
rev = "cfd07d671de6";
sha256 = "09prb460wqg72s753g3a9rm0ph60hp83najj0lx9ifp1lixnfb3d";
};
}
{
goPackagePath = "github.com/imdario/mergo";
fetch = {
type = "git";
url = "https://github.com/imdario/mergo";
rev = "v0.3.9";
sha256 = "042v7bzx575isa4pr868hrlv085qxpg8qi4m04jnkh5vbq4hvs90";
};
}
{
goPackagePath = "github.com/jfreymuth/oggvorbis";
fetch = {
type = "git";
url = "https://github.com/jfreymuth/oggvorbis";
rev = "v1.0.0";
sha256 = "0c0r63sp4q8bl8vvgayr98m0fsscl1f65cd2h7i4cr1awg6r6l6a";
};
}
{
goPackagePath = "github.com/jfreymuth/vorbis";
fetch = {
type = "git";
url = "https://github.com/jfreymuth/vorbis";
rev = "v1.0.0";
sha256 = "16gl1lwagiqw6ib48zsl4zpv1dmykz7fzhxc65vpcdipx2byhi7a";
};
}
{
goPackagePath = "github.com/jinzhu/gorm";
fetch = {
type = "git";
url = "https://github.com/jinzhu/gorm";
rev = "v1.9.12";
sha256 = "06d25jvrqvp1bd4k7mh9gsk414d2vhpr049qvj46yx21hyv9d6v3";
};
}
{
goPackagePath = "github.com/jinzhu/inflection";
fetch = {
type = "git";
url = "https://github.com/jinzhu/inflection";
rev = "v1.0.0";
sha256 = "165i20d11s03771gi43skl66salxj36212r25fbs0cgr4qgfj7fy";
};
}
{
goPackagePath = "github.com/jinzhu/now";
fetch = {
type = "git";
url = "https://github.com/jinzhu/now";
rev = "v1.0.1";
sha256 = "1b4gyw01b3rq3js43n0wqb1k2iymb2mnpdv7vapjs0lsbm4g5q1p";
};
}
{
goPackagePath = "github.com/joho/godotenv";
fetch = {
type = "git";
url = "https://github.com/joho/godotenv";
rev = "v1.3.0";
sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
};
}
{
goPackagePath = "github.com/josephburnett/jd";
fetch = {
type = "git";
url = "https://github.com/josephburnett/jd";
rev = "aa1a7c66b42f";
sha256 = "0yjdnifwxhdgzcw4jkal3f69sgcjrdiscd5wg45d83zfrsqbb34c";
};
}
{
goPackagePath = "github.com/karrick/godirwalk";
fetch = {
type = "git";
url = "https://github.com/karrick/godirwalk";
rev = "v1.15.6";
sha256 = "0i8202kcihz2hvqp7zzbla5p9x2ljpbjg5zy5dy3x0capz0ina3c";
};
}
{
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/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
rev = "v1.3.0";
sha256 = "0bfravwqyj7z6v4lhsibbmgp7lajdydy4ij6c81g8hv0067x2mqw";
};
}
{
goPackagePath = "github.com/lucasb-eyer/go-colorful";
fetch = {
type = "git";
url = "https://github.com/lucasb-eyer/go-colorful";
rev = "12d3b2882a08";
sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "v0.0.4";
sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
};
}
{
goPackagePath = "github.com/mattn/go-sqlite3";
fetch = {
type = "git";
url = "https://github.com/mattn/go-sqlite3";
rev = "v2.0.3";
sha256 = "0gn4dgvwmbf8gmhn5nzpwixc39g8mkp3n8lhyjgvhvsl72llcdzv";
};
}
{
goPackagePath = "github.com/mewkiz/flac";
fetch = {
type = "git";
url = "https://github.com/mewkiz/flac";
rev = "v1.0.6";
sha256 = "19083pfc6wxkb45s61di9a542jslcgkzif5z3qjymy085w4aizzx";
};
}
{
goPackagePath = "github.com/mewkiz/pkg";
fetch = {
type = "git";
url = "https://github.com/mewkiz/pkg";
rev = "f6b5e26764c3";
sha256 = "0djxw953sp2cwqybjxsfrsfma5yjn8n1l19g8yrd629cb6r1ghq2";
};
}
{
goPackagePath = "github.com/mitchellh/copystructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/copystructure";
rev = "v1.0.0";
sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr";
};
}
{
goPackagePath = "github.com/mitchellh/go-wordwrap";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-wordwrap";
rev = "v1.0.0";
sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf";
};
}
{
goPackagePath = "github.com/mitchellh/reflectwalk";
fetch = {
type = "git";
url = "https://github.com/mitchellh/reflectwalk";
rev = "v1.0.1";
sha256 = "0pa6a3nhzwv5s5yqcmsmsfhdp5ggxsg2wa86f3akawxrhrkjarnx";
};
}
{
goPackagePath = "github.com/nicksellen/audiotags";
fetch = {
type = "git";
url = "https://github.com/nicksellen/audiotags";
rev = "94015fa599bd";
sha256 = "1817vw2j1lnk4y3925cszmkvwzsdcmgccrcdqyq39jqpwawl2c0j";
};
}
{
goPackagePath = "github.com/oklog/run";
fetch = {
type = "git";
url = "https://github.com/oklog/run";
rev = "v1.1.0";
sha256 = "0r55p3kgdkgw55i33lqvvvl60mjp92mhd1170m980sw98z9150jk";
};
}
{
goPackagePath = "github.com/oxtoacart/bpool";
fetch = {
type = "git";
url = "https://github.com/oxtoacart/bpool";
rev = "03653db5a59c";
sha256 = "1crdgm5w6kvcnvdglrrnrfkh5h60ldafwvrv00q97lz3790kgb15";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "v1.6.0";
sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq";
};
}
{
goPackagePath = "github.com/peterbourgon/ff";
fetch = {
type = "git";
url = "https://github.com/peterbourgon/ff";
rev = "v1.7.0";
sha256 = "17msscfi4pfdih1w3sq0wsw6246a30fckga9kvjpzwva6jni0466";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "v0.9.1";
sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq";
};
}
{
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/rainycape/unidecode";
fetch = {
type = "git";
url = "https://github.com/rainycape/unidecode";
rev = "cb7f23ec59be";
sha256 = "1wvzdijd640blwkgmw6h09frkfa04kcpdq87n2zh2ymj1dzla5v5";
};
}
{
goPackagePath = "github.com/spaolacci/murmur3";
fetch = {
type = "git";
url = "https://github.com/spaolacci/murmur3";
rev = "f09979ecbc72";
sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
};
}
{
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.3.0";
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
};
}
{
goPackagePath = "github.com/wader/gormstore";
fetch = {
type = "git";
url = "https://github.com/wader/gormstore";
rev = "65a111a20c23";
sha256 = "0dnylv4gdqsizll7b07nivv6chanqm0014yhqg6gcjccns6bl9bm";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "06a226fb4e37";
sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5";
};
}
{
goPackagePath = "golang.org/x/exp";
fetch = {
type = "git";
url = "https://go.googlesource.com/exp";
rev = "00229845015e";
sha256 = "0b0f05vbxzbgaaawxqns2m9qbvkfam1ylq8c8yhv7h6jnk2afaff";
};
}
{
goPackagePath = "golang.org/x/image";
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
rev = "33d19683fad8";
sha256 = "16qw6s9qlv84x98s9dib90y97x8bli3msaqw8kz498dbnbyx59zk";
};
}
{
goPackagePath = "golang.org/x/mobile";
fetch = {
type = "git";
url = "https://go.googlesource.com/mobile";
rev = "4c31acba0007";
sha256 = "0k42pn6fq886k9hn85wbgg4h4y1myj7niw0746sn50zfbrmy3s2c";
};
}
{
goPackagePath = "golang.org/x/mod";
fetch = {
type = "git";
url = "https://go.googlesource.com/mod";
rev = "331c550502dd";
sha256 = "0942gzs6mlsjal4drjmm8gr54pj1cdhsl9mnj3ygm200mf3fj6pi";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "3b0461eec859";
sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "112230192c58";
sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "fe76b779f299";
sha256 = "0g6j3n9fdv1a2lp2i8wbaaya85yrbfx3ns6iq1s7l2ayhxxmgh6b";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "b753a1ba74fa";
sha256 = "1xyzswbz9cx0bns2n75fw9pbm82dk9dj2il9iknmryyxvci9n5zv";
};
}
{
goPackagePath = "golang.org/x/xerrors";
fetch = {
type = "git";
url = "https://go.googlesource.com/xerrors";
rev = "1b5146add898";
sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "v1.4.0";
sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn";
};
}
{
goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1";
fetch = {
type = "git";
url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1";
rev = "v1.3.0";
sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv";
};
}
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "788fd7840127";
sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
};
}
{
goPackagePath = "gopkg.in/gormigrate.v1";
fetch = {
type = "git";
url = "https://gopkg.in/gormigrate.v1";
rev = "v1.6.0";
sha256 = "03304vh58i5gxchrxy2v91bjdfgp7849jarmlanz3gaa2r574fmf";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.4";
sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2";
};
}
]

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

File diff suppressed because it is too large Load Diff

4
pkgs/servers/home-assistant/default.nix
View File

@ -75,7 +75,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "0.114.3";
hassVersion = "0.114.4";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -94,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "1fn93vac9vi1wcbq8z9pc2cdvfdkkxpam2qhv5ni14wrmnjc4305";
sha256 = "0k9px4ny0b72d9ysr3x72idprgfgjab1z91ildr87629826bb4n7";
};
postPatch = ''

11
pkgs/servers/home-assistant/parse-requirements.py
View File

@ -113,6 +113,10 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional
# instead of python-3.6-python-mpd2 inside Nixpkgs
if req.startswith("python-") or req.startswith("python_"):
names.append(req[len("python-") :])
# Add name variant without extra_require, e.g. samsungctl
# instead of samsungctl[websocket]
if req.endswith("]"):
names.append(req[:req.find("[")])
for name in names:
# treat "-" and "_" equally
name = re.sub("[-_]", "[-_]", name)
@ -173,9 +177,10 @@ def main() -> None:
f.write(" components = {\n")
for component, deps in build_inputs.items():
available, missing = deps
f.write(f' "{component}" = ps: with ps; [ ')
f.write(" ".join(available))
f.write("];")
f.write(f' "{component}" = ps: with ps; [')
if available:
f.write(" " + " ".join(available))
f.write(" ];")
if len(missing) > 0:
f.write(f" # missing inputs: {' '.join(missing)}")
f.write("\n")

6
pkgs/tools/misc/lsd/default.nix
View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "lsd";
version = "0.17.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = "Peltoche";
repo = pname;
rev = version;
sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai";
sha256 = "006fy87jrb77cpa6bywchcvq1p74vlpy151q1j4nsj8npbr02krj";
};
cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr";
cargoSha256 = "0mrvcca9y0vylcrbfxxba45v05qxd8z91vb4in88px60xah0dy3q";
nativeBuildInputs = [ installShellFiles ];
postInstall = ''

33
pkgs/tools/misc/somafm-cli/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv
, fetchFromGitHub
, makeWrapper
, curl
, jq
, mpv
}:
stdenv.mkDerivation rec {
pname = "somafm-cli";
version = "0.3.1";
src = fetchFromGitHub {
owner = "rockymadden";
repo = "somafm-cli";
rev = "v${version}";
sha256 = "1h5p9qsczgfr450sklh2vkllcpzb7nicbs8ciyvkavh3d7hds0yy";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
install -m0755 -D src/somafm $out/bin/somafm
wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}";
'';
meta = with stdenv.lib; {
description = "Listen to SomaFM in your terminal via pure bash";
homepage = "https://github.com/rockymadden/somafm-cli";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

4
pkgs/tools/networking/wireguard-tools/default.nix
View File

@ -13,11 +13,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "1.0.20200820";
version = "1.0.20200827";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
sha256 = "138pf23x39xm68pa4ks3g76axphl8pz5jw4fyi54wi7rvxclybc7";
sha256 = "1d8rs1g6zy3kz327cc3hzkk5a44278x9p32gxasz6i94bq0b2bs3";
};
outputs = [ "out" "man" ];

4
pkgs/tools/package-management/nixpkgs-review/default.nix
View File

@ -8,13 +8,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "nixpkgs-review";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = "nixpkgs-review";
rev = version;
sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli";
sha256 = "0kca4442mla8j9980gi8kgp0vgm0f15hcjd0w0wdj8rlmkx9yf2l";
};
makeWrapperArgs = [

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

@ -985,6 +985,10 @@ in
dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { };
dot-http = callPackage ../development/tools/dot-http {
inherit (darwin.apple_sdk.frameworks) Security;
};
doona = callPackage ../tools/security/doona { };
ecdsautils = callPackage ../tools/security/ecdsautils { };
@ -20738,6 +20742,8 @@ in
gollum = callPackage ../applications/misc/gollum { };
gonic = callPackage ../servers/gonic { };
googleearth = callPackage ../applications/misc/googleearth { };
google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; };
@ -25644,6 +25650,8 @@ in
snpeff = callPackage ../applications/science/biology/snpeff { };
somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { };
somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { };
sortmerna = callPackage ../applications/science/biology/sortmerna { };

2
pkgs/top-level/ocaml-packages.nix
View File

@ -955,6 +955,8 @@ let
wasm = callPackage ../development/ocaml-modules/wasm { };
webbrowser = callPackage ../development/ocaml-modules/webbrowser { };
webmachine = callPackage ../development/ocaml-modules/webmachine { };
wtf8 = callPackage ../development/ocaml-modules/wtf8 { };

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

@ -3704,6 +3704,10 @@ in {
samplerate = callPackage ../development/python-modules/samplerate { };
samsungctl = callPackage ../development/python-modules/samsungctl { };
samsungtvws = callPackage ../development/python-modules/samsungtvws { };
screeninfo = callPackage ../development/python-modules/screeninfo { };
ssdeep = callPackage ../development/python-modules/ssdeep { };
@ -4693,6 +4697,8 @@ in {
inherit (pkgs) fuse pkgconfig; # use "real" fuse and pkgconfig, not the python modules
};
lml = callPackage ../development/python-modules/lml { };
locustio = callPackage ../development/python-modules/locustio { };
llvmlite = callPackage ../development/python-modules/llvmlite {
@ -5574,6 +5580,14 @@ in {
pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; };
pyexcel = callPackage ../development/python-modules/pyexcel { };
pyexcel-io = callPackage ../development/python-modules/pyexcel-io { };
pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { };
pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { };
pyexcelerator = callPackage ../development/python-modules/pyexcelerator { };
pyext = callPackage ../development/python-modules/pyext { };
@ -7619,6 +7633,8 @@ in {
ftfy = callPackage ../development/python-modules/ftfy { };
mmh3 = callPackage ../development/python-modules/mmh3 { };
murmurhash = callPackage ../development/python-modules/murmurhash { };
pkuseg = callPackage ../development/python-modules/pkuseg { };