ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 09:37:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-10 06:01:46 +00:00 committed by GitHub
commit caaf7e753c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 631 additions and 436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maintainers/maintainer-list.nix
View File

@ -532,6 +532,16 @@
fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A";
}];
};
alyaeanyx = {
email = "alexandra.hollmeier@mailbox.org";
github = "alyaeanyx";
githubId = 74795488;
name = "Alexandra Hollmeier";
keys = [{
longkeyid = "rsa3072/0x87D1AADCD25B8DEE";
fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE";
}];
};
amanjeev = {
email = "aj@amanjeev.com";
github = "amanjeev";

11
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -1153,6 +1153,17 @@ Superuser created successfully.
rofi’s changelog</link>.
</para>
</listitem>
<listitem>
<para>
ipfs now defaults to not listening on you local network. This
setting was change as server providers won’t accept port
scanning on their private network. If you have several ipfs
instances running on a network you own, feel free to change
the setting <literal>ipfs.localDiscovery = true;</literal>.
localDiscovery enables different instances to discover each
other and share data.
</para>
</listitem>
</itemizedlist>
</section>
</section>

2
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -327,3 +327,5 @@ To be able to access the web UI this port needs to be opened in the firewall.
- GNOME desktop environment now enables `QGnomePlatform` as the Qt platform theme, which should avoid crashes when opening file chooser dialogs in Qt apps by using XDG desktop portal. Additionally, it will make the apps fit better visually.
- `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1).
- ipfs now defaults to not listening on you local network. This setting was change as server providers won't accept port scanning on their private network. If you have several ipfs instances running on a network you own, feel free to change the setting `ipfs.localDiscovery = true;`. localDiscovery enables different instances to discover each other and share data.

9
nixos/modules/services/backup/sanoid.nix
View File

@ -57,8 +57,13 @@ let
useTemplate = use_template;
recursive = mkOption {
description = "Whether to recursively snapshot dataset children.";
type = types.bool;
description = ''
Whether to recursively snapshot dataset children.
You can also set this to <literal>"zfs"</literal> to handle datasets
recursively in an atomic way without the possibility to
override settings for child datasets.
'';
type = with types; oneOf [ bool (enum [ "zfs" ]) ];
default = false;
};

2
nixos/modules/services/network-filesystems/ipfs.nix
View File

@ -173,7 +173,7 @@ in
description = ''Whether to enable local discovery for the ipfs daemon.
This will allow ipfs to scan ports on your local network. Some hosting services will ban you if you do this.
'';
default = true;
default = false;
};
serviceFdlimit = mkOption {

22
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View File

@ -14,33 +14,19 @@
}:
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
version = "1.56.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
sha256 = "07vcwbvpzcnvpls0hmpapi7v1npca8ydbx2i235k26xym8il89b7";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${old.pname}-${version}";
sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8";
};
});
electronExec = if stdenv.isDarwin then
"${electron}/Applications/Electron.app/Contents/MacOS/Electron"
else
"${electron}/bin/electron";
in nodePackages.deltachat-desktop.override rec {
pname = "deltachat-desktop";
version = "unstable-2021-08-04";
version = "1.21.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "2c47d6b7e46f4f68c7eb45508ab9e145af489ea1";
sha256 = "03b6j3cj2yanvsargh6q57bf1llg17yrqgmd14lp0wkam767kkfa";
rev = "v${version}";
sha256 = "1fwnv77qa9p50js98byb26ms7mhv7rfwhfv21f282a74pbqsar45";
};
nativeBuildInputs = [
@ -52,7 +38,7 @@ in nodePackages.deltachat-desktop.override rec {
];
buildInputs = [
libdeltachat'
libdeltachat
] ++ lib.optionals stdenv.isDarwin [
CoreServices
];

14
pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
View File

@ -1,20 +1,18 @@
{
"name": "deltachat-desktop",
"version": "1.20.3",
"version": "1.21.0",
"dependencies": {
"@blueprintjs/core": "^3.22.3",
"@mapbox/geojson-extent": "^1.0.0",
"application-config": "^1.0.1",
"array-differ": "^3.0.0",
"classnames": "^2.3.1",
"debounce": "^1.2.0",
"deltachat-node": "1.56.2",
"deltachat-node": "1.60.0",
"emoji-js-clean": "^4.0.0",
"emoji-mart": "^3.0.0",
"emoji-regex": "^9.2.2",
"error-stack-parser": "^2.0.6",
"filesize": "^6.1.0",
"fs-extra": "^8.1.0",
"mapbox-gl": "^1.12.0",
"mime-types": "^2.1.31",
"moment": "^2.27.0",
@ -27,7 +25,9 @@
"react-qr-reader": "^2.2.1",
"react-qr-svg": "^2.1.0",
"react-string-replace": "^0.4.4",
"react-virtualized": "^9.21.2",
"react-virtualized-auto-sizer": "^1.0.5",
"react-window": "^1.8.6",
"react-window-infinite-loader": "^1.0.7",
"simple-markdown": "^0.7.1",
"source-map-support": "^0.5.19",
"tempy": "^0.3.0",
@ -38,7 +38,6 @@
"@babel/preset-env": "^7.7.7",
"@babel/preset-react": "^7.7.4",
"@types/emoji-mart": "^3.0.2",
"@types/fs-extra": "^8.0.1",
"@types/mapbox-gl": "^0.54.5",
"@types/mime-types": "^2.1.0",
"@types/node": "^14.14.20",
@ -47,7 +46,8 @@
"@types/rc": "^1.1.0",
"@types/react": "^16.9.17",
"@types/react-dom": "^16.9.4",
"@types/react-virtualized": "^9.21.10",
"@types/react-window": "^1.8.4",
"@types/react-window-infinite-loader": "^1.0.4",
"@types/url-parse": "^1.4.3",
"electron": "^13.1.6",
"glob-watcher": "^5.0.5",

6
pkgs/applications/video/freetube/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "freetube";
version = "0.13.2";
version = "0.14.0";
src = fetchurl {
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
sha256 = "sha256:0rzx66nshzcrvvd9ky0wamvv5wb0xxlf3zi25xrxmh6haimqbrpv";
sha256 = "sha256:0qaghj70ffc90wck1i4217ky5d6cryrmgna2ipsc4v8dcvbyc1lh";
};
appimageContents = appimageTools.extractType2 {
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
description = "An Open Source YouTube app for privacy";
homepage = "https://freetubeapp.io/";
license = licenses.agpl3Only;
maintainers = with maintainers; [ ryneeverett ];
maintainers = with maintainers; [ ryneeverett alyaeanyx ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/desktops/arcan/arcan.nix
View File

@ -52,13 +52,13 @@ let
in
stdenv.mkDerivation rec {
pname = "arcan";
version = "0.6.1pre1+unstable=2021-07-30";
version = "0.6.1pre1+unstable=2021-09-05";
src = fetchFromGitHub {
owner = "letoram";
repo = "arcan";
rev = "885b2f0c9e031fd157af21302af2027ecbe3fe1f";
hash = "sha256-tj5kPa5OWCGt7LTzo4ZYV1UjBpOrjQHER/K+ZfL3h+8=";
rev = "525521177e4458199d7a57f8e6d37d41c04a988d";
hash = "sha256-RsvTHPIvF9TeOfjPGcArptIiF9g42BfZkVMCbjJcXnE=";
};
postUnpack = ''

4
pkgs/desktops/arcan/default.nix
View File

@ -35,8 +35,8 @@ rec {
# One Expression to SymlinkJoin Them All
everyone-wrapped = callPackage ./wrapper.nix {
name = "everyone-wrapped";
all-wrapped = callPackage ./wrapper.nix {
name = "all-wrapped";
appls = [ durden pipeworld ];
};
}

6
pkgs/desktops/arcan/pipeworld.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "pipeworld";
version = "0.0.0+unstable=2021-05-27";
version = "0.0.0+unstable=2021-08-01";
src = fetchFromGitHub {
owner = "letoram";
repo = pname;
rev = "c26df9ca0225ce2fd4f89e7ec59d4ab1f94a4c2e";
hash = "sha256-RkDAbM1q4o61RGPLPLXHLvbvClp+bfjodlWgUGoODzA=";
rev = "311cc91946be63faab3b1578bc1d40668dd30f8c";
hash = "sha256-iqcdVzEp4ST/f93+9fGSwvJMj7BznNtoEx4F3oMPCYk=";
};
installPhase = ''

24
pkgs/development/compilers/as31/0000-getline-break.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git old/as31/run.c new/as31/run.c
index 28c5317..9e5263b 100644
--- old/as31/run.c
+++ new/as31/run.c
@@ -113,7 +113,8 @@ int run_as31(const char *infile, int lst, int use_stdout,
}
while (!feof(finPre)) {
- getline(&lineBuffer,&sizeBuf,finPre);
+ if (getline(&lineBuffer,&sizeBuf,finPre) == -1)
+ break;
if ((includePtr=strstr(lineBuffer,INC_CMD))) {
includePtr=includePtr+strlen(INC_CMD);
while ((*includePtr==' ')|| //move includePtr to filename
@@ -138,7 +139,8 @@ int run_as31(const char *infile, int lst, int use_stdout,
mesg_f("Cannot open include file: %s\n",includePtr);
} else {
while (!feof(includeFile)) {
- getline(&incLineBuffer,&incSizeBuf,includeFile);
+ if (getline(&incLineBuffer,&incSizeBuf,includeFile) == -1)
+ break;
fprintf(fin,"%s",incLineBuffer);
if (strlen(incLineBuffer)) {
incLineCount++;

43
pkgs/development/compilers/as31/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchurl
, bison
}:
stdenv.mkDerivation rec {
pname = "as31";
version = "2.3.1";
src = fetchurl {
url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:${pname}-${version}.tar.gz";
name = "${pname}-${version}.tar.gz";
hash = "sha256-zSEyWHFon5nyq717Mpmdv1XZ5Hz0e8ZABqsP8M83c1U=";
};
patches = [
# Check return value of getline in run.c
./0000-getline-break.patch
];
postPatch = ''
# parser.c is generated from parser.y; it is better to generate it via bison
# instead of using the prebuilt one, especially in x86_64
rm -f as31/parser.c
'';
preConfigure = ''
chmod +x configure
'';
nativeBuildInputs = [
bison
];
meta = with lib; {
homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31";
description = "An 8031/8051 assembler";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}

16
pkgs/development/compilers/atasm/0000-file-not-found.diff Normal file
View File

@ -0,0 +1,16 @@
diff -Naur atasm109-old/src/Makefile atasm109-new/src/Makefile
--- atasm109-old/src/Makefile 2021-09-08 09:53:25.581598063 -0300
+++ atasm109-new/src/Makefile 2021-09-08 09:55:20.366131338 -0300
@@ -55,9 +55,9 @@
chown root.root $(DESTDIR)/atasm || true
chmod 711 $(DESTDIR)/atasm
mkdir $(DOCDIR) >/dev/null 2>&1 || echo $(DOCDIR) already exists
- cp ../atasm.txt $(DOCDIR)
- chown root.root $(DOCDIR)/atasm.txt || true
- chmod 644 $(DOCDIR)/atasm.txt
+ # cp ../atasm.txt $(DOCDIR)
+ # chown root.root $(DOCDIR)/atasm.txt || true
+ # chmod 644 $(DOCDIR)/atasm.txt
sed -e 's,%%DOCDIR%%,$(DOCDIR),g' < atasm.1.in > atasm.1
cp atasm.1 $(MANDIR)
chown root.root $(MANDIR)/atasm.1 || true

14
pkgs/development/compilers/atasm/0001-select-flags.diff Normal file
View File

@ -0,0 +1,14 @@
diff -Naur atasm109-old/src/Makefile atasm109-new/src/Makefile
--- atasm109-old/src/Makefile 2021-09-08 09:53:25.581598063 -0300
+++ atasm109-new/src/Makefile 2021-09-08 09:55:20.366131338 -0300
@@ -16,8 +16,8 @@
UNIX = -DUNIX
# Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use:
-#CFLAGS = -g -Wall $(USEZ) $(DOS) $(UNIX) $(ARCH)
-CFLAGS = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer $(ARCH)
+CFLAGS = -g -Wall $(USEZ) $(DOS) $(UNIX) $(ARCH)
+#CFLAGS = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer $(ARCH)
L = $(ZLIB)
CC = gcc

64
pkgs/development/compilers/atasm/default.nix Normal file
View File

@ -0,0 +1,64 @@
{ lib
, stdenv
, fetchurl
, unzip
, zlib
}:
stdenv.mkDerivation rec {
pname = "atasm";
version = "1.09";
src = fetchurl {
url = "https://atari.miribilist.com/${pname}/${pname}${builtins.replaceStrings ["."] [""] version}.zip";
hash = "sha256-26shhw2r30GZIPz6S1rf6dOLKRpgpLwrqCRZX3+8PvA=";
};
patches = [
# make install fails because atasm.txt was moved; report to upstream
./0000-file-not-found.diff
# select flags for compilation
./0001-select-flags.diff
];
dontConfigure = true;
nativeBuildInputs = [
unzip
];
buildInputs = [
zlib
];
preBuild = ''
makeFlagsArray+=(
-C ./src
CC=cc
USEZ="-DZLIB_CAPABLE -I${zlib}/include"
ZLIB="-L${zlib}/lib -lz"
UNIX="-DUNIX"
)
'';
preInstall = ''
install -d $out/share/doc/${pname} $out/man/man1
installFlagsArray+=(
DESTDIR=$out
DOCDIR=$out/share/doc/${pname}
MANDIR=$out/man/man1
)
'';
postInstall = ''
mv docs/* $out/share/doc/${pname}
'';
meta = with lib; {
homepage = "https://atari.miribilist.com/atasm/";
description = "A commandline 6502 assembler compatible with Mac/65";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}

5
pkgs/development/libraries/libdeltachat/default.nix
View File

@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59";
})
./no-static-lib.patch
# https://github.com/deltachat/deltachat-core-rust/pull/2660
(fetchpatch {
url = "https://github.com/deltachat/deltachat-core-rust/commit/8fb5e038a97d8ae68564c885d61b93127a68366d.patch";
sha256 = "088pzfrrkgfi4646dc72404s3kykcpni7hgkppalwlzg0p4is41x";
})
];
cargoDeps = rustPlatform.fetchCargoTarball {

780
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

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

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, mock
, noiseprotocol
, protobuf
, pytest-asyncio
, pytestCheckHook
@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "8.0.0";
version = "9.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,10 +21,11 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fd77sbtgEhExV/d/LHkF9sheVz7G2SrNXyZsMNeJ4UY=";
sha256 = "sha256-Z5PebH/x53lo62sHjBH/6H05UhXax3sVfYx5T0uw38s=";
};
propagatedBuildInputs = [
noiseprotocol
protobuf
zeroconf
];

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

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "anyio";
version = "3.3.0";
version = "3.3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "agronholm";
repo = pname;
rev = version;
sha256 = "sha256-bMnAijFLXZSgTWsalT/J4sJ0Jrc1kFaQHJArwXnQFaQ=";
sha256 = "sha256-JQf+OWHV2Vok5FmP7mlzeqbKUlxB+FC1c3ruX2aQEEs=";
};
preBuild = ''

10
pkgs/tools/admin/swiftclient/default.nix → pkgs/development/python-modules/python-swiftclient/default.nix
View File

@ -2,14 +2,16 @@
buildPythonApplication rec {
pname = "python-swiftclient";
version = "3.11.0";
version = "3.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "3972f8b1986e60ea786ad01697e6882f331209ae947ef8b795531940f1e0732b";
sha256 = "sha256-MTtEShTQ+bYoy/PoxS8sQnFlj56KM9QiKFHC5PD3t6A=";
};
propagatedBuildInputs = [ requests six pbr setuptools ];
nativeBuildInputs = [ pbr ];
propagatedBuildInputs = [ requests six setuptools ];
# For the tests the following requirements are needed:
# https://github.com/openstack/python-swiftclient/blob/master/test-requirements.txt
@ -27,6 +29,6 @@ buildPythonApplication rec {
homepage = "https://github.com/openstack/python-swiftclient";
description = "Python bindings to the OpenStack Object Storage API";
license = licenses.asl20;
maintainers = with maintainers; [ c0deaddict ];
maintainers = with maintainers; [ c0deaddict SuperSandro2000 ];
};
}

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

@ -737,6 +737,7 @@ mapAliases ({
pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14
pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08
python-swiftclient = swiftclient; # added 2021-09-09
quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05

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

@ -10844,10 +10844,14 @@ with pkgs;
asciigraph = callPackage ../tools/text/asciigraph { };
as31 = callPackage ../development/compilers/as31 { };
asn1c = callPackage ../development/compilers/asn1c { };
aspectj = callPackage ../development/compilers/aspectj { };
atasm = callPackage ../development/compilers/atasm { };
ats = callPackage ../development/compilers/ats { };
ats2 = callPackage ../development/compilers/ats2 { };
@ -18982,7 +18986,7 @@ with pkgs;
svxlink = libsForQt5.callPackage ../applications/radio/svxlink { };
swiftclient = python3.pkgs.callPackage ../tools/admin/swiftclient { };
swiftclient = with python3Packages; toPythonApplication python-swiftclient;
sword = callPackage ../development/libraries/sword { };

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

@ -5515,6 +5515,8 @@ in {
python-songpal = callPackage ../development/python-modules/python-songpal { };
python-swiftclient = callPackage ../development/python-modules/python-swiftclient { };
python-tado = callPackage ../development/python-modules/python-tado { };
pyutil = callPackage ../development/python-modules/pyutil { };