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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-03-03 00:38:15 +00:00 committed by GitHub
commit eef2c4e401
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 192 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/stdenv/multiple-output.xml
View File

@ -154,7 +154,7 @@
</term>
<listitem>
<para>
is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to <varname>dev</varname> or <varname>out</varname> by default.
is for development-only files. These include C(++) headers (<filename>include/</filename>), pkg-config (<filename>lib/pkgconfig/</filename>), cmake (<filename>lib/cmake/</filename>) and aclocal files (<varname>share/aclocal/</varname>). They go to <varname>dev</varname> or <varname>out</varname> by default.
</para>
</listitem>
</varlistentry>
@ -164,7 +164,7 @@
</term>
<listitem>
<para>
is meant for user-facing binaries, typically residing in bin/. They go to <varname>bin</varname> or <varname>out</varname> by default.
is meant for user-facing binaries, typically residing in <filename>bin/</filename>. They go to <varname>bin</varname> or <varname>out</varname> by default.
</para>
</listitem>
</varlistentry>
@ -194,7 +194,7 @@
</term>
<listitem>
<para>
is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books, typically residing in <filename>share/gtk-doc/</filename> and <filename>share/devhelp/</filename>, in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
</para>
</listitem>
</varlistentry>
@ -204,7 +204,7 @@
</term>
<listitem>
<para>
is for man pages (except for section 3). They go to <varname>man</varname> or <varname>$outputBin</varname> by default.
is for man pages (except for section 3), typically residing in <filename>share/man/man[0-9]/</filename>. They go to <varname>man</varname> or <varname>$outputBin</varname> by default.
</para>
</listitem>
</varlistentry>
@ -214,7 +214,7 @@
</term>
<listitem>
<para>
is for section 3 man pages. They go to <varname>devman</varname> or <varname>$outputMan</varname> by default.
is for section 3 man pages, typically residing in <filename>share/man/man3/</filename>. They go to <varname>devman</varname> or <varname>$outputMan</varname> by default.
</para>
</listitem>
</varlistentry>
@ -224,7 +224,7 @@
</term>
<listitem>
<para>
is for info pages. They go to <varname>info</varname> or <varname>$outputBin</varname> by default.
is for info pages, typically residing in <filename>share/info/</filename>. They go to <varname>info</varname> or <varname>$outputBin</varname> by default.
</para>
</listitem>
</varlistentry>

7
pkgs/applications/editors/emacs/26.nix
View File

@ -1,7 +0,0 @@
import ./generic.nix (rec {
version = "26.3";
sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
patches = [
./tramp-detect-wrapped-gvfsd-26.patch
];
})

59
pkgs/applications/misc/udiskie/default.nix
View File

