mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-20 02:55:39 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
def2d62aea
@ -2,13 +2,13 @@
|
||||
|
||||
let
|
||||
pname = "anytype";
|
||||
version = "0.25.4";
|
||||
version = "0.26.1";
|
||||
name = "Anytype-${version}";
|
||||
nameExecutable = pname;
|
||||
src = fetchurl {
|
||||
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
|
||||
name = "Anytype-${version}.AppImage";
|
||||
sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM=";
|
||||
sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
in
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "debian-goodies";
|
||||
version = "0.87";
|
||||
version = "0.88";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "debian-goodies";
|
||||
rev = "debian/${version}";
|
||||
sha256 = "sha256-7O2AY7tWYiOIy4ImFBxWu6S+ljc3VmqS/j4KyEzVVIA=";
|
||||
sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megacmd";
|
||||
version = "1.5.0c";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meganz";
|
||||
repo = "MEGAcmd";
|
||||
rev = "${version}_Linux";
|
||||
sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE=";
|
||||
sha256 = "sha256-qOXw/KGt3DyWQGBe/pbMujQITCMItHobxuK+1r00ZIs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chatty";
|
||||
version = "0.6.4";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "source.puri.sm";
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "chatty";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-uDuSx+tWv6DV93/99QUcUKZaWA9kNW8phHZhetYlG/M=";
|
||||
hash = "sha256-vwgXfoyZOCSMnRAB6bFSrtYlSrpMa9OOcmxYTqhU+lA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "XMPP and SMS messaging via libpurple and ModemManager";
|
||||
homepage = "https://source.puri.sm/Librem5/chatty";
|
||||
changelog = "https://source.puri.sm/Librem5/chatty/-/blob/${src.rev}/NEWS";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda tomfitzhenry ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pname, version, src, meta, stdenv, binaryName, desktopName, undmg }:
|
||||
{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src meta;
|
||||
@ -8,7 +8,15 @@ stdenv.mkDerivation {
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
cp -r "${desktopName}.app" $out/Applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.strings.optionalString (openasar != null) ''
|
||||
cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ branch ? "stable", pkgs, lib, stdenv }:
|
||||
{ branch ? "stable", callPackage, fetchurl, lib, stdenv, withOpenASAR ? false }:
|
||||
let
|
||||
inherit (pkgs) callPackage fetchurl;
|
||||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.18";
|
||||
ptb = "0.0.29";
|
||||
@ -62,8 +61,11 @@ let
|
||||
++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ];
|
||||
};
|
||||
package = if stdenv.isLinux then ./linux.nix else ./darwin.nix;
|
||||
|
||||
openasar = if withOpenASAR then callPackage ./openasar.nix { } else null;
|
||||
|
||||
packages = (builtins.mapAttrs
|
||||
(_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; }))
|
||||
(_: value: callPackage package (value // { inherit src version openasar; meta = meta // { mainProgram = value.binaryName; }; }))
|
||||
{
|
||||
stable = rec {
|
||||
pname = "discord";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook
|
||||
{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook
|
||||
, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk
|
||||
, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf
|
||||
, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11
|
||||
@ -72,6 +72,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,opt/${binaryName},share/pixmaps,share/icons/hicolor/256x256/apps}
|
||||
mv * $out/opt/${binaryName}
|
||||
|
||||
@ -95,6 +97,12 @@ stdenv.mkDerivation rec {
|
||||
ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png
|
||||
|
||||
ln -s "${desktopItem}/share/applications" $out/share/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.strings.optionalString (openasar != null) ''
|
||||
cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "unstable-2022-06-10";
|
||||
pname = "openasar";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GooseMod";
|
||||
repo = "OpenAsar";
|
||||
rev = "c6f2f5eb7827fea14cb4c54345af8ff6858c633a";
|
||||
sha256 = "m6e/WKGgkR8vjKcHSNdWE25MmDQM1Z3kgB24OJgbw/w=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
bash scripts/injectPolyfills.sh
|
||||
substituteInPlace src/index.js --replace 'nightly' '${version}'
|
||||
${nodejs}/bin/node scripts/strip.js
|
||||
${nodePackages.asar}/bin/asar pack src app.asar
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install app.asar $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source alternative of Discord desktop's \"app.asar\".";
|
||||
homepage = "https://openasar.dev";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pedrohlc ];
|
||||
platforms = nodejs.meta.platforms;
|
||||
};
|
||||
}
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "threema-desktop";
|
||||
version = "1.2.0";
|
||||
version = "1.2.13";
|
||||
|
||||
src = fetchurl {
|
||||
# As Threema only offers a Latest Release url, the plan is to upload each
|
||||
# new release url to web.archive.org until their Github releases page gets populated.
|
||||
url = "https://web.archive.org/web/20220408213031if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";
|
||||
sha256 = "7c8e1e76ad82a0cf776eb8b0a683a41a00dc8752bb79a24b0ae9d795fdedcde6";
|
||||
url = "https://web.archive.org/web/20220621152620id_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";
|
||||
sha256 = "sha256-X16GMxUIKUloj0FxhzWQKUBf4zwfSBVg0cwLgGxHPHE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Fg99ugaqH/jL3KUZ5Vh/SJnqzEyOaR/KuPFwt2oqXxM=";
|
||||
sha256 = "sha256-D3+qDWxg3e5/3UIMz8FZDuxmQHmTv0NJVT/otGYedtw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7uNQNO+EI90J2Btz2tnumKqd+AtVWON+Csh6tkTNKNA=";
|
||||
vendorSha256 = "sha256-WxLQfu65Gr+ao/pM8B2uiS88sNT72Klhz7ZIrEadW5g=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20220528180904";
|
||||
version = "20220624025859";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
sha256 = "sha256-j1Q7B/U0OADOcgJRJ269Jx9Z5dmmT4T2eaOHeGmUjmc=";
|
||||
sha256 = "sha256-/4wfTtRsBzOCbx3I3H28tB935xDZPPwHOFFmjiV7kEI=";
|
||||
};
|
||||
vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo=";
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202205260055";
|
||||
version = "202206230045";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "96f4639373709f7560ccaf374d1ff008781aa324";
|
||||
sha256 = "sha256-aFTLeYr+JishhJ2AhGMrD02fKxci2rREkh8HN9HtXLs=";
|
||||
rev = "2e2aba7f3dfb4139e8a882f85350045f2ef522d1";
|
||||
sha256 = "sha256-WFvS51RmkAWivYj0HFAT6S3euJk+GSYLDTN3cmkcCNs=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -42,7 +42,7 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "egl-wayland";
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "Nvidia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-rcmGVEcOtKTR8sVkHV7Xb+8NuKWUapYn+/Fswi4z6Mc=";
|
||||
sha256 = "sha256-dbcEMtPnzF2t7O8YtKVUGSvJqb5WPMmmW+SyqOFnDY4=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-debug-toolbar";
|
||||
version = "3.4";
|
||||
version = "3.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "jazzband";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tXQZcQvdGEtcIAtER1s2HSVkGHW0sdrnC+i01+RuSXg=";
|
||||
hash = "sha256-OZWO3tXZ+p+zKtQHCkj0kGSXpDFHFV+HqSgiJvLmMTg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -44,10 +44,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A robust email syntax and deliverability validation library for Python 2.x/3.x.";
|
||||
description = "A robust email syntax and deliverability validation library";
|
||||
homepage = "https://github.com/JoshData/python-email-validator";
|
||||
license = licenses.cc0;
|
||||
maintainers = with maintainers; [ siddharthist ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, aiosmtplib
|
||||
, blinker
|
||||
, buildPythonPackage
|
||||
, email_validator
|
||||
, email-validator
|
||||
, fakeredis
|
||||
, fastapi
|
||||
, fetchFromGitHub
|
||||
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
||||
aioredis
|
||||
aiosmtplib
|
||||
blinker
|
||||
email_validator
|
||||
email-validator
|
||||
fakeredis
|
||||
fastapi
|
||||
httpx
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, arrow
|
||||
, buildPythonPackage
|
||||
, colour
|
||||
, email_validator
|
||||
, email-validator
|
||||
, enum34
|
||||
, fetchPypi
|
||||
, flask
|
||||
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
||||
checkInputs = [
|
||||
arrow
|
||||
colour
|
||||
email_validator
|
||||
email-validator
|
||||
flask_sqlalchemy
|
||||
flask-babelex
|
||||
flask-mongoengine
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, apispec
|
||||
, colorama
|
||||
, click
|
||||
, email_validator
|
||||
, email-validator
|
||||
, flask
|
||||
, flask-babel
|
||||
, flask_login
|
||||
@ -56,7 +56,7 @@ buildPythonPackage rec {
|
||||
apispec
|
||||
colorama
|
||||
click
|
||||
email_validator
|
||||
email-validator
|
||||
flask
|
||||
flask-babel
|
||||
flask_login
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, nose
|
||||
, rednose
|
||||
, coverage
|
||||
, email_validator
|
||||
, email-validator
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
email_validator
|
||||
email-validator
|
||||
flask
|
||||
flask-wtf
|
||||
mongoengine
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
# propagates
|
||||
, blinker
|
||||
, email_validator
|
||||
, email-validator
|
||||
, flask
|
||||
, flask_login
|
||||
, flask_principal
|
||||
@ -54,7 +54,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
blinker
|
||||
email_validator
|
||||
email-validator
|
||||
flask
|
||||
flask_login
|
||||
flask_principal
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, flask
|
||||
, itsdangerous
|
||||
, wtforms
|
||||
, email_validator
|
||||
, email-validator
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
email = [ email_validator ];
|
||||
email = [ email-validator ];
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
, cachetools
|
||||
, click
|
||||
, dnspython
|
||||
, email_validator
|
||||
, email-validator
|
||||
, flask
|
||||
, flask-babel
|
||||
, flask-cors
|
||||
@ -60,7 +60,7 @@ buildPythonPackage rec {
|
||||
click
|
||||
debts
|
||||
dnspython
|
||||
email_validator
|
||||
email-validator
|
||||
flask
|
||||
flask_mail
|
||||
flask_migrate
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.3.1";
|
||||
version = "1.3.3";
|
||||
pname = "mockito";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-o8Hg3UnxWbJITBu/IjsbWRHDiJ5smffKUNHAqG21170=";
|
||||
sha256 = "sha256-mCRTdihXcyMHNPJkmGWLHcBFrTvhNCH1CMcaXHaVe8E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ];
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "proto-plus";
|
||||
version = "1.20.5";
|
||||
version = "1.20.6";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gXlOsb4zPGeYYzOUjfcOu4zfU44Dn4z6kv0qnXF21AU=";
|
||||
sha256 = "sha256-RJtFN+g/R3a9aQUcTXdtuP/j+dBkHx6HsGwRbrlMkOk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ protobuf ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, devtools
|
||||
, email_validator
|
||||
, email-validator
|
||||
, fetchFromGitHub
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
@ -57,7 +57,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
devtools
|
||||
email_validator
|
||||
email-validator
|
||||
python-dotenv
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
, marshmallow
|
||||
, pyschemes
|
||||
, wtforms
|
||||
, email_validator
|
||||
, email-validator
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
marshmallow
|
||||
pyschemes
|
||||
wtforms
|
||||
email_validator
|
||||
email-validator
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "vaa" ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, markupsafe
|
||||
, babel
|
||||
, pytestCheckHook
|
||||
, email_validator
|
||||
, email-validator
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
email_validator
|
||||
email-validator
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "wtforms" ];
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "youtube-search-python";
|
||||
version = "1.6.5";
|
||||
version = "1.6.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1B7rppa+s/oE8w91Ca7ogjkNHu5pFSnNmDyUopCWEY8=";
|
||||
hash = "sha256-RWjR12ns1+tLuDZfBO7G42TF9w7sezdl9UPa67E1/PU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -32,14 +32,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-J8CpNeON2qOaU/U7LbIOaQ/DJ/7Q+kLzzw+jD1QLkik=";
|
||||
hash = "sha256-bH7W+GZ4O32ty5YD4hfKz2R10v7zEJLU1kLzKvdx3E4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hound";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hound-search";
|
||||
repo = "hound";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FNK6SgISGqx+O7Vgp+KOqQyPhqzERDjeo6mQIX1SXnA=";
|
||||
sha256 = "sha256-1URhb+ZrtP5eGS2o7lBxvAxQJR/J6oE+pCbJ7sQb0X4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ=";
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, vala
|
||||
, meson
|
||||
, ninja
|
||||
@ -19,24 +18,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnonograms";
|
||||
version = "2.0.0";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeremypw";
|
||||
repo = "gnonograms";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2uXaybpCAm9cr0o7bqfhgD7mMNPwtv1X/PgnFnSDOl0=";
|
||||
sha256 = "sha256-TkEVjrwlr4Q5FsfcdY+9fxwaMq+DFs0RwGI2E+GT5Mk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61, can be removed on next release
|
||||
# https://github.com/jeremypw/gnonograms/pull/45
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jeremypw/gnonograms/commit/0e90d8ff42d64a94002ec8500889bc4d7e06c1b6.patch";
|
||||
sha256 = "sha256-G/yqsZFmOA69A3E2CROMYAS5vmok/K5l1S/M2m8DMh4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
@ -1,6 +1,12 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsa-lib
|
||||
, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }:
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook, pkg-config
|
||||
, openssl, avahi, alsa-lib, glib, libdaemon, popt, libconfig, libpulseaudio, soxr
|
||||
, enableDbus ? stdenv.isLinux
|
||||
, enableMetadata ? false
|
||||
, enableMpris ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.3.9";
|
||||
pname = "shairport-sync";
|
||||
@ -23,7 +29,12 @@ stdenv.mkDerivation rec {
|
||||
libconfig
|
||||
libpulseaudio
|
||||
soxr
|
||||
];
|
||||
] ++ optional stdenv.isLinux glib;
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' dbus-service.c
|
||||
sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' mpris-service.c
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -32,7 +43,10 @@ stdenv.mkDerivation rec {
|
||||
"--with-avahi" "--with-ssl=openssl" "--with-soxr"
|
||||
"--without-configfiles"
|
||||
"--sysconfdir=/etc"
|
||||
];
|
||||
]
|
||||
++ optional enableDbus "--with-dbus-interface"
|
||||
++ optional enableMetadata "--with-metadata"
|
||||
++ optional enableMpris "--with-mpris-interface";
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dsq";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "multiprocessio";
|
||||
repo = "dsq";
|
||||
rev = version;
|
||||
hash = "sha256-zTrIs6Q/+PW6CKCx1L8VaXhc1ZAqbb+Od+LJNjPCOTs=";
|
||||
hash = "sha256-dgx1rFdhEtvyH/N3AtQE89ASBoE3CLl+ZFWwWWYe0II=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bLaBBWChK2RKXd/rX9m9UfHu8zt0j8TOm5S2M02U91A=";
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "flameshot";
|
||||
version = "11.0.0";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flameshot-org";
|
||||
repo = "flameshot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SlnEXW3Uhdgl0icwYyYsKQOcYkAtHpAvL6LMXBF2gWM=";
|
||||
sha256 = "sha256-ByW+XYTaeBTTbOaxNeF367nqgnBM+EC8jm+PmwHcVGQ=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sslscan";
|
||||
version = "2.0.13";
|
||||
version = "2.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rbsec";
|
||||
repo = "sslscan";
|
||||
rev = version;
|
||||
sha256 = "sha256-boXp26f8jiw73lMLwUMuAuDBRIw8JzokYadbKx/VeSg=";
|
||||
sha256 = "sha256-CqfxiTRIgrr4J6qThDFqohkxJj5Byf0vQzG+voAEzag=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nkf";
|
||||
@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0i5dbcb9aipwr8ym4mhvgf1in3frl6y8h8x96cprz9s7b11xz9yi";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for parllel build failures
|
||||
(fetchpatch {
|
||||
name = "parallel-install.patch";
|
||||
url = "http://git.osdn.net/view?p=nkf/nkf.git;a=patch;h=9ccff5975bec7963e591e042e1ab1139252a4dc9";
|
||||
sha256 = "00f0x414gfch650b20w0yj5x2bd67hchmadl7v54lk3vdgkc6jwj";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK31-gtk3,
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3,
|
||||
boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml,
|
||||
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "poedit";
|
||||
version = "3.0.1";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vslavik";
|
||||
repo = "poedit";
|
||||
rev = "v${version}-oss";
|
||||
sha256 = "sha256-PBAOCAO3OrBE7lOho7nJNEpqwds7XiblN/f+GonrXHA=";
|
||||
sha256 = "sha256-Wxj1xPbtupEnzuvf7JdUgdTxX2oAZDEYk6W4CjrmRRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
|
||||
libxslt xmlto boost libtool pkg-config ];
|
||||
|
||||
buildInputs = [ lucenepp nlohmann_json wxGTK31-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ];
|
||||
buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ];
|
||||
|
||||
propagatedBuildInputs = [ gettext ];
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@ assert (gnutlsSupport || opensslSupport);
|
||||
with lib;
|
||||
stdenv.mkDerivation {
|
||||
pname = "rtmpdump";
|
||||
version = "unstable-2019-03-30";
|
||||
version = "unstable-2021-02-19";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.ffmpeg.org/rtmpdump";
|
||||
# Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4')
|
||||
rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3";
|
||||
sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb";
|
||||
rev = "f1b83c10d8beb43fcc70a6e88cf4325499f25857";
|
||||
sha256 = "0vchr0f0d5fi0zaa16jywva5db3x9dyws7clqaq32gwh5drbkvs0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -9594,7 +9594,7 @@ with pkgs;
|
||||
pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
|
||||
|
||||
poedit = callPackage ../tools/text/poedit {
|
||||
wxGTK31-gtk3 = wxGTK31-gtk3.override { withWebKit = true; };
|
||||
wxGTK30-gtk3 = wxGTK30-gtk3.override { withWebKit = true; };
|
||||
};
|
||||
|
||||
polipo = callPackage ../servers/polipo { };
|
||||
@ -35327,19 +35327,16 @@ with pkgs;
|
||||
|
||||
mpvc = callPackage ../applications/misc/mpvc { };
|
||||
|
||||
discord = import ../applications/networking/instant-messengers/discord {
|
||||
discord = callPackage ../applications/networking/instant-messengers/discord {
|
||||
branch = "stable";
|
||||
inherit pkgs lib stdenv;
|
||||
};
|
||||
|
||||
discord-ptb = import ../applications/networking/instant-messengers/discord {
|
||||
discord-ptb = callPackage ../applications/networking/instant-messengers/discord {
|
||||
branch = "ptb";
|
||||
inherit pkgs lib stdenv;
|
||||
};
|
||||
|
||||
discord-canary = import ../applications/networking/instant-messengers/discord {
|
||||
discord-canary = callPackage ../applications/networking/instant-messengers/discord {
|
||||
branch = "canary";
|
||||
inherit pkgs lib stdenv;
|
||||
};
|
||||
|
||||
golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {};
|
||||
|
||||
@ -53,8 +53,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
|
||||
|
||||
SharpZipLib = fetchNuGet {
|
||||
pname = "SharpZipLib";
|
||||
version = "0.86.0";
|
||||
sha256 = "01w2038gckfnq31pncrlgm7d0c939pwr1x4jj5450vcqpd4c41jr";
|
||||
version = "1.3.3";
|
||||
sha256 = "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4=";
|
||||
outputFiles = [ "lib/*" ];
|
||||
};
|
||||
|
||||
|
||||
@ -69,6 +69,7 @@ mapAliases ({
|
||||
dogpile_cache = dogpile-cache; # added 2021-10-28
|
||||
dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
|
||||
eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
|
||||
email_validator = email-validator; # added 2022-06-22
|
||||
fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30
|
||||
faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
|
||||
flask_testing = flask-testing; # added 2022-04-25
|
||||
|
||||
@ -2734,7 +2734,7 @@ in {
|
||||
|
||||
emailthreads = callPackage ../development/python-modules/emailthreads { };
|
||||
|
||||
email_validator = callPackage ../development/python-modules/email-validator { };
|
||||
email-validator = callPackage ../development/python-modules/email-validator { };
|
||||
|
||||
embrace = callPackage ../development/python-modules/embrace { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user