mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-16 09:38:17 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
f47328b3c0
@ -1,32 +0,0 @@
|
||||
{ appimageTools, lib, fetchurl }:
|
||||
let
|
||||
pname = "apple-music-electron";
|
||||
version = "1.5.5";
|
||||
name = "Apple.Music-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cryptofyre/Apple-Music-Electron/releases/download/v${version}/${name}.AppImage";
|
||||
sha256 = "1gb6j3nvam9fcpsgiv56jccg9a4y14vzsyw11h3hckaigy90knpx";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit name src; };
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial Apple Music application without having to bother with a Web Browser or iTunes";
|
||||
homepage = "https://github.com/iiFir3z/Apple-Music-Electron";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ivar ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.171.0";
|
||||
version = "1.172.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-+NTxZ5UkmaFDcTYliNi/5c8xGztVu6P8C7Ga99MHSFM=";
|
||||
hash = "sha256-AYIgYLrOVutsv0cHUd/TwNAyLbog6xjcepV9/3fTshc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.09.18",
|
||||
"hash": "sha256-HjW4V7MctQoHbDYIlMv7VS0nS7FFG6Qir0sCju+isI0="
|
||||
"rev": "2022.10.01",
|
||||
"hash": "sha256-cfjpPTOc8KjhaD1wVY3Tb/lQwEeT3Rq22lJ1MKdTNF0="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.09.18",
|
||||
"hash": "sha256-yIbIRo4hpwbCdH+3fIhjnQPtdvuFmfJSqloKjWqKEuY="
|
||||
"rev": "2022.10.03",
|
||||
"hash": "sha256-2XP3LyB18ZHLQOxzP4lBuhlUA8u1+wHl97cxmRYa7Xg="
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
@ -47,23 +47,23 @@ let
|
||||
# and often with different versions. We write them on three lines
|
||||
# like this (rather than using {}) so that the updater script can
|
||||
# find where to edit them.
|
||||
versions.aarch64-darwin = "5.11.9.10046";
|
||||
versions.x86_64-darwin = "5.11.9.10046";
|
||||
versions.x86_64-linux = "5.11.10.4400";
|
||||
versions.aarch64-darwin = "5.12.0.11129";
|
||||
versions.x86_64-darwin = "5.12.0.11129";
|
||||
versions.x86_64-linux = "5.12.0.4682";
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
|
||||
name = "zoomusInstallerFull.pkg";
|
||||
hash = "sha256-Z+K811azMRnhptZ1UvM+o5IgE0F4p9BrntJC9IgPU7U=";
|
||||
hash = "sha256-0XhqJrls4X8wO9VNmmmUGexJkA9NDkwJkYRjmyV1kAU=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
|
||||
hash = "sha256-7U7qT3xlm5LqcJByMWxhZnqs6XBzylEGhqTNUgiaXJY=";
|
||||
hash = "sha256-E7+zMrW4y1RfsR1LrxCJRRVlA+BuhzwMI/sfzqNHObo=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-Pi1MtuCHzkQACamsNOIS6pbM03L1CmyosbpdrYVNCkQ=";
|
||||
hash = "sha256-UNtxyR4SMCP9c1Dre/arfdSVZbAV8qoHyHlvj3ZbXIs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -11,13 +11,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octopus";
|
||||
version = "11.4";
|
||||
version = "12.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "octopus-code";
|
||||
repo = "octopus";
|
||||
rev = version;
|
||||
sha256 = "1z423sjpc4ajjy3s7623z3rfwmp2hgis7iiiy8gb5apw73k33dyv";
|
||||
sha256 = "sha256-OF6zcyxtWXxMUIAB8YxQ3453JAmw6Q3RnNMjr4HgTmE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia-bin";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
||||
sha256 = "sha256-MwVO5kfuik+1T8BREOB+C1PgRZH+U9Cky0x+16BekfE=";
|
||||
sha256 = "sha256-ZxzzpFC2OnF+Hu3X9pCH44VvAVsuFGy1SSjxmjwF55Y=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
|
||||
sha256 = "sha256-ugaDesKJlUe7t5mYnxFGT+zWeCImhxw7ekhhlIEEJnk=";
|
||||
sha256 = "sha256-+RwnZCj/swrMIJ4Os+cLHJEmDoh+EdS2b1VFCEtTBUc=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||
sha256 = "sha256-MeRlX0s3fnPW9YPFOdAiHte0gKPqCRgz0ABTFhhcW2E=";
|
||||
sha256 = "sha256-5Xz8Lm2JF1Ckf3zwNVmk6PchK/VJAPJqnxL9bQCdTKk=";
|
||||
};
|
||||
|
||||
patches =
|
||||
@ -44,10 +44,6 @@ stdenv.mkDerivation rec {
|
||||
url = path "julia-hardcoded-libs.patch";
|
||||
sha256 = "sha256-kppSpVA7bRohd0wXDs4Jgct9ocHnpbeiiSz7ElFom1U=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = path "julia-libgit-1.4.patch";
|
||||
sha256 = "sha256-rcVXYoGpAxwAbAl33n0/Rkwsi8ZJz8cnHQ5CalUx+1o=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = path "julia-libunwind-1.6.patch";
|
||||
sha256 = "sha256-zqMh9+Fjgd15XuINe9Xtpk+bRTwB0T6WCWLrJyOQfiQ=";
|
||||
|
||||
@ -21,6 +21,7 @@ base.withExtensions ({ all, ... }: with all; ([
|
||||
gettext
|
||||
gmp
|
||||
iconv
|
||||
imap
|
||||
intl
|
||||
ldap
|
||||
mbstring
|
||||
@ -49,4 +50,4 @@ base.withExtensions ({ all, ... }: with all; ([
|
||||
xmlwriter
|
||||
zip
|
||||
zlib
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [ imap ]))
|
||||
]))
|
||||
|
||||
@ -21,6 +21,7 @@ base.withExtensions ({ all, ... }: with all; ([
|
||||
gettext
|
||||
gmp
|
||||
iconv
|
||||
imap
|
||||
intl
|
||||
ldap
|
||||
mbstring
|
||||
@ -49,4 +50,4 @@ base.withExtensions ({ all, ... }: with all; ([
|
||||
xmlwriter
|
||||
zip
|
||||
zlib
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [ imap ]))
|
||||
]))
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-containerservice";
|
||||
version = "20.3.0";
|
||||
version = "20.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "sha256-p2q1fzpPrwYKUAilPTGzRDlkT9OKqnjZVN2jslY/WSw=";
|
||||
sha256 = "sha256-X2Pz7Rx5utwOfiG2wLbdloQF7wM9bF80J5EOaB4k6jQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-monitor";
|
||||
version = "4.0.1";
|
||||
version = "5.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-rwUhKm9arvUW3EWAgv3+SdJYR54Hob2RmMDA6IjEpn4=";
|
||||
hash = "sha256-U5OSFnOZV7/eXUEDU1TQBywrXjxwQ8qiEQJVFd3y57Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,17 +5,21 @@
|
||||
, fetchPypi
|
||||
, pyjwt
|
||||
, python-jose
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "djangorestframework-simplejwt";
|
||||
version = "5.2.0";
|
||||
version = "5.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "djangorestframework_simplejwt";
|
||||
inherit version;
|
||||
sha256 = "sha256-pgsJr7J9ka0deskEzGMr1Szs6tjzifD6FTLOsPt1enQ=";
|
||||
hash = "sha256-dhOHTDIqP24zDMEY+fAKPblX/qf4477YG6RRhTzR29U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "huawei-lte-api";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Salamek";
|
||||
repo = "huawei-lte-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZjSD+/okbFF14YQgCzzH1+FDS+MZQZb1JUINOKdSshs=";
|
||||
hash = "sha256-BZn9iBMOd1vyukxiLd8GPKrq/H+gqQtSYvIgniWJLNM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
51
pkgs/development/python-modules/ibeacon-ble/default.nix
Normal file
51
pkgs/development/python-modules/ibeacon-ble/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibeacon-ble";
|
||||
version = "0.7.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+DPbIIarEAaH1bNzo+FvLp0QpNUPhaJ8nPLdKJKfz0k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
home-assistant-bluetooth
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ibeacon_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for iBeacon BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/ibeacon-ble";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
55
pkgs/development/python-modules/kegtron-ble/default.nix
Normal file
55
pkgs/development/python-modules/kegtron-ble/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, bluetooth-data-tools
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kegtron-ble";
|
||||
version = "0.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-O5I5shW8nL2RAQptS2Bp/GI/4L6o0xXXmwYvRq0MM8o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bluetooth-data-tools
|
||||
bluetooth-sensor-state-data
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=kegtron_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kegtron_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Kegtron BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/kegtron-ble";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydmd";
|
||||
version = "0.4.0.post2209";
|
||||
version = "0.4.0.post2210";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "mathLab";
|
||||
repo = "PyDMD";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-09KnVuBNe1aVjO1OW+rhVsHplSO4qBIayy//9Jv0fQM=";
|
||||
sha256 = "sha256-2GSmd+OxdGW9XdLGL08Bnrz0WCtTAYQtYHf2gM5CFIE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,26 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynobo";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "echoromeo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7OWCp09XxCZJMz0BJWKfGkkl8z4XpRS2sjowp/bnl0A=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-msJClYHljib8sATooI8q4irz6cC8hEgvcxLmmgatvwU=";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pynobo" ];
|
||||
pythonImportsCheck = [
|
||||
"pynobo"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python 3 TCP/IP interface for Nobo Hub/Nobo Energy Control devices";
|
||||
description = "Python TCP/IP interface for Nobo Hub/Nobo Energy Control devices";
|
||||
homepage = "https://github.com/echoromeo/pynobo";
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.19.8";
|
||||
version = "0.19.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1vzHd6ouWZrc951a5s0OsjeMbEluP/kS7LDiZ3YOUqk=";
|
||||
hash = "sha256-AkaFymWvHLPLHp/Z5RqRGe5RcJk8utcDkO33UzBQ+OA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-bindgen-cli";
|
||||
version = "0.2.82";
|
||||
version = "0.2.83";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-BQ8v3rCLUvyCCdxo5U+NHh30l9Jwvk9Sz8YQv6fa0SU=";
|
||||
sha256 = "sha256-+PWxeRL5MkIfJtfN3/DjaDlqRgBgWZMa6dBt1Q+lpd0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-mP85+qi2KA0GieaBzbrQOBqYxBZNRJipvd2brCRGyOM=";
|
||||
cargoSha256 = "sha256-GwLeA6xLt7I+NzRaqjwVpt1pzRex1/snq30DPv4FR+g=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
18
pkgs/os-specific/linux/kernel/linux-6.0.nix
Normal file
18
pkgs/os-specific/linux/kernel/linux-6.0.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.0";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = versions.majorMinor version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchpatch, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper
|
||||
{ lib, stdenv, fetchpatch, kernel, elfutils, python2, python3, python3Packages, perl, newt, slang, asciidoc, xmlto, makeWrapper
|
||||
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils-unwrapped
|
||||
, libiberty, audit, libbfd, libbfd_2_38, libopcodes, libopcodes_2_38, openssl, systemtap, numactl
|
||||
, zlib
|
||||
@ -53,7 +53,8 @@ stdenv.mkDerivation {
|
||||
++ lib.optional withGtk gtk2
|
||||
++ (if (lib.versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ])
|
||||
++ lib.optional withZstd zstd
|
||||
++ lib.optional withLibcap libcap;
|
||||
++ lib.optional withLibcap libcap
|
||||
++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3Packages.setuptools;
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=cpp"
|
||||
@ -63,7 +64,7 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts
|
||||
patchShebangs scripts tools/perf/pmu-events/jevents.py
|
||||
'';
|
||||
|
||||
doCheck = false; # requires "sparse"
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "panoply";
|
||||
version = "5.2.0";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
|
||||
sha256 = "sha256-ko2UB7jy2sob5i/TAjjJVBuVyvqgh4awB1jEv8DplM0=";
|
||||
sha256 = "sha256-ukIH6hiWg8GMq28chfxIb2uHZaaymL9x/BhbFnIzw0Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pam, openssl }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pam, openssl, libkrb5 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uw-imap";
|
||||
@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optional (!stdenv.isDarwin) pam;
|
||||
buildInputs = [
|
||||
openssl
|
||||
(if stdenv.isDarwin then libkrb5 else pam) # Matches the make target.
|
||||
];
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch";
|
||||
@ -43,11 +45,11 @@ stdenv.mkDerivation rec {
|
||||
tools/{an,ua} $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.washington.edu/imap/";
|
||||
description = "UW IMAP toolkit - IMAP-supporting software developed by the UW";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = with lib.platforms; linux;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -78,6 +78,7 @@ mapAliases ({
|
||||
ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
|
||||
ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
|
||||
antimicroX = antimicrox; # Added 2021-10-31
|
||||
apple-music-electron = throw "'apple-music-electron' is end of life and has been removed, you can use 'cider' instead"; # Added 2022-10-02
|
||||
ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28
|
||||
arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22
|
||||
asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22
|
||||
@ -651,6 +652,7 @@ mapAliases ({
|
||||
linuxPackages_5_18 = linuxKernel.packages.linux_5_18;
|
||||
linuxPackages_5_19 = linuxKernel.packages.linux_5_19;
|
||||
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
|
||||
linuxPackages_6_0 = linuxKernel.packages.linux_6_0;
|
||||
linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14;
|
||||
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
|
||||
linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
|
||||
@ -671,6 +673,7 @@ mapAliases ({
|
||||
linux_5_18 = linuxKernel.kernels.linux_5_18;
|
||||
linux_5_19 = linuxKernel.kernels.linux_5_19;
|
||||
linux_5_4 = linuxKernel.kernels.linux_5_4;
|
||||
linux_6_0 = linuxKernel.kernels.linux_6_0;
|
||||
linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
|
||||
linux_rpi0 = linuxKernel.kernels.linux_rpi1;
|
||||
linux_rpi02w = linuxKernel.kernels.linux_rpi3;
|
||||
|
||||
@ -4885,8 +4885,6 @@ with pkgs;
|
||||
|
||||
appleseed = callPackage ../tools/graphics/appleseed { };
|
||||
|
||||
apple-music-electron = callPackage ../applications/audio/apple-music-electron { };
|
||||
|
||||
apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { };
|
||||
|
||||
arping = callPackage ../tools/networking/arping { };
|
||||
|
||||
@ -9,11 +9,11 @@ let
|
||||
mkMassRebuild = args: mkOption (builtins.removeAttrs args [ "feature" ] // {
|
||||
type = args.type or (types.uniq types.bool);
|
||||
default = args.default or false;
|
||||
description = (args.description or ''
|
||||
description = lib.mdDoc ((args.description or ''
|
||||
Whether to ${args.feature} while building nixpkgs packages.
|
||||
'') + ''
|
||||
Changing the default may cause a mass rebuild.
|
||||
'';
|
||||
'');
|
||||
});
|
||||
|
||||
options = {
|
||||
@ -34,35 +34,35 @@ let
|
||||
/* Config options */
|
||||
|
||||
warnUndeclaredOptions = mkOption {
|
||||
description = "Whether to warn when <literal>config</literal> contains an unrecognized attribute.";
|
||||
description = lib.mdDoc "Whether to warn when `config` contains an unrecognized attribute.";
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
|
||||
doCheckByDefault = mkMassRebuild {
|
||||
feature = "run <literal>checkPhase</literal> by default";
|
||||
feature = "run `checkPhase` by default";
|
||||
};
|
||||
|
||||
strictDepsByDefault = mkMassRebuild {
|
||||
feature = "set <literal>strictDeps</literal> to true by default";
|
||||
feature = "set `strictDeps` to true by default";
|
||||
};
|
||||
|
||||
enableParallelBuildingByDefault = mkMassRebuild {
|
||||
feature = "set <literal>enableParallelBuilding</literal> to true by default";
|
||||
feature = "set `enableParallelBuilding` to true by default";
|
||||
};
|
||||
|
||||
configurePlatformsByDefault = mkMassRebuild {
|
||||
feature = "set <literal>configurePlatforms</literal> to <literal>[\"build\" \"host\"]</literal> by default";
|
||||
feature = "set `configurePlatforms` to `[\"build\" \"host\"]` by default";
|
||||
};
|
||||
|
||||
contentAddressedByDefault = mkMassRebuild {
|
||||
feature = "set <literal>__contentAddressed</literal> to true by default";
|
||||
feature = "set `__contentAddressed` to true by default";
|
||||
};
|
||||
|
||||
allowAliases = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Whether to expose old attribute names for compatibility.
|
||||
|
||||
The recommended setting is to enable this, as it
|
||||
@ -82,10 +82,10 @@ let
|
||||
default = false;
|
||||
# getEnv part is in check-meta.nix
|
||||
defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"'';
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Whether to allow unfree packages.
|
||||
|
||||
See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree">Installing unfree packages</link> in the NixOS manual.
|
||||
See [Installing unfree packages](https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree) in the NixOS manual.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -94,10 +94,10 @@ let
|
||||
default = false;
|
||||
# getEnv part is in check-meta.nix
|
||||
defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"'';
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Whether to allow broken packages.
|
||||
|
||||
See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-broken">Installing broken packages</link> in the NixOS manual.
|
||||
See [Installing broken packages](https://nixos.org/manual/nixpkgs/stable/#sec-allow-broken) in the NixOS manual.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -106,22 +106,22 @@ let
|
||||
default = false;
|
||||
# getEnv part is in check-meta.nix
|
||||
defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"'';
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Whether to allow unsupported packages.
|
||||
|
||||
See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-unsupported-system">Installing packages on unsupported systems</link> in the NixOS manual.
|
||||
See [Installing packages on unsupported systems](https://nixos.org/manual/nixpkgs/stable/#sec-allow-unsupported-system) in the NixOS manual.
|
||||
'';
|
||||
};
|
||||
|
||||
showDerivationWarnings = mkOption {
|
||||
type = types.listOf (types.enum [ "maintainerless" ]);
|
||||
default = [];
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Which warnings to display for potentially dangerous
|
||||
or deprecated values passed into `stdenv.mkDerivation`.
|
||||
|
||||
A list of warnings can be found in
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/check-meta.nix">/pkgs/stdenv/generic/check-meta.nix</link>.
|
||||
[/pkgs/stdenv/generic/check-meta.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/check-meta.nix).
|
||||
|
||||
This is not a stable interface; warnings may be added, changed
|
||||
or removed without prior notice.
|
||||
|
||||
@ -177,6 +177,13 @@ in {
|
||||
];
|
||||
};
|
||||
|
||||
linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
];
|
||||
};
|
||||
|
||||
linux_testing = let
|
||||
testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
|
||||
kernelPatches = [
|
||||
@ -531,6 +538,7 @@ in {
|
||||
linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
|
||||
linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
|
||||
linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19);
|
||||
linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0);
|
||||
};
|
||||
|
||||
rtPackages = {
|
||||
@ -588,7 +596,7 @@ in {
|
||||
packageAliases = {
|
||||
linux_default = packages.linux_5_15;
|
||||
# Update this when adding the newest kernel major version!
|
||||
linux_latest = packages.linux_5_19;
|
||||
linux_latest = packages.linux_6_0;
|
||||
linux_mptcp = packages.linux_mptcp_95;
|
||||
linux_rt_default = packages.linux_rt_5_4;
|
||||
linux_rt_latest = packages.linux_rt_5_10;
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
, libffi
|
||||
, libiconv
|
||||
, libjpeg
|
||||
, libkrb5
|
||||
, libpng
|
||||
, libsodium
|
||||
, libwebp
|
||||
@ -342,10 +343,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
}
|
||||
{
|
||||
name = "imap";
|
||||
buildInputs = [ uwimap openssl pam pcre2 ];
|
||||
configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ];
|
||||
# uwimap doesn't build on darwin.
|
||||
enable = (!stdenv.isDarwin);
|
||||
buildInputs = [ uwimap openssl pam pcre2 libkrb5 ];
|
||||
configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" "--with-kerberos" ];
|
||||
}
|
||||
{
|
||||
name = "intl";
|
||||
|
||||
@ -4395,6 +4395,8 @@ in {
|
||||
|
||||
iaqualink = callPackage ../development/python-modules/iaqualink { };
|
||||
|
||||
ibeacon-ble = callPackage ../development/python-modules/ibeacon-ble { };
|
||||
|
||||
ibis = callPackage ../development/python-modules/ibis { };
|
||||
|
||||
ibis-framework = callPackage ../development/python-modules/ibis-framework { };
|
||||
@ -4982,6 +4984,8 @@ in {
|
||||
|
||||
keepkey = callPackage ../development/python-modules/keepkey { };
|
||||
|
||||
kegtron-ble = callPackage ../development/python-modules/kegtron-ble { };
|
||||
|
||||
keras-applications = callPackage ../development/python-modules/keras-applications { };
|
||||
|
||||
keras = callPackage ../development/python-modules/keras { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user