@ -1,37 +1,50 @@
{ lib, fetchFromGitHub, asciidoc-full, gettext
, gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg
, udisks2, wrapGAppsHook
, python3Packages
{ lib
, fetchFromGitHub
, asciidoc-full
, buildPythonApplication
, docopt
, gettext
, gobject-introspection
, gtk3
, keyutils
, libappindicator-gtk3
, libnotify
, librsvg
, nose
, pygobject3
, pyyaml
, udisks2
, wrapGAppsHook
}:
python3Packages.buildPythonApplication rec {
buildPythonApplication rec {
pname = "udiskie";
version = "2.2.0";
version = "2.3.2";
src = fetchFromGitHub {
owner = "coldfix";
repo = "udiskie";
rev = version;
sha256 = "0kn5w6bm3rmbszphzbxpjfnkawb2naa230svzkpmh3n6dcdvk4qa";
rev = "v${version}";
hash = "sha256-eucAFMzLf2RfMfVgFTfPAgVNpDADddvTUZQO/XbBhGo=";
};
nativeBuildInputs = [
asciidoc-full # Man page
gettext
asciidoc-full # For building man page.
gobject-introspection
wrapGAppsHook
];
buildInputs = [
librsvg # required for loading svg icons (udiskie uses svg icons)
gobject-introspection
libnotify
gtk3
udisks2
libappindicator-gtk3
libnotify
librsvg # Because it uses SVG icons
udisks2
];
propagatedBuildInputs = with python3Packages; [
propagatedBuildInputs = [
docopt
pygobject3
pyyaml
@ -44,7 +57,7 @@ python3Packages.buildPythonApplication rec {
cp -v doc/udiskie.8 $out/share/man/man8/
'';
checkInputs = with python3Packages; [
checkInputs = [
nose
keyutils
];
@ -54,9 +67,23 @@ python3Packages.buildPythonApplication rec {
'';
meta = with lib; {
description = "Removable disk automounter for udisks";
license = licenses.mit;
homepage = "https://github.com/coldfix/udiskie";
description = "Removable disk automounter for udisks";
longDescription = ''
udiskie is a udisks2 front-end that allows to manage removeable media such
as CDs or flash drives from userspace.
Its features include:
- automount removable media
- notifications
- tray icon
- command line tools for manual un-/mounting
- LUKS encrypted devices
- unlocking with keyfiles (requires udisks 2.6.4)
- loop devices (mounting iso archives)
- password caching (requires python keyutils 0.3)
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
};
}

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

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "89.0.4389.69",
"sha256": "09xs18jm1pvzh7qzi1cfb59bvy4qarympxxkcwj49khsxjy0y341",
"sha256bin64": "1w3vr929ssdh4q5zq5qpx7s09md99aam51j4hdslhq1ih9zva275",
"version": "89.0.4389.72",
"sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll",
"sha256bin64": "0w1972r71gp8jjr9370f9xb8v2f109mxjrsm8893sn4kbz8zmxby",
"deps": {
"gn": {
"version": "2021-01-07",

4
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.21",
"version": "1.7.22",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@ -62,7 +62,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "10.2.0",
"electronVersion": "11.2.3",
"files": [
"package.json",
{

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -8,12 +8,12 @@
let
executableName = "element-desktop";
version = "1.7.21";
version = "1.7.22";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-tpFiKaJB6KN97ipN3OCTyxpiS0b980MQ1Ynxj8CjCuI=";
sha256 = "152ggkkk997pg3xdcdzn3samv3vsb6qifgkyl82bnwchy8y3611d";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.21";
version = "1.7.22";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-JJXl+jDlXw8fZ1ZeeAACvilbqG9zanCmBsHy6BEla8M=";
sha256 = "1aaa986h38kkrnyhb1y65d73idsxmkmi201511az9zlz9210ih59";
};
installPhase = ''

5
pkgs/applications/networking/mailreaders/claws-mail/default.nix
View File

@ -34,6 +34,7 @@
, enablePluginBsfilter ? true
, enablePluginClamd ? true
, enablePluginDillo ? true
, enablePluginFancy ? useGtk3, libsoup, webkitgtk
, enablePluginFetchInfo ? true
, enablePluginLibravatar ? enablePluginRavatar
, enablePluginLitehtmlViewer ? true, gumbo
@ -87,6 +88,7 @@ let
{ flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; }
{ flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; }
{ flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; }
{ flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ libsoup webkitgtk ]; }
{ flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; }
{ flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; }
{ flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; }
@ -153,7 +155,6 @@ in stdenv.mkDerivation rec {
"--disable-jpilot" # Missing jpilot library
"--disable-gdata-plugin" # Complains about missing libgdata, even when provided
"--disable-fancy-plugin" # Missing libwebkit-1.0 library
] ++
(map (feature: map (flag: strings.enableFeature feature.enabled flag) feature.flags) features);
@ -172,7 +173,7 @@ in stdenv.mkDerivation rec {
meta = {
description = "The user-friendly, lightweight, and fast email client";
homepage = "https://www.claws-mail.org/";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ];
};

23
pkgs/applications/science/electronics/librepcb/default.nix
View File

@ -18,30 +18,25 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ];
qmakeFlags = ["-r"];
enableParallelBuilding = true;
# the build system tries to use 'git' at build time to find the HEAD hash.
# that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment
# at the end of the line to remove the git call.
postPatch = ''
substituteInPlace ./libs/librepcb/common/common.pro \
--replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # '
'';
postInstall = ''
mkdir -p $out/share/librepcb/fontobene
cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
'';
# the build system tries to use 'git' at build time to find the HEAD hash.
# that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment
# at the end of the line to remove the git call.
patchPhase = ''
substituteInPlace ./libs/librepcb/common/common.pro \
--replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # '
'';
preFixup = ''
wrapQtApp $out/bin/librepcb
'';
meta = with lib; {
description = "A free EDA software to develop printed circuit boards";
homepage = "https://librepcb.org/";
maintainers = with maintainers; [ luz thoughtpolice ];
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

4
pkgs/development/libraries/aws-c-io/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n }:
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n, Security }:
stdenv.mkDerivation rec {
pname = "aws-c-io";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ aws-c-cal aws-c-common s2n ];
buildInputs = [ aws-c-cal aws-c-common s2n] ++ lib.optionals stdenv.isDarwin [ Security ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"

21
pkgs/development/libraries/google-cloud-cpp/default.nix
View File

@ -1,4 +1,20 @@
{ lib, stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
{ lib
, stdenv
, clang-tools
, grpc
, curl
, cmake
, pkg-config
, fetchFromGitHub
, doxygen
, protobuf
, crc32c
, c-ares
, fetchurl
, openssl
, zlib
, libnsl
}:
let
googleapis = fetchFromGitHub {
owner = "googleapis";
@ -39,7 +55,7 @@ in stdenv.mkDerivation rec {
sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa";
};
buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ];
buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf libnsl ];
nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ];
outputs = [ "out" "dev" ];
@ -58,6 +74,5 @@ in stdenv.mkDerivation rec {
homepage = "https://github.com/googleapis/google-cloud-cpp";
description = "C++ Idiomatic Clients for Google Cloud Platform services";
maintainers = with maintainers; [ ];
broken = true; # Broken on Hydra since 2020-05-19
};
}

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

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "mirage-clock";
version = "3.1.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-v${version}.tbz";
sha256 = "0cqa07aqkamw0dvis1fl46brvk81zvb92iy5076ik62gv9n5a0mn";

6
pkgs/development/ocaml-modules/mirage-clock/unix.nix
View File

@ -1,9 +1,11 @@
{ buildDunePackage, mirage-clock }:
{ buildDunePackage, mirage-clock, dune-configurator }:
buildDunePackage {
pname = "mirage-clock-unix";
inherit (mirage-clock) version src;
inherit (mirage-clock) version useDune2 src;
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ mirage-clock ];

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

@ -2,13 +2,15 @@
buildPythonPackage rec {
pname = "bitarray";
version = "1.6.3";
version = "1.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "ae27ce4bef4f35b4cc2c0b0d9cf02ed49eee567c23d70cb5066ad215f9b62b3c";
sha256 = "e31b472ac92e04ea943723cf781ec168e15049d91a3052203defb81652d2b086";
};
pythonImportsCheck = [ "bitarray" ];
meta = with lib; {
description = "Efficient arrays of booleans";
homepage = "https://github.com/ilanschnell/bitarray";

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

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.17.17"; # N.B: if you change this, change botocore and awscli to a matching version
version = "1.17.18"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-RSPqs3/wBdUXQIO1k4LP1ia3iQwI1WzhYqS9kq99RN8=";
sha256 = "sha256-NXCjwPvYC8swRJ+Hz50vertn+sKl4xfQAvmSHFm+mxc=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.20.17"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.18"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-F4zjFdGf4O8z6M5nVKSC0Ano0TLFrcxFf1zx2ZqYdTs=";
sha256 = "sha256-UZALENpK5FvksWBF5bL/fRFYp5VdnXzF5am6MXDxBYY=";
};
propagatedBuildInputs = [

14
pkgs/development/python-modules/glasgow/default.nix
View File

@ -2,7 +2,8 @@
, buildPythonPackage
, fetchFromGitHub
, setuptools
, setuptools_scm
, setuptools-scm
, pythonOlder
, sdcc
, nmigen
, fx2
@ -18,18 +19,19 @@
buildPythonPackage rec {
pname = "glasgow";
version = "unstable-2020-06-29";
version = "unstable-2021-03-02";
disabled = pythonOlder "3.7";
# python software/setup.py --version
realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}";
realVersion = "0.1.dev1660+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "GlasgowEmbedded";
repo = "glasgow";
rev = "f885790d7927b893e631c33744622d6ebc18b5e3";
sha256 = "sha256-fSorSEa5K09aPEOk4XPWOFRxYl1KGVy29jOBqIvs2hk=";
rev = "41c48bbcee284d024e4249a81419fbbae674cf40";
sha256 = "1fg8ps228930d70bczwmcwnrd1gvm02a58mxbpn8pyakwbwwa6hq";
};
nativeBuildInputs = [ setuptools_scm sdcc ];
nativeBuildInputs = [ setuptools-scm sdcc ];
propagatedBuildInputs = [
setuptools

69
pkgs/development/python-modules/mitmproxy/default.nix
View File

@ -1,21 +1,25 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, buildPythonPackage
, isPy27
, fetchpatch
# Mitmproxy requirements
, pythonOlder
# Mitmproxy requirements
, asgiref
, blinker
, brotli
, certifi
, click
, cryptography
, flask
, h11
, h2
, hyperframe
, kaitaistruct
, ldap3
, msgpack
, passlib
, protobuf
, publicsuffix2
, pyasn1
, pyopenssl
, pyparsing
@ -26,45 +30,31 @@
, tornado
, urwid
, wsproto
, publicsuffix2
, zstandard
# Additional check requirements
# Additional check requirements
, beautifulsoup4
, glibcLocales
, pytest
, requests
, asynctest
, hypothesis
, parver
, pytest-asyncio
, hypothesis
, asgiref
, msgpack
, pytest-timeout
, pytest-xdist
, pytestCheckHook
, requests
}:
buildPythonPackage rec {
pname = "mitmproxy";
version = "5.3.0";
disabled = isPy27;
version = "6.0.2";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "04y7fxxssrs14i7zl7fwlwrpnms39i7a6m18481sg8vlrkbagxjr";
sha256 = "sha256-FyIZKFQtf6qvwo4+NzPa/KOmBCcdGJ3jCqxz26+S2e4=";
};
postPatch = ''
# remove dependency constraints
sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
'';
doCheck = (!stdenv.isDarwin);
checkPhase = ''
export HOME=$(mktemp -d)
pytest -k 'not test_get_version' # expects a Git repository
'';
propagatedBuildInputs = [
setuptools
# setup.py
@ -75,6 +65,7 @@ buildPythonPackage rec {
click
cryptography
flask
h11
h2
hyperframe
kaitaistruct
@ -96,17 +87,35 @@ buildPythonPackage rec {
];
checkInputs = [
asynctest
beautifulsoup4
flask
glibcLocales
hypothesis
parver
pytest
pytest-asyncio
pytest-timeout
pytest-xdist
pytestCheckHook
requests
];
doCheck = !stdenv.isDarwin;
postPatch = ''
# remove dependency constraints
sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
'';
preCheck = ''
export HOME=$(mktemp -d)
'';
disabledTests = [
# Tests require a git repository
"test_get_version"
];
pythonImportsCheck = [ "mitmproxy" ];
meta = with lib; {
description = "Man-in-the-middle proxy";
homepage = "https://mitmproxy.org/";

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

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "sagemaker";
version = "2.26.0";
version = "2.27.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CT0vXt6x+cp4yHZtfBiRq+/Aurd4Q7Zagn4lNRqji/o=";
sha256 = "sha256-1u5icjqz23j0QUToStZZMklBAYF4A1cfBqzg83MQAQI=";
};
pythonImportsCheck = [

4
pkgs/development/web/cypress/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "6.0.0";
version = "6.5.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "0hii7kp48ba07gsd521wwl288p808xr2wqgk1iidxkzj2v6g71by";
sha256 = "b4LOgNCu7zBlhpiiNFkNH/7mAYnm+OAEdxNMX2/h+3o=";
};
# don't remove runtime deps

10
pkgs/misc/emulators/stella/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "stella";
version = "6.5.1";
version = "6.5.2";
src = fetchFromGitHub {
owner = "stella-emu";
repo = pname;
rev = version;
sha256 = "2O7pN0xByEbWVL32VZw9191tG+kCMOuivJZRpXssQIw=";
hash = "sha256-CDLMOqSgRx75tjBoLycis/cckCNwgdlb9TRBlD3Dd04=";
};
nativeBuildInputs = [ pkg-config ];
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
As of its 3.5 release, Stella is officially donationware.
'';
license = licenses.gpl2;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}

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

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2021-02-21";
version = "2021-03-01";
pname = "oh-my-zsh";
rev = "9a9f3831925432fdf4352c24a002506a06d329c1";
rev = "6fbad5bf72fad4ecf30ba4d4ffee62bac582f0ed";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "befalsEX/o5WwVn0bzDnMVhlZawmpGV4AGzvxl7UHLI=";
sha256 = "1sd9lhgrig4vpdy0d1ls551gzs7y9q4hq2m0jakslqliyx5d6mpn";
};
installPhase = ''

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

@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.19.17"; # N.B: if you change this, change botocore and boto3 o a matching version too
version = "1.19.18"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-YdkkeE2POxeHgaGjp0ufzbP/Lqvt4ytStHkRZ+2KsTs=";
sha256 = "sha256-K+Q2IXMHywtyyjPz1jtkFAHy9vkSFH4znjdD+0GnU1o=";
};
# https://github.com/aws/aws-cli/issues/4837

21
pkgs/tools/misc/grc/default.nix
View File

@ -1,15 +1,15 @@
{ lib, fetchFromGitHub, python3Packages }:
{ lib, fetchFromGitHub, buildPythonApplication }:
python3Packages.buildPythonApplication rec {
buildPythonApplication rec {
pname = "grc";
version = "1.11.3";
version = "1.12";
format = "other";
src = fetchFromGitHub {
owner = "garabik";
repo = "grc";
repo = pname;
rev = "v${version}";
sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35";
sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA=";
};
postPatch = ''
@ -21,23 +21,20 @@ python3Packages.buildPythonApplication rec {
installPhase = ''
runHook preInstall
./install.sh "$out" "$out"
install -Dm444 -t $out/share/zsh/vendor-completions _grc
runHook postInstall
'';
meta = with lib; {
description = "Yet another colouriser for beautifying your logfiles or output of commands";
homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html";
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ];
platforms = platforms.unix;
description = "A generic text colouriser";
longDescription = ''
Generic Colouriser is yet another colouriser (written in Python) for
beautifying your logfiles or output of commands.
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ];
platforms = platforms.unix;
};
}

2
pkgs/tools/package-management/licensee/Gemfile.lock
View File

@ -9,7 +9,7 @@ GEM
multipart-post (>= 1.2, < 3)
ruby2_keywords
faraday-net_http (1.0.1)
licensee (9.15.0)
licensee (9.15.1)
dotenv (~> 2.0)
octokit (~> 4.20)
reverse_markdown (~> 1.0)

4
pkgs/tools/package-management/licensee/gemset.nix
View File

@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1di15x50kpqdhw1fvba4c1j6b106nfld85jxdc72xj4iyj1l6vi1";
sha256 = "1pvrz9fjvxzk3aq85zgh8dkw98kz54jmwi10k3shc8dqbrlvragy";
type = "gem";
};
version = "9.15.0";
version = "9.15.1";
};
mini_portile2 = {
groups = ["default"];

4
pkgs/tools/text/snippetpixie/default.nix
View File

@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "snippetpixie";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "bytepixie";
repo = pname;
rev = version;
sha256 = "1cb76kzw34yr1r135lyd75ddm9v99m7i3lyirm353cdch8qspfmv";
sha256 = "047ghk0zfmcsnbr4h2h5ar7g1sw2mnk8r2887v81dh3vf767rqg2";
};
nativeBuildInputs = [

2
pkgs/top-level/aliases.nix
View File

@ -166,9 +166,7 @@ mapAliases ({
emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
emacsPackagesNg = emacs.pkgs; # added 2019-08-07
emacs26Packages = emacs26.pkgs; # added 2020-12-18
emacs27Packages = emacs27.pkgs; # added 2020-12-18
emacs26WithPackages = emacs26.pkgs.withPackages; # added 2020-12-18
emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18
emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18
emacsPackages = emacs.pkgs; # added 2020-12-18

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

@ -1344,7 +1344,7 @@ in
gucci = callPackage ../tools/text/gucci { };
grc = callPackage ../tools/misc/grc { };
grc = python3Packages.callPackage ../tools/misc/grc { };
green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {
SDL = SDL_sixel;
@ -13290,7 +13290,9 @@ in
aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { };
aws-c-io = callPackage ../development/libraries/aws-c-io { };
aws-c-io = callPackage ../development/libraries/aws-c-io {
inherit (darwin.apple_sdk.frameworks) Security;
};
aws-checksums = callPackage ../development/libraries/aws-checksums { };
@ -21983,25 +21985,6 @@ in
withGTK3 = false;
}));
emacs26 = callPackage ../applications/editors/emacs/26.nix {
# use override to enable additional features
libXaw = xorg.libXaw;
Xaw3d = null;
gconf = null;
alsaLib = null;
imagemagick = null;
acl = null;
gpm = null;
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
};
emacs26-nox = lowPrio (appendToName "nox" (emacs26.override {
withX = false;
withNS = false;
withGTK2 = false;
withGTK3 = false;
}));
emacsMacport = callPackage ../applications/editors/emacs/macport.nix {
inherit (darwin.apple_sdk.frameworks)
AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
@ -24928,7 +24911,7 @@ in
udevil = callPackage ../applications/misc/udevil {};
udiskie = callPackage ../applications/misc/udiskie { };
udiskie = python3Packages.callPackage ../applications/misc/udiskie { };
sacc = callPackage ../applications/networking/gopher/sacc { };

1
pkgs/top-level/packages-config.nix
View File

@ -34,7 +34,6 @@
"nvidiaPackages"
"sourceHanPackages"
"atomPackages"
"emacs26.pkgs"
"emacs27.pkgs"
"steamPackages"
"ut2004Packages"