diff --git a/pkgs/applications/audio/apple-music-electron/default.nix b/pkgs/applications/audio/apple-music-electron/default.nix deleted file mode 100644 index 850f644afc34..000000000000 --- a/pkgs/applications/audio/apple-music-electron/default.nix +++ /dev/null @@ -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" ]; - }; -} diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index bed21ea5c3af..ad5e5b2d5c84 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -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 = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 529c66125e87..2b78b5155bc2 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -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", diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f1a0de733834..3e1d4e524d3d 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -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="; }; }; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 25749b8947c4..df9b35a24466 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -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 = [ diff --git a/pkgs/development/compilers/julia/1.8-bin.nix b/pkgs/development/compilers/julia/1.8-bin.nix index 67241bbdcfe0..59966f48fd3f 100644 --- a/pkgs/development/compilers/julia/1.8-bin.nix +++ b/pkgs/development/compilers/julia/1.8-bin.nix @@ -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}"); diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index f09e67f1518f..e67a02b040ab 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -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="; diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index c58c79415d40..97ef232135ec 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -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 ])) +])) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index aa190bc3866c..7e73787256d2 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -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 ])) +])) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 77c1ece09b29..5bedaef2b4da 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index d2583b157f76..20d72093dcd3 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 7a24ba5a8454..e41d6ed51dab 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index 2effc358f5dd..a7186478b2a0 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix new file mode 100644 index 000000000000..ad58a7153569 --- /dev/null +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/kegtron-ble/default.nix b/pkgs/development/python-modules/kegtron-ble/default.nix new file mode 100644 index 000000000000..4af4817d7f84 --- /dev/null +++ b/pkgs/development/python-modules/kegtron-ble/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 92caf8a0fa0e..f813cfb23214 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix index 83422d319132..1fe4262df4ca 100644 --- a/pkgs/development/python-modules/pynobo/default.nix +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 497b516a6636..184d687deedc 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -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 = [ diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 1fd0284784c6..adc088baf217 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -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 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix new file mode 100644 index 000000000000..b099c5dc140c --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -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 { })) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index dcb1c4e9dcc1..5e0b5850f015 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -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" diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index 611874ab7684..31a9e3a7f041 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -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 ]; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index a10a779097a5..4bd2f872caf3 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -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 = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 891f83f1a61d..b2f6dc7f3781 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cd3bba2a00b..5d6778a9ef93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 5057ca10e105..a47655f11424 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -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 config 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 checkPhase by default"; + feature = "run `checkPhase` by default"; }; strictDepsByDefault = mkMassRebuild { - feature = "set strictDeps to true by default"; + feature = "set `strictDeps` to true by default"; }; enableParallelBuildingByDefault = mkMassRebuild { - feature = "set enableParallelBuilding to true by default"; + feature = "set `enableParallelBuilding` to true by default"; }; configurePlatformsByDefault = mkMassRebuild { - feature = "set configurePlatforms to [\"build\" \"host\"] by default"; + feature = "set `configurePlatforms` to `[\"build\" \"host\"]` by default"; }; contentAddressedByDefault = mkMassRebuild { - feature = "set __contentAddressed 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 Installing unfree packages 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 Installing broken packages 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 Installing packages on unsupported systems 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 - /pkgs/stdenv/generic/check-meta.nix. + [/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. diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 139848b4fe97..6cf5da069e0a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -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; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 2be63015122f..e5eb38c32e44 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -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"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f7a5806981e..fb199274bf18 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { };