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] 2022-06-13 12:01:23 +00:00 committed by GitHub
commit 153ddcc04c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 307 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -59,6 +59,7 @@ in
homepage = "https://github.com/VSCodium/vscodium";
downloadPage = "https://github.com/VSCodium/vscodium/releases";
license = licenses.mit;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ synthetica turion bobby285271 ];
mainProgram = "codium";
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ];

1
pkgs/applications/networking/breitbandmessung/default.nix
View File

@ -87,6 +87,7 @@ stdenv.mkDerivation ({
description = "Broadband internet speed test app from the german Bundesnetzagentur";
homepage = "https://www.breitbandmessung.de";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ b4dm4n ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};

1
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -206,6 +206,7 @@ stdenv.mkDerivation {
description = "Mozilla Firefox, free web browser (binary package)";
homepage = "http://www.mozilla.org/firefox/";
license = licenses.mpl20;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = builtins.attrNames mozillaPlatforms;
hydraPlatforms = [];
maintainers = with maintainers; [ taku0 lovesegfault ];

1
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -162,6 +162,7 @@ in stdenv.mkDerivation {
description = "A freeware web browser developed by Google";
homepage = "https://www.google.com/chrome/browser/";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ primeos ];
# Note from primeos: By updating Chromium I also update Google Chrome and
# will try to merge PRs and respond to issues but I'm not actually using

1
pkgs/applications/networking/browsers/microsoft-edge/browser.nix
View File

@ -185,6 +185,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.microsoft.com/en-us/edge";
description = "The web browser from Microsoft";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ zanculmarktum kuwii ];
};

1
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -127,5 +127,6 @@ in stdenv.mkDerivation rec {
description = "Web browser";
platforms = [ "x86_64-linux" ];
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

1
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -434,5 +434,6 @@ stdenv.mkDerivation rec {
# the compound is "libre" in a strict sense (some components place certain
# restrictions on redistribution), it's free enough for our purposes.
license = licenses.free;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

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

@ -101,6 +101,7 @@ in stdenv.mkDerivation rec {
description = "A Browser for our Friends, powerful and personal";
homepage = "https://vivaldi.com";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ otwieracz badmutex ];
platforms = [ "x86_64-linux" ];
};

1
pkgs/applications/networking/browsers/yandex-browser/default.nix
View File

@ -130,6 +130,7 @@ stdenv.mkDerivation rec {
description = "Yandex Web Browser";
homepage = "https://browser.yandex.ru/";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ dan4ik605743 ];
platforms = [ "x86_64-linux" ];

4
pkgs/applications/networking/flexget/default.nix
View File

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.15";
version = "3.3.16";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-SNAhuiUO8f92LAdnV9q04xK4yT+AVAS+YAHPPtHdMYI=";
hash = "sha256-XN5KJ9GgFSDMYd6n9Mt3UARsa/ZAB61DBGMRvFz/NVA=";
};
postPatch = ''

1
pkgs/applications/office/trilium/default.nix
View File

@ -15,6 +15,7 @@ let
inherit description;
homepage = "https://github.com/zadam/trilium";
license = licenses.agpl3Plus;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ fliegendewurst ];
};

1
pkgs/applications/science/math/mathematica/default.nix
View File

@ -47,6 +47,7 @@ callPackage real-drv {
description = "Wolfram Mathematica computational software system";
homepage = "http://www.wolfram.com/mathematica/";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ herberteuler ];
platforms = [ "x86_64-linux" ];
};

1
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
View File

