colin/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:
github-actions[bot] 2021-02-15 00:37:03 +00:00 committed by GitHub
commit 0630986bf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 252 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/hardware/xow.nix
View File

@ -10,7 +10,10 @@ in {
config = lib.mkIf cfg.enable {
hardware.uinput.enable = true;
boot.extraModprobeConfig = lib.readFile "${pkgs.xow}/lib/modprobe.d/xow-blacklist.conf";
systemd.packages = [ pkgs.xow ];
systemd.services.xow.wantedBy = [ "multi-user.target" ];
services.udev.packages = [ pkgs.xow ];
};

6
pkgs/applications/audio/lollypop/default.nix
View File

@ -25,7 +25,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
version = "1.4.5";
version = "1.4.16";
format = "other";
doCheck = false;
@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "1i5qcpp3fpkda08g6nkiiff8lsjmv5xsvpa0512kigq5z0lsagrx";
sha256 = "sha256-4txJ+lYx2BROjZznFwWMc+tTVpYQpPtPySfCl+Hfy+0=";
};
nativeBuildInputs = [
@ -106,7 +106,7 @@ python3.pkgs.buildPythonApplication rec {
description = "A modern music player for GNOME";
homepage = "https://wiki.gnome.org/Apps/Lollypop";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ worldofpeace lovesegfault ];
platforms = platforms.linux;
};
}

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pdfcpu";
version = "0.3.8";
version = "0.3.9";
src = fetchFromGitHub {
owner = "pdfcpu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Rx/LUp5s2DhEKuLUklYXjtTXjqBju+5YzK1hNfBCnIE=";
sha256 = "sha256-btkGn/67KVFB272j7u5MKZCeby2fyRthLLeXj8VgX7s=";
};
vendorSha256 = "sha256-/SsDDFveovJfuEdnOkxHAWccS8PJW5k9IHSxSJAgHMQ=";

24
pkgs/applications/misc/calibre/default.nix
View File

@ -21,7 +21,6 @@
, libusb1
, libmtp
, xdg-utils
, makeDesktopItem
, removeReferencesTo
}:
@ -35,13 +34,12 @@ mkDerivation rec {
};
patches = [
# Patches from Debian that:
# - disable plugin installation (very insecure)
# Plugin installation (very insecure) disabled (from Debian)
./disable_plugins.patch
# - switches the version update from enabled to disabled by default
# Automatic version update disabled by default (from Debian)
./no_updates_dialog.patch
# the unrar patch is not from debian
] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
]
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
escaped_pyqt5_dir = builtins.replaceStrings ["/"] ["\\/"] (toString python3Packages.pyqt5);
platform_tag =
@ -59,8 +57,7 @@ mkDerivation rec {
setup/build.py
# Remove unneeded files and libs
rm -rf resources/calibre-portable.* \
src/odf
rm -rf src/odf resources/calibre-portable.*
'';
dontUseQmakeConfigure = true;
@ -173,11 +170,16 @@ mkDerivation rec {
disallowedReferences = [ podofo.dev ];
meta = with lib; {
description = "Comprehensive e-book software";
homepage = "https://calibre-ebook.com";
license = with licenses; if unrarSupport then unfreeRedistributable else gpl3;
description = "Comprehensive e-book software";
longDescription = ''
calibre is a powerful and easy to use e-book manager. Users say it’s
outstanding and a must-have. It’ll allow you to do nearly everything and
it takes things a step beyond normal e-book software. It’s also completely
free and open source and great for both casual users and computer experts.
'';
license = with licenses; if unrarSupport then unfreeRedistributable else gpl3Plus;
maintainers = with maintainers; [ domenkozar pSub AndersonTorres ];
platforms = platforms.linux;
inherit version;
};
}

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "3.5.2115.87-1";
version = "3.6.2165.36-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "0m0w2sj6kdd2b67f3kfcf4qyyxhqnmi2qzjwmqpmns9a485s6bn0";
sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08";
};
unpackPhase = ''

121
pkgs/applications/networking/errbot/default.nix
View File

@ -1,75 +1,90 @@
{ lib, fetchFromGitHub, python, glibcLocales }:
{ lib
, ansi
, buildPythonApplication
, colorlog
, daemonize
, deepmerge
, dulwich
, fetchFromGitHub
, flask
, glibcLocales
, hypchat
, irc
, jinja2
, markdown
, mock
, pyasn1
, pyasn1-modules
, pygments
, pygments-markdown-lexer
, pyopenssl
, pytestCheckHook
, requests
, slackclient
, sleekxmpp
, telegram
, webtest
}:
let
py = python.override {
packageOverrides = self: super: {
# errbot requires markdown<3, and is not compatible with it either.
markdown = super.markdown.overridePythonAttrs (oldAttrs: rec {
version = "2.6.11";
src = super.fetchPypi {
pname = "Markdown";
inherit version;
sha256 = "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8";
};
});
# errbot requires slackclient 1.x, see https://github.com/errbotio/errbot/pull/1367
# latest 1.x release would be 1.3.2, but it requires an older websocket_client than the one in nixpkgs
# so let's just vendor the known-working version until they've migrated to 2.x.
slackclient = super.slackclient.overridePythonAttrs (oldAttrs: rec {
version = "1.2.1";
pname = "slackclient";
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slackclient";
rev = version;
sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0";
};
propagatedBuildInputs = with self; [ websocket_client requests six ];
checkInputs = with self; [ pytest codecov coverage mock pytestcov pytest-mock responses flake8 ];
# test_server.py fails because it needs connection (I think);
checkPhase = ''
py.test --cov-report= --cov=slackclient tests --ignore=tests/test_server.py
'';
});
};
};
in
py.pkgs.buildPythonApplication rec {
buildPythonApplication rec {
pname = "errbot";
version = "6.1.1";
version = "6.1.7";
src = fetchFromGitHub {
owner = "errbotio";
repo = "errbot";
rev = version;
sha256 = "1s4dl1za5imwsv6j3y7m47dy91hmqd5n221kkqm9ni4mpzgpffz0";
sha256 = "02h44qd3d91zy657hyqsw3gskgxg31848pw6zpb8dhd1x84z5y77";
};
LC_ALL = "en_US.utf8";
buildInputs = [ glibcLocales ];
propagatedBuildInputs = with py.pkgs; [
webtest requests jinja2 flask dulwich
pyopenssl colorlog markdown ansi pygments
daemonize pygments-markdown-lexer telegram irc slackclient
sleekxmpp pyasn1 pyasn1-modules hypchat
propagatedBuildInputs = [
ansi
colorlog
daemonize
deepmerge
dulwich
flask
hypchat
irc
jinja2
markdown
pyasn1
pyasn1-modules
pygments
pygments-markdown-lexer
pyopenssl
requests
slackclient
sleekxmpp
telegram
webtest
];
checkInputs = with py.pkgs; [ mock pytest ];
# avoid tests that do network calls
checkPhase = ''
pytest tests -k 'not backup and not broken_plugin and not plugin_cycle'
'';
checkInputs = [
mock
pytestCheckHook
];
# Slack backend test has an import issue
pytestFlagsArray = [ "--ignore=tests/backend_tests/slack_test.py" ];
disabledTests = [
"backup"
"broken_plugin"
"plugin_cycle"
];
pythonImportsCheck = [ "errbot" ];
meta = with lib; {
description = "Chatbot designed to be simple to extend with plugins written in Python";
homepage = "http://errbot.io/";
maintainers = with maintainers; [ fpletz globin ];
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.linux;
# flaky on darwin, "RuntimeError: can't start new thread"
};

9
pkgs/applications/version-management/git-and-tools/git-hub/default.nix
View File

@ -1,20 +1,19 @@
{ lib, stdenv, fetchFromGitHub, gitMinimal, python2Packages }:
{ lib, stdenv, fetchFromGitHub, gitMinimal, docutils }:
stdenv.mkDerivation rec {
pname = "git-hub";
version = "1.1.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "sociomantic-tsunami";
repo = "git-hub";
rev = "v${version}";
sha256 = "0jkzg7vjvgb952qncndhki7n70714w61flbzf4mdcjc286lqjvwb";
sha256 = "1df9l8fpbxjgcgi72fwaqxiay5kpfihyc63f0gj67mns9n9ic1i7";
};
buildInputs = [ python2Packages.python ];
nativeBuildInputs = [
gitMinimal # Used during build to generate Bash completion.
python2Packages.docutils
docutils
];
postPatch = ''

4
pkgs/data/fonts/cascadia-code/default.nix
View File

@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
version = "2009.22";
version = "2102.03";
in
fetchzip {
name = "cascadia-code-${version}";
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
sha256 = "0wdkjzaf5a14yfiqqqn6wvi6db6r7g1m5r07cg9730b0mkzhfyhl";
sha256 = "076l44cyyp3cf15qyn2hzx34kzqm73d218fgwf8n69m8a1v34hs2";
postFetch = ''
mkdir -p $out/share/fonts/

4
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
version = "3.38.3";
version = "3.38.4";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19rwgvjicfmd5zgabr5ns42rg8cqa05p8qf7684prajjna8gcclp";
sha256 = "rFPxay1R8+f/gCX5yhn0otTOOEHXKun+K7iX3ICZ1wU=";
};
patches = [

4
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-terminal";
version = "3.38.2";
version = "3.38.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "J73cnQumFMhuXstPVMdevDQV4oh6zZFEIFdUj9MgZhg=";
sha256 = "EaWw1jXxX9znUINRpRD79OkqpTMVKlD/DHhF4xAuR2Q=";
};
buildInputs = [

18
pkgs/desktops/gnome-3/extensions/arc-menu/default.nix → pkgs/desktops/gnome-3/extensions/arcmenu/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }:
stdenv.mkDerivation rec {
pname = "gnome-shell-arc-menu";
version = "47";
pname = "gnome-shell-arcmenu";
version = "5";
src = fetchFromGitLab {
owner = "arcmenu-team";
repo = "Arc-Menu";
rev = "v${version}-Stable";
sha256 = "1hhjxdm1sm9pddhkkxx532hqqiv9ghvqgn9xszg1jwhj29380fv6";
owner = "arcmenu";
repo = "ArcMenu";
rev = "v${version}";
sha256 = "1w4avvnp08l7lkf76vc7wvfn1cd81l4r4dhz8qnai49rvrjgqcg3";
};
patches = [
@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ];
uuid = "arc-menu@linxgem33.com";
uuid = "arcmenu@arcmenu.com";
meta = with lib; {
description = "Gnome shell extension designed to replace the standard menu found in Gnome 3";
description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dkabot ];
homepage = "https://gitlab.com/LinxGem33/Arc-Menu";
homepage = "https://gitlab.com/arcmenu/ArcMenu";
};
}

0
pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch → pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch
View File

10
pkgs/development/python-modules/capstone/default.nix
View File

@ -1,9 +1,10 @@
{ lib, stdenv
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, setuptools
, capstone
, fetchpatch
, fetchPypi
, setuptools
}:
buildPythonPackage rec {
@ -16,6 +17,7 @@ buildPythonPackage rec {
postPatch = ''
ln -s ${capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/
ln -s ${capstone}/lib/libcapstone.a prebuilt/
substituteInPlace setup.py --replace manylinux1 manylinux2014
'';
propagatedBuildInputs = [ setuptools ];

74
pkgs/development/python-modules/slack-sdk/default.nix Normal file
View File

@ -0,0 +1,74 @@
{ lib
, aiodns
, aiohttp
, boto3
, buildPythonPackage
, codecov
, databases
, fetchFromGitHub
, flake8
, flask-sockets
, isPy3k
, psutil
, pytest-asyncio
, pytest-cov
, pytestCheckHook
, pytestrunner
, sqlalchemy
, websocket_client
, websockets
}:
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.3.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
sha256 = "0nr1avxycvjnvg1n8r09xi4sc5h6i4b64pzfgq14l55dgi5sv1rx";
};
propagatedBuildInputs = [
aiodns
aiohttp
boto3
sqlalchemy
websocket_client
websockets
];
checkInputs = [
codecov
databases
flake8
flask-sockets
psutil
pytest-asyncio
pytest-cov
pytestCheckHook
pytestrunner
];
preCheck = ''
export HOME=$(mktemp -d)
'';
# Exclude tests that requires network features
pytestFlagsArray = [ "--ignore=integration_tests" ];
disabledTests = [
"test_start_raises_an_error_if_rtm_ws_url_is_not_returned"
"test_org_installation"
];
pythonImportsCheck = [ "slack_sdk" ];
meta = with lib; {
description = "Slack Developer Kit for Python";
homepage = "https://slack.dev/python-slack-sdk/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

26
pkgs/development/python-modules/slackclient/default.nix
View File

@ -1,15 +1,15 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, black
, buildPythonPackage
, codecov
, fetchFromGitHub
, flake8
, isPy3k
, mock
, psutil
, pytest-cov
, pytest-mock
, pytestCheckHook
, pytestcov
, pytestrunner
, requests
, responses
@ -19,15 +19,15 @@
buildPythonPackage rec {
pname = "python-slackclient";
version = "2.5.0";
version = "2.9.3";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = pname;
rev = version;
sha256 = "1ngj1mivbln19546195k400w9yaw69g0w6is7c75rqwyxr8wgzsk";
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
sha256 = "1rfb7izgddv28ag37gdnv3sd8z2zysrxs7ad8x20x690zshpaq16";
};
propagatedBuildInputs = [
@ -38,17 +38,21 @@ buildPythonPackage rec {
];
checkInputs = [
black
codecov
flake8
mock
psutil
pytest-cov
pytest-mock
pytestCheckHook
pytestcov
pytestrunner
responses
];
# Exclude tests that requires network features
pytestFlagsArray = [ "--ignore=integration_tests" ];
disabledTests = [ "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" ];
pythonImportsCheck = [ "slack" ];
meta = with lib; {

6
pkgs/development/python-modules/tubeup/default.nix
View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "tubeup";
version = "0.0.21";
version = "0.0.23";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "326a499be032bee7f7ed921d85abff4b3b4dcd2c3d6ad694f08ef98dbcef19b6";
sha256 = "d504327e055889edfe56512a829f76b24b40c5965b93120f8b9300f5390014b4";
};
postPatch = ''
@ -32,7 +32,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Youtube (and other video site) to Internet Archive Uploader";
homepage = "https://github.com/bibanon/tubeup";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = [ maintainers.marsam ];
};
}

41
pkgs/development/tools/continuous-integration/laminar/default.nix
View File

@ -8,18 +8,16 @@
, zlib
, rapidjson
, pandoc
, enableSystemd ? false
, customConfig ? null
}:
let
js.vue = fetchurl {
url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js";
sha256 = "01zklp5cyik65dfn64m8h2y2dxzgbyzgmbf99y7fwgnf0155r7pq";
url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js";
sha256 = "1hm5kci2g6n5ikrvp1kpkkdzimjgylv1xicg2vnkbvd9rb56qa99";
};
js.vue-router = fetchurl {
url =
"https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js";
sha256 = "07gx7znb30rk1z7w6ca7dlfjp44q12bbq6jghwfm27mf6psa80as";
"https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js";
sha256 = "0418waib896ywwxkxliip75zp94k3s9wld51afrqrcq70axld0c9";
};
js.ansi_up = fetchurl {
url = "https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js";
@ -29,17 +27,12 @@ let
url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js";
sha256 = "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9";
};
css.bootstrap = fetchurl {
url =
"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css";
sha256 = "11vx860prsx7wsy8b0yrrk04ih8kvrxkk8l16snsc4n286bdkyri";
};
in stdenv.mkDerivation rec {
name = "laminar";
version = "0.8";
version = "1.0";
src = fetchurl {
url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz";
sha256 = "05g73j3vpib47kr7mackcazf7s6bc3xwz4h6k7sp7yb5ng7gj20g";
sha256 = "11m6h3rdmj2rsmsryy7r40gqccj4gg1cnqwy6blscs87gx4s423g";
};
patches = [ ./patches/no-network.patch ];
nativeBuildInputs = [ cmake pandoc ];
@ -50,31 +43,23 @@ in stdenv.mkDerivation rec {
cp ${js.vue-router} js/vue-router.min.js
cp ${js.ansi_up} js/ansi_up.js
cp ${js.Chart} js/Chart.min.js
cp ${css.bootstrap} css/bootstrap.min.css
'';
postInstall = ''
mv $out/usr/share $out
mkdir $out/bin
mv $out/usr/{bin,sbin}/* $out/bin
rmdir $out/usr/{bin,sbin}
rmdir $out/usr
mv $out/usr/share/* $out/share/
rmdir $out/usr/share $out/usr
mkdir -p $out/share/doc/laminar
pandoc -s ../UserManual.md -o $out/share/doc/laminar/UserManual.html
'' + lib.optionalString (customConfig != null) ''
cp ${customConfig} /etc/etc/laminar.conf
'' + (if enableSystemd then ''
sed -i "s,/etc/,$out/etc/," $out/lib/systemd/system/laminar.service
sed -i "s,/usr/sbin/,$out/bin/," $out/lib/systemd/system/laminar.service
'' else ''
rm -r $out/lib # it contains only systemd unit file
'');
rm -rf $out/lib # remove upstream systemd units
rm -rf $out/etc # remove upstream config file
'';
meta = with lib; {
description = "Lightweight and modular continuous integration service";
homepage = "https://laminar.ohwg.net";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ kaction ];
maintainers = with maintainers; [ kaction maralorn ];
};
}

31
pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch
View File

@ -6,21 +6,36 @@ put into correct location before build phase starts.
--- laminar-0.8/CMakeLists.txt
+++ laminar-0.8-new/CMakeLists.txt
@@ -69,17 +69,6 @@
@@ -82,15 +82,6 @@
COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h'
DEPENDS src/resources/index.html)
-# Download 3rd-party frontend JS libs...
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js
- js/vue.min.js EXPECTED_MD5 ae2fca1cfa0e31377819b1b0ffef704c)
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js
- js/vue-router.min.js EXPECTED_MD5 5d3e35710dbe02de78c39e3e439b8d4e)
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js
- js/vue.min.js EXPECTED_MD5 fb192338844efe86ec759a40152fcb8e)
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js
- js/vue-router.min.js EXPECTED_MD5 5f51d4dbbf68fd6725956a5a2b865f3b)
-file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js
- js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6)
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js
- js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e)
-file(DOWNLOAD https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css
- css/bootstrap.min.css EXPECTED_MD5 5d5357cb3704e1f43a1f5bfed2aebf42)
# ...and compile them
generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js
js/ansi_up.js js/Chart.min.js css/bootstrap.min.css)
js/ansi_up.js js/Chart.min.js)
@@ -141,12 +132,12 @@
target_link_libraries(laminar-tests ${GTEST_LIBRARY} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z)
endif()
-set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files")
-set(BASH_COMPLETIONS_DIR /usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory")
-set(ZSH_COMPLETIONS_DIR /usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory")
+set(SYSTEMD_UNITDIR lib/systemd/system CACHE PATH "Path to systemd unit files")
+set(BASH_COMPLETIONS_DIR usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory")
+set(ZSH_COMPLETIONS_DIR usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory")
install(TARGETS laminard RUNTIME DESTINATION sbin)
install(TARGETS laminarc RUNTIME DESTINATION bin)
-install(FILES etc/laminar.conf DESTINATION /etc)
+install(FILES etc/laminar.conf DESTINATION etc)
install(FILES etc/laminarc-completion.bash DESTINATION ${BASH_COMPLETIONS_DIR} RENAME laminarc)
install(FILES etc/laminarc-completion.zsh DESTINATION ${ZSH_COMPLETIONS_DIR} RENAME _laminarc)

1
pkgs/misc/emulators/py65/default.nix
View File

@ -21,6 +21,5 @@ buildPythonApplication rec {
'';
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; all;
};
}

6
pkgs/misc/emulators/wine/sources.nix
View File

@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.1";
version = "6.2";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-qSwkMIxIuFG13CKh01aWpXMRxEezHsn6VD7FsKpzoUk=";
sha256 = "sha256-tmCWCaOrzGrZJ83WXHQL4BFiuAFSPg97qf1mkYALvxk=";
inherit (stable) mono gecko32 gecko64;
patches = [
@ -58,7 +58,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-uu6wvWT54Zvp86KfUcKepGxjQ6JHRQ7Yuu4yeROdHeo=";
sha256 = "sha256-swhd5gTIWTz8eEk6f78iXG8bmA3y4ynO0/wBm0/Kimk=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

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

@ -21886,9 +21886,7 @@ in
eq10q = callPackage ../applications/audio/eq10q { };
errbot = callPackage ../applications/networking/errbot {
python = python3;
};
errbot = python3Packages.callPackage ../applications/networking/errbot { };
espeak-classic = callPackage ../applications/audio/espeak { };
@ -27441,7 +27439,7 @@ in
gnomeExtensions = recurseIntoAttrs {
appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { };
arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { };
arcmenu = callPackage ../desktops/gnome-3/extensions/arcmenu { };
caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };
clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { };
@ -27480,6 +27478,7 @@ in
mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
} // lib.optionalAttrs (config.allowAliases or false) {
unite-shell = gnomeExtensions.unite; # added 2021-01-19
arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14
};
gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { };

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

@ -7261,6 +7261,8 @@ in {
skorch = callPackage ../development/python-modules/skorch { };
slack-sdk = callPackage ../development/python-modules/slack-sdk { };
slackclient = callPackage ../development/python-modules/slackclient { };
sleekxmpp = callPackage ../development/python-modules/sleekxmpp { };