@ -112,6 +112,7 @@ let result = stdenv.mkDerivation rec {
meta = with lib; {
license = licenses.gpl2Classpath;
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ];

2
pkgs/development/coq-modules/CoLoR/default.nix
View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "fblanqui";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{case = range "8.12" "8.15"; out = "1.8.2"; }
{case = range "8.12" "8.16"; out = "1.8.2"; }
{case = range "8.10" "8.11"; out = "1.7.0"; }
{case = range "8.8" "8.9"; out = "1.6.0"; }
{case = range "8.6" "8.7"; out = "1.4.0"; }

2
pkgs/development/coq-modules/ITree/default.nix
View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec {
owner = "DeepSpec";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.15"; out = "4.0.0"; }
{ case = range "8.10" "8.16"; out = "4.0.0"; }
] null;
release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
releaseRev = v: "${v}";

2
pkgs/development/coq-modules/LibHyps/default.nix
View File

@ -5,7 +5,7 @@ mkCoqDerivation {
pname = "LibHyps";
owner = "Matafou";
inherit version;
defaultVersion = if (versions.range "8.11" "8.15") coq.version then "2.0.4.1" else null;
defaultVersion = if (versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null;
release = {
"2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h";
};

2
pkgs/development/coq-modules/QuickChick/default.nix
View File

@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
owner = "QuickChick";
inherit version;
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
{ cases = [ (isGe "8.13") pred.true ]; out = "1.6.2"; }
{ cases = [ (range "8.13" "8.15") pred.true ]; out = "1.6.2"; }
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; }

2
pkgs/development/coq-modules/StructTact/default.nix
View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "uwplse";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.6" "8.15"; out = "20210328"; }
{ case = range "8.6" "8.16"; out = "20210328"; }
{ case = range "8.5" "8.13"; out = "20181102"; }
] null;
release."20210328".rev = "179bd5312e9d8b63fc3f4071c628cddfc496d741";

2
pkgs/development/coq-modules/autosubst/default.nix
View File

@ -9,7 +9,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "1.7"; }
{ case = range "8.10" "8.15"; out = "1.7"; }
] null;
propagatedBuildInputs = [ mathcomp-ssreflect ];

4
pkgs/development/coq-modules/coq-bits/default.nix
View File

@ -5,8 +5,8 @@ with lib; mkCoqDerivation {
repo = "bits";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "1.1.0"; }
{ case = isGe "8.7"; out = "1.0.0"; }
{ case = range "8.10" "8.15"; out = "1.1.0"; }
{ case = range "8.7" "8.15"; out = "1.0.0"; }
] null;
release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE=";

2
pkgs/development/coq-modules/coq-ext-lib/default.nix
View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec {
owner = "coq-ext-lib";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.8" "8.15"; out = "0.11.6"; }
{ case = range "8.8" "8.16"; out = "0.11.6"; }
{ case = range "8.8" "8.14"; out = "0.11.4"; }
{ case = range "8.8" "8.13"; out = "0.11.3"; }
{ case = "8.7"; out = "0.9.7"; }

2
pkgs/development/coq-modules/coq-record-update/default.nix
View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec {
owner = "tchajed";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.15"; out = "0.3.0"; }
{ case = range "8.10" "8.16"; out = "0.3.0"; }
] null;
release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z";
releaseRev = v: "v${v}";

2
pkgs/development/coq-modules/coqprime/default.nix
View File

@ -6,7 +6,7 @@ with lib; mkCoqDerivation {
owner = "thery";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.12" "8.15"; out = "8.15"; }
{ case = range "8.12" "8.16"; out = "8.15"; }
{ case = range "8.10" "8.11"; out = "8.10"; }
{ case = range "8.8" "8.9"; out = "8.8"; }
{ case = "8.7"; out = "8.7.2"; }

2
pkgs/development/coq-modules/coquelicot/default.nix
View File

@ -7,7 +7,7 @@ with lib; mkCoqDerivation {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.8" ; out = "3.2.0"; }
{ case = range "8.8" "8.15"; out = "3.2.0"; }
{ case = range "8.8" "8.13"; out = "3.1.0"; }
{ case = range "8.5" "8.9"; out = "3.0.2"; }
] null;

2
pkgs/development/coq-modules/extructures/default.nix
View File

@ -10,7 +10,7 @@ with lib;
inherit version;
defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [
{ cases = [(isGe "8.11") (isGe "1.12.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.15") (isGe "1.12.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }
{ cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }
] null;

2
pkgs/development/coq-modules/hierarchy-builder/default.nix
View File

@ -5,7 +5,7 @@ with lib; let hb = mkCoqDerivation {
owner = "math-comp";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.15"; out = "1.2.1"; }
{ case = isEq "8.15"; out = "1.2.1"; }
{ case = range "8.13" "8.14"; out = "1.2.0"; }
{ case = range "8.12" "8.13"; out = "1.1.0"; }
{ case = isEq "8.11"; out = "0.10.0"; }

2
pkgs/development/coq-modules/interval/default.nix
View File

@ -7,7 +7,7 @@ mkCoqDerivation rec {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isGe "8.8"; out = "4.5.1"; }
{ case = range "8.8" "8.15"; out = "4.5.1"; }
{ case = range "8.8" "8.12"; out = "4.0.0"; }
{ case = range "8.7" "8.11"; out = "3.4.2"; }
{ case = range "8.5" "8.6"; out = "3.3.0"; }

2
pkgs/development/coq-modules/iris/default.nix
View File

@ -6,7 +6,7 @@ with lib; mkCoqDerivation rec {
owner = "iris";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.15"; out = "3.6.0"; }
{ case = range "8.13" "8.16"; out = "3.6.0"; }
{ case = range "8.12" "8.14"; out = "3.5.0"; }
{ case = range "8.11" "8.13"; out = "3.4.0"; }
{ case = range "8.9" "8.10"; out = "3.3.0"; }

2
pkgs/development/coq-modules/math-classes/default.nix
View File

@ -4,7 +4,7 @@ with lib; mkCoqDerivation {
pname = "math-classes";
inherit version;
defaultVersion = if versions.range "8.6" "8.15" coq.coq-version then "8.15.0" else null;
defaultVersion = if versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null;
release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425";
release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby";
release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw";

2
pkgs/development/coq-modules/mathcomp/default.nix
View File

@ -19,7 +19,7 @@ let
owner = "math-comp";
withDoc = single && (args.withDoc or false);
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "1.14.0"; }
{ case = range "8.11" "8.15"; out = "1.14.0"; }
{ case = range "8.11" "8.15"; out = "1.13.0"; }
{ case = range "8.10" "8.13"; out = "1.12.0"; }
{ case = range "8.7" "8.12"; out = "1.11.0"; }

2
pkgs/development/coq-modules/metalib/default.nix
View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "plclub";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.14" "8.15"; out = "8.15"; }
{ case = range "8.14" "8.16"; out = "8.15"; }
{ case = range "8.10" "8.13"; out = "8.10"; }
] null;
releaseRev = v: "coq${v}";

2
pkgs/development/coq-modules/paco/default.nix
View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "snu-sf";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.12" "8.15"; out = "4.1.2"; }
{ case = range "8.12" "8.16"; out = "4.1.2"; }
{ case = range "8.9" "8.13"; out = "4.1.1"; }
{ case = range "8.6" "8.13"; out = "4.0.2"; }
{ case = isEq "8.5"; out = "1.2.8"; }

2
pkgs/development/coq-modules/parsec/default.nix
View File

@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.version [
{ case = range "8.12" "8.15"; out = "0.1.1"; }
{ case = range "8.12" "8.16"; out = "0.1.1"; }
{ case = range "8.12" "8.13"; out = "0.1.0"; }
] null;
release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189";

2
pkgs/development/coq-modules/semantics/default.nix
View File

@ -16,7 +16,7 @@ mkCoqDerivation rec {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.15"; out = "8.14.0"; }
{ case = range "8.10" "8.16"; out = "8.14.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }

2
pkgs/development/coq-modules/simple-io/default.nix
View File

@ -6,7 +6,7 @@ with lib; mkCoqDerivation {
repo = "coq-simple-io";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.11" "8.15"; out = "1.7.0"; }
{ case = range "8.11" "8.16"; out = "1.7.0"; }
{ case = range "8.7" "8.13"; out = "1.3.0"; }
] null;
release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";

2
pkgs/development/coq-modules/stdpp/default.nix
View File

@ -6,7 +6,7 @@ with lib; mkCoqDerivation rec {
domain = "gitlab.mpi-sws.org";
owner = "iris";
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.15"; out = "1.7.0"; }
{ case = range "8.13" "8.16"; out = "1.7.0"; }
{ case = range "8.12" "8.14"; out = "1.6.0"; }
{ case = range "8.11" "8.13"; out = "1.5.0"; }
{ case = range "8.8" "8.10"; out = "1.4.0"; }

2
pkgs/development/coq-modules/tlc/default.nix
View File

@ -6,7 +6,7 @@ with lib; (mkCoqDerivation {
inherit version;
displayVersion = { tlc = false; };
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.15"; out = "20211215"; }
{ case = range "8.13" "8.16"; out = "20211215"; }
{ case = range "8.12" "8.13"; out = "20210316"; }
{ case = range "8.10" "8.12"; out = "20200328"; }
{ case = range "8.6" "8.12"; out = "20181116"; }

2
pkgs/development/coq-modules/trakt/default.nix
View File

@ -10,7 +10,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch [ coq.version ] [
{ cases = [ (isGe "8.13") ]; out = "1.0"; }
{ cases = [ (range "8.13" "8.15") ]; out = "1.0"; }
] null;
propagatedBuildInputs = [ coq-elpi ];

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "azure-eventhub";
version = "5.9.0";
version = "5.10.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "509c6b351db0c1674a7c33308e6ffebc5a9bd2b0a9d10bcb2fa3d0a3a47d42d0";
sha256 = "8c83fbe96a420813599a9a3c66adc315b7208f56d5a50a20aa04a8aa7062b074";
};
propagatedBuildInputs = [

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "azure-servicebus";
version = "7.6.1";
version = "7.7.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-wqt+uWKVklP2AxiQN9PeuOFUixtZuBUIUhN+WZBYrBI=";
hash = "sha256-D9CdVfPU7FwiAQd2Pw/CMJsHj8psYtVq3wYJlVHVA1s=";
};
propagatedBuildInputs = [

29
pkgs/development/python-modules/pysmb/default.nix
View File

@ -1,20 +1,22 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, lib
# pythonPackages
, pyasn1
, pythonOlder
}:
buildPythonPackage rec {
pname = "pysmb";
version = "1.2.7";
version = "1.2.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
format = "setuptools";
extension = "zip";
sha256 = "298605b8f467ce15b412caaf9af331c135e88fa2172333af14b1b2916361cb6b";
hash = "sha256-OwfbFiF0ZQOdDCVpTAcFuDZjyoIlniCfNWbVd1Nqc5U=";
};
propagatedBuildInputs = [
@ -22,17 +24,18 @@ buildPythonPackage rec {
];
# Tests require Network Connectivity and a server up and running
# https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt
# https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt
doCheck = false;
pythonImportsCheck = [ "nmb" "smb" ];
pythonImportsCheck = [
"nmb"
"smb"
];
meta = {
meta = with lib; {
description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines";
homepage = "https://miketeo.net/wp/index.php/projects/pysmb";
license = lib.licenses.zlib;
maintainers = with lib.maintainers; [
kamadorueda
];
license = licenses.zlib;
maintainers = with maintainers; [ kamadorueda ];
};
}

27
pkgs/development/tools/manul/default.nix
View File

@ -1,27 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage {
pname = "manul";
version = "unstable-2016-09-30";
goPackagePath = "github.com/kovetskiy/manul";
excludedPackages = "tests";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "manul";
rev = "7bddb5404b9ecc66fd28075bb899c2d6dc7a1c51";
sha256 = "06kglxdgj1dfpc9bdnvhsh8z0c1pdbmwmfx4km01wpppzk06dnvm";
};
deleteVendor = true;
goDeps = ./deps.nix;
meta = with lib; {
description = "The madness vendoring utility for Golang programs";
homepage = "https://github.com/kovetskiy/manul";
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.mic92 ];
};
}

75
pkgs/development/tools/manul/deps.nix generated
View File

@ -1,75 +0,0 @@
# This file was generated by go2nix.
[
{
goPackagePath = "github.com/PuerkitoBio/goquery";
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/goquery";
rev = "3cb3b8656883c2cc3deb9c643d93ea6e5157e425";
sha256 = "0qhyssjwv98jncsiph95iz77sygkismvpprsalqi3xm3k50xi6r7";
};
}
{
goPackagePath = "github.com/andybalholm/cascadia";
fetch = {
type = "git";
url = "https://github.com/andybalholm/cascadia";
rev = "349dd0209470eabd9514242c688c403c0926d266";
sha256 = "12ikz849vkdb3dsdn6mdpkihvm0hbmkplyi0qdcm7s4ib4n003b1";
};
}
{
goPackagePath = "github.com/kovetskiy/godocs";
fetch = {
type = "git";
url = "https://github.com/kovetskiy/godocs";
rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24";
sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j";
};
}
{
goPackagePath = "github.com/reconquest/executil-go";
fetch = {
type = "git";
url = "https://github.com/reconquest/executil-go";
rev = "e72bce509b1a5e89ab21f29c92830d4304620765";
sha256 = "06z05hl4bym5agv0h1vgksj0mx0l4987ganwqcfb153w7pclvan3";
};
}
{
goPackagePath = "github.com/reconquest/hierr-go";
fetch = {
type = "git";
url = "https://github.com/reconquest/hierr-go";
rev = "bbf802f3f943e7b6a364a485ccf90807f3bfcc0e";
sha256 = "1v3fssw881vcawc2abvp8abwb7705yzxrb0khbzmn8qvdpqwh7hl";
};
}
{
goPackagePath = "github.com/reconquest/ser-go";
fetch = {
type = "git";
url = "https://github.com/reconquest/ser-go";
rev = "47f084a1e4a5433ac3d6ab6cfe8c1e30028a4d76";
sha256 = "1hgafiqc3mlazs2zg4rqjm4sasy2gjrjl64cy8mmlg5cayvbj4hq";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6";
sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc";
};
}
]

5
pkgs/os-specific/linux/broadcom-sta/default.nix
View File

@ -39,8 +39,11 @@ stdenv.mkDerivation {
./linux-5.6.patch
# source: https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290
./linux-5.9.patch
# source: https://github.com/archlinux/svntogit-community/blob/5ec5b248976f84fcd7e3d7fae49ee91289912d12/trunk/012-linux517.patch
# source: https://github.com/archlinux/svntogit-community/blob/33b4bd2b9e30679b03f5d7aa2741911d914dcf94/trunk/012-linux517.patch
./linux-5.17.patch
# source: https://github.com/archlinux/svntogit-community/blob/2e1fd240f9ce06f500feeaa3e4a9675e65e6b967/trunk/013-linux518.patch
./linux-5.18.patch
./pedantic-fix.patch
./null-pointer-fix.patch
./gcc.patch
];

107
pkgs/os-specific/linux/broadcom-sta/linux-5.17.patch
View File

@ -1,39 +1,80 @@
diff -u -r a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
--- a/src/wl/sys/wl_linux.c 2022-03-23 00:35:42.930416350 +0000
+++ b/src/wl/sys/wl_linux.c 2022-03-23 00:40:12.903771013 +0000
@@ -2980,7 +2980,11 @@
From 31b7849092c43805c7fbaf7518b99874aa1b310c Mon Sep 17 00:00:00 2001
From: Joan Bruguera <joanbrugueram@gmail.com>
Date: Wed, 12 Jan 2022 20:49:20 +0100
Subject: [PATCH] Tentative fix for broadcom-wl 6.30.223.271 driver for Linux 5.17-rc1
Set netdev->dev_addr through dev_addr_mod + PDE_DATA fix
Since Linux 5.17 netdev->dev_addr is const and must be changed through
dev_addr_mod, otherwise a warning is logged in dmesg and bad things may happen.
NB: The #if is not wrong, dev_addr_mod is defined since Linux 5.15-rc1
Plus a trivial fix for PDE_DATA.
Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-28 on Arch Linux.
See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adeef3e32146a8d2a73c399dc6f5d76a449131b1
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d78351c6f5442435f81549f0207ece28aa
---
src/wl/sys/wl_linux.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
index e491df7..e4614fb 100644
--- a/src/wl/sys/wl_linux.c
+++ b/src/wl/sys/wl_linux.c
@@ -93,6 +93,10 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev);
#include <wlc_wowl.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
+#define PDE_DATA pde_data
+#endif
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
static void wl_timer(struct timer_list *tl);
#else
@@ -490,6 +494,12 @@ wl_if_setup(struct net_device *dev)
#endif
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
+static inline void eth_hw_addr_set(struct net_device *dev, const void *addr) {
+ memcpy(dev->dev_addr, addr, ETHER_ADDR_LEN);
+}
+#endif
+
static wl_info_t *
wl_attach(uint16 vendor, uint16 device, ulong regs,
uint bustype, void *btparam, uint irq, uchar* bar1_addr, uint32 bar1_size)
@@ -634,7 +644,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
WL_ERROR(("wl%d: Error setting MAC ADDRESS\n", unit));
}
#endif
- bcopy(&wl->pub->cur_etheraddr, dev->dev_addr, ETHER_ADDR_LEN);
+ eth_hw_addr_set(dev, wl->pub->cur_etheraddr.octet);
online_cpus = 1;
@@ -1835,7 +1845,7 @@ wl_set_mac_address(struct net_device *dev, void *addr)
WL_LOCK(wl);
- bcopy(sa->sa_data, dev->dev_addr, ETHER_ADDR_LEN);
+ eth_hw_addr_set(dev, sa->sa_data);
err = wlc_iovar_op(wl->wlc, "cur_etheraddr", NULL, 0, sa->sa_data, ETHER_ADDR_LEN,
IOV_SET, (WL_DEV_IF(dev))->wlcif);
WL_UNLOCK(wl);
@@ -3010,7 +3020,7 @@ _wl_add_monitor_if(wl_task_t *task)
else
dev->type = ARPHRD_IEEE80211_RADIOTAP;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN);
+#else
+ eth_hw_addr_set(wl->dev, dev->dev_addr);
+#endif
- bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN);
+ eth_hw_addr_set(dev, wl->dev->dev_addr);
#if defined(WL_USE_NETDEV_OPS)
dev->netdev_ops = &wl_netdev_monitor_ops;
@@ -3261,7 +3265,11 @@
static ssize_t
wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
wl_info_t * wl = PDE_DATA(file_inode(filp));
+#else
+ wl_info_t * wl = pde_data(file_inode(filp));
+#endif
#endif
int bcmerror, len;
int to_user = 0;
@@ -3318,7 +3326,11 @@
static ssize_t
wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
wl_info_t * wl = PDE_DATA(file_inode(filp));
+#else
+ wl_info_t * wl = pde_data(file_inode(filp));
+#endif
#endif
int from_user = 0;
int bcmerror;
--
2.35.1

71
pkgs/os-specific/linux/broadcom-sta/linux-5.18.patch Normal file
View File

@ -0,0 +1,71 @@
diff -u -r a/src/shared/linux_osl.c b/src/shared/linux_osl.c
--- a/src/shared/linux_osl.c 2022-05-24 20:51:15.662604980 +0000
+++ b/src/shared/linux_osl.c 2022-05-24 21:13:38.264472425 +0000
@@ -599,6 +599,8 @@
va = kmalloc(size, GFP_ATOMIC | __GFP_ZERO);
if (va)
*pap = (ulong)__virt_to_phys(va);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
+ va = dma_alloc_coherent(&((struct pci_dev *)osh->pdev)->dev, size, (dma_addr_t*)pap, GFP_ATOMIC);
#else
va = pci_alloc_consistent(osh->pdev, size, (dma_addr_t*)pap);
#endif
@@ -612,6 +614,8 @@
#ifdef __ARM_ARCH_7A__
kfree(va);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
+ dma_free_coherent(&((struct pci_dev *)osh->pdev)->dev, size, va, (dma_addr_t)pa);
#else
pci_free_consistent(osh->pdev, size, va, (dma_addr_t)pa);
#endif
@@ -623,7 +627,11 @@
int dir;
ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
+ dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
+#else
dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
+#endif
#if defined(__ARM_ARCH_7A__) && defined(BCMDMASGLISTOSL)
if (dmah != NULL) {
@@ -641,7 +649,11 @@
ASSERT(totsegs + nsegs <= MAX_DMA_SEGS);
sg->page_link = 0;
sg_set_buf(sg, PKTDATA(osh, skb), PKTLEN(osh, skb));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
+ dma_map_single(&((struct pci_dev *)osh->pdev)->dev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir);
+#else
pci_map_single(osh->pdev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir);
+#endif
}
totsegs += nsegs;
totlen += PKTLEN(osh, skb);
@@ -656,7 +668,11 @@
}
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
+ return (dma_map_single(&((struct pci_dev *)osh->pdev)->dev, va, size, dir));
+#else
return (pci_map_single(osh->pdev, va, size, dir));
+#endif
}
void BCMFASTPATH
@@ -665,8 +681,13 @@
int dir;
ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
+ dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE;
+ dma_unmap_single(&((struct pci_dev *)osh->pdev)->dev, (uint32)pa, size, dir);
+#else
dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
pci_unmap_single(osh->pdev, (uint32)pa, size, dir);
+#endif
}
#if defined(BCMDBG_ASSERT)

94
pkgs/os-specific/linux/broadcom-sta/pedantic-fix.patch Normal file
View File

@ -0,0 +1,94 @@
diff --git a/src/shared/linux_osl.c b/shared/linux_osl.c
index 711b771..5a2636a 100644
--- a/src/shared/linux_osl.c
+++ b/src/shared/linux_osl.c
@@ -1105,7 +1105,7 @@ osl_os_get_image_block(char *buf, int len, void *image)
if (!image)
return 0;
- rdlen = kernel_read(fp, fp->f_pos, buf, len);
+ rdlen = kernel_read(fp, (void *)fp->f_pos, (size_t)len, (loff_t *)buf);
if (rdlen > 0)
fp->f_pos += rdlen;
diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/wl/sys/wl_cfg80211_hybrid.c
index 41c16d8..d39d9de 100644
--- a/src/wl/sys/wl_cfg80211_hybrid.c
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
@@ -790,6 +790,7 @@ wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme)
break;
case NL80211_AUTHTYPE_NETWORK_EAP:
WL_DBG(("network eap\n"));
+ break;
default:
val = 2;
WL_ERR(("invalid auth type (%d)\n", sme->auth_type));
@@ -2347,21 +2348,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
const wl_event_msg_t *e, void *data)
{
struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
+ s32 err = 0;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
struct cfg80211_bss *bss;
struct wlc_ssid *ssid;
+ struct cfg80211_roam_info roam_info;
ssid = &wl->profile->ssid;
bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
- struct cfg80211_roam_info roam_info = {
- .bss = bss,
- .req_ie = conn_info->req_ie,
- .req_ie_len = conn_info->req_ie_len,
- .resp_ie = conn_info->resp_ie,
- .resp_ie_len = conn_info->resp_ie_len,
- };
+ roam_info.bss = bss;
+ roam_info.req_ie = conn_info->req_ie;
+ roam_info.req_ie_len = conn_info->req_ie_len;
+ roam_info.resp_ie = conn_info->resp_ie;
+ roam_info.resp_ie_len = conn_info->resp_ie_len;
#endif
- s32 err = 0;
wl_get_assoc_ies(wl);
memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
diff --git a/src/wl/sys/wl_iw.h b/wl/sys/wl_iw.h
index 3ab084f..471d11f 100644
--- a/src/wl/sys/wl_iw.h
+++ b/src/wl/sys/wl_iw.h
@@ -70,7 +70,6 @@ struct cntry_locales_custom {
#define WL_IW_RSSI_EXCELLENT -57
#define WL_IW_RSSI_INVALID 0
#define MAX_WX_STRING 80
-#define isprint(c) bcm_isprint(c)
#define WL_IW_SET_ACTIVE_SCAN (SIOCIWFIRSTPRIV+1)
#define WL_IW_GET_RSSI (SIOCIWFIRSTPRIV+3)
#define WL_IW_SET_PASSIVE_SCAN (SIOCIWFIRSTPRIV+5)
diff --git a/src/wl/sys/wl_linux.c b/wl/sys/wl_linux.c
index d13fb98..97ae2a6 100644
--- a/src/wl/sys/wl_linux.c
+++ b/src/wl/sys/wl_linux.c
@@ -797,14 +797,15 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_read_config_dword(pdev, 0x40, &val);
if ((val & 0x0000ff00) != 0)
pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
- bar1_size = pci_resource_len(pdev, 2);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
- bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
- bar1_size);
- #else
- bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
- bar1_size);
- #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+
+ bar1_size = pci_resource_len(pdev, 2);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
+ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
+ bar1_size);
+ #else
+ bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
+ bar1_size);
+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
pdev->irq, bar1_addr, bar1_size);

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

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
stdenv.mkDerivation rec {
version = "2022-06-06";
version = "2022-06-12";
pname = "oh-my-zsh";
rev = "d41ca84af1271e8bfbe26f581cebe3b86521d0db";
rev = "50550c70eaa36e79fdf380bdc4ddad4a1ad581a0";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "87jAe5cEPj6e1raovj8sD4LZB1sfrSZkCleW8of2HP8=";
sha256 = "lZ63wtvrF5DMXXGE6GC6T4oEpN0G47Pvhas5IZ+vzAA=";
};
strictDeps = true;

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

@ -833,6 +833,7 @@ mapAliases ({
mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21
mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12
man_db = throw "'man_db' has been renamed to/replaced by 'man-db'"; # Converted to throw 2022-02-22
manul = throw "manul has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-01
manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22
marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
mariadb-client = hiPrio mariadb.client; #added 2019.07.28

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

@ -26872,8 +26872,6 @@ with pkgs;
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
manul = callPackage ../development/tools/manul { };
mindforger = libsForQt5.callPackage ../applications/editors/mindforger { };
mi2ly = callPackage ../applications/audio/mi2ly {};