diff --git a/nixos/modules/services/misc/dendrite.nix b/nixos/modules/services/misc/dendrite.nix index 35bec40926e..ac5df9951b3 100644 --- a/nixos/modules/services/misc/dendrite.nix +++ b/nixos/modules/services/misc/dendrite.nix @@ -222,6 +222,13 @@ in for available options with which to populate settings. ''; }; + openRegistration = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Allow open registration without secondary verification (reCAPTCHA). + ''; + }; }; config = lib.mkIf cfg.enable { @@ -263,6 +270,8 @@ in "--https-bind-address :${builtins.toString cfg.httpsPort}" "--tls-cert ${cfg.tlsCert}" "--tls-key ${cfg.tlsKey}" + ] ++ lib.optionals cfg.openRegistration [ + "--really-enable-open-registration" ]); ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; diff --git a/nixos/tests/dendrite.nix b/nixos/tests/dendrite.nix index a444c9b2001..d4a5bb13226 100644 --- a/nixos/tests/dendrite.nix +++ b/nixos/tests/dendrite.nix @@ -17,6 +17,7 @@ import ./make-test-python.nix ( homeserver = { pkgs, ... }: { services.dendrite = { enable = true; + openRegistration = true; settings = { global.server_name = "test-dendrite-server.com"; global.private_key = private_key; diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix deleted file mode 100644 index 3f62e73e7e4..00000000000 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }: - -stdenv.mkDerivation rec { - pname = "deadbeef-infobar-plugin"; - version = "1.4"; - - src = fetchurl { - url = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar/downloads/deadbeef-infobar-${version}.tar.gz"; - sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ deadbeef gtk3 libxml2 ]; - - buildFlags = [ "gtk3" ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/deadbeef - cp gtk3/ddb_infobar_gtk3.so $out/lib/deadbeef - - runHook postInstall - ''; - - meta = with lib; { - broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash) - description = "DeaDBeeF Infobar Plugin"; - homepage = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.jtojnar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix deleted file mode 100644 index 5de48d1b296..00000000000 --- a/pkgs/applications/audio/split2flac/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, shntool, cuetools -, flac, faac, mp4v2, wavpack, mac -, imagemagick, libiconv, enca, lame, mutagen, vorbis-tools -, aacgain, mp3gain, vorbisgain -}: - -let - wrapSplit2flac = format: '' - makeWrapper $out/bin/.split2flac-wrapped $out/bin/split2${format} \ - --set SPLIT2FLAC_FORMAT ${format} \ - --prefix PATH : ${lib.makeBinPath [ - shntool cuetools - flac faac mp4v2 wavpack mac - imagemagick libiconv enca lame mutagen vorbis-tools - aacgain mp3gain vorbisgain - ]} - ''; - -in stdenv.mkDerivation rec { - pname = "split2flac"; - version = "122"; - - src = fetchFromGitHub { - owner = "ftrvxmtrx"; - repo = "split2flac"; - rev = version; - sha256 = "1a71amamip25hhqx7wwzfcl3d5snry9xsiha0kw73iq2m83r2k63"; - }; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - patchPhase = '' - substituteInPlace split2flac \ - --replace 'FORMAT="''${0##*split2}"' 'FORMAT=''${SPLIT2FLAC_FORMAT:-flac}' - ''; - - installPhase = '' - mkdir -p $out/share/bash-completion/completions - cp split2flac-bash-completion.sh \ - $out/share/bash-completion/completions/split2flac-bash-completion.sh - - mkdir -p $out/bin - cp split2flac $out/bin/.split2flac-wrapped - - ${wrapSplit2flac "flac"} - ${wrapSplit2flac "mp3"} - ${wrapSplit2flac "ogg"} - ${wrapSplit2flac "m4a"} - ${wrapSplit2flac "wav"} - ''; - - meta = with lib; { - description = "Split flac/ape/wv/wav + cue sheet into separate tracks"; - homepage = "https://github.com/ftrvxmtrx/split2flac"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; - }; -} diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix index 2ec9562c620..ffe4741d179 100644 --- a/pkgs/applications/audio/sptlrx/default.nix +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, sptlrx }: buildGoModule rec { pname = "sptlrx"; @@ -15,6 +15,12 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + passthru.tests.version = testers.testVersion { + package = sptlrx; + # TODO Wrong version in `0.2.0`. Has been fixed upstream. + version = "v0.1.0"; + }; + meta = with lib; { description = "Spotify lyrics in your terminal"; homepage = "https://github.com/raitonoberu/sptlrx"; diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix deleted file mode 100644 index 904c9f8f402..00000000000 --- a/pkgs/applications/graphics/rapcad/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline -, qtbase, qmake, libGLU -}: - -stdenv.mkDerivation rec { - version = "0.9.8"; - pname = "rapcad"; - - src = fetchFromGitHub { - owner = "gilesbathgate"; - repo = "rapcad"; - rev = "v${version}"; - sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir"; - }; - - patches = [ - (fetchurl { - url = "https://github.com/GilesBathgate/RapCAD/commit/278a8d6c7b8fe08f867002528bbab4a6319a7bb6.patch"; - sha256 = "1vvkyf0wg79zdzs5zlggfrr1lrp1x75dglzl0mspnycwldsdwznj"; - name = "disable-QVector-qHash.patch"; - }) - ]; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ]; - - meta = with lib; { - license = licenses.gpl3; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - description = "Constructive solid geometry package"; - broken = true; # 2018-04-11 - }; -} diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix deleted file mode 100644 index 403df853343..00000000000 --- a/pkgs/applications/misc/multibootusb/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, - coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python3Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }: - -# Note: Multibootusb is tricky to maintain. It relies on the -# $PYTHONPATH variable containing some of their code, so that -# something like: -# -# from scripts import config -# -# works. It also relies on the current directory to find some runtime -# resources thanks to a use of __file__. -# -# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59 - -python3Packages.buildPythonApplication rec { - pname = "multibootusb"; - name = "${pname}-${version}"; - version = "9.2.0"; - - nativeBuildInputs = [ - wrapQtAppsHook - autoPatchelfHook - unzip - zip - ]; - - runTimeDeps = [ - coreutils - gnugrep - which - parted - util-linux - qemu - p7zip - gnused - mtools - procps - e2fsprogs - gptfdisk - ]; - - buildInputs = [ - libxcb - python3Packages.python - qt5.full - ]; - - src = fetchFromGitHub { - owner = "mbusb"; - repo = pname; - rev = "v${version}"; - - sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3"; - }; - - # Tests can't run inside the NixOS sandbox - # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" - doCheck = false; - - pythonPath = with python3Packages; [ - dbus-python - pyqt5 - pytest-shutil - pyudev - six - ]; - - # multibootusb ships zips with various versions of syslinux, we need to patchelf them - postPatch = '' - for zip in $(find . -name "*.zip"); do - zip=$(readlink -f $zip) - target="$(mktemp -d)" - pushd $target - unzip $zip - rm $zip - autoPatchelf . - zip -r $zip * - popd - done - ''; - - postInstall = '' - # This script doesn't work and it doesn't add much anyway - rm $out/bin/multibootusb-pkexec - - # The installed data isn't sufficient for whatever reason, missing gdisk/gdisk.exe - mkdir -p "$out/share/${pname}" - cp -r data "$out/share/${pname}/data" - ''; - - preFixup = '' - makeWrapperArgs+=( - # Firstly, add all necessary QT variables - "''${qtWrapperArgs[@]}" - - # Then, add the installed scripts/ directory to the python path - --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages" - - # Add some runtime dependencies - --prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}" - - # Finally, move to directory that contains data - --chdir "$out/share/${pname}" - ) - ''; - - meta = with lib; { - description = "Multiboot USB creator for Linux live disks"; - homepage = "http://multibootusb.org/"; - license = licenses.gpl2; - maintainers = []; # Looking for a maintainer! - broken = true; # "name 'config' is not defined", added 2021-02-06 - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 0872558d0f4..9321e491099 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -96,6 +96,7 @@ # WARNING: NEVER set any of the options below to `true` by default. # Set to `!privacySupport` or `false`. +, crashreporterSupport ? !privacySupport , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , webrtcSupport ? !privacySupport @@ -109,10 +110,6 @@ # `browser.eme.ui.enabled` and `media.gmp-widevinecdm.enabled` accordingly , drmSupport ? true -## other - -, crashreporterSupport ? false - # As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at # https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we # have permission to use the official firefox branding. diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index c75c5824283..96cddf0f42a 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.5.0"; + version = "2022.5.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA="; + hash = "sha256-yv4ulVkc7WX6T287kXecyE6lFlxh4YKAi2UCGkOf/lk="; }; vendorSha256 = null; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 86addd5bd69..25749b8947c 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.3"; + version = "11.4"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "0n04yvnc0rg3lvnkkdpbwkfl6zg544260p3s65vwkc5dflrhk34r"; + sha256 = "1z423sjpc4ajjy3s7623z3rfwmp2hgis7iiiy8gb5apw73k33dyv"; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome/default.nix similarity index 76% rename from pkgs/data/fonts/font-awesome-5/default.nix rename to pkgs/data/fonts/font-awesome/default.nix index 7f251232ebc..3403660b1e8 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: let - font-awesome = { version, sha256, rev ? version}: fetchFromGitHub { + font-awesome = { version, sha256, rev ? version }: fetchFromGitHub { name = "font-awesome-${version}"; @@ -21,18 +21,20 @@ let Font Awesome gives you scalable vector icons that can instantly be customized. This package includes only the OTF font. For full CSS etc. see the project website. ''; - homepage = "http://fortawesome.github.io/Font-Awesome/"; + homepage = "https://fontawesome.com/"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ abaldeau johnazoidberg ]; }; }; -in { - # Keeping version 4 because version 5 is incompatible for some icons. That +in +{ + # Keeping version 4 and 5 because version 6 is incompatible for some icons. That # means that projects which depend on it need to actively convert the # symbols. See: # https://github.com/greshake/i3status-rust/issues/130 # https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4 + # https://fontawesome.com/v6/docs/web/setup/upgrade/ v4 = font-awesome { version = "4.7.0"; rev = "v4.7.0"; @@ -42,4 +44,8 @@ in { version = "5.15.3"; sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0="; }; + v6 = font-awesome { + version = "6.1.1"; + sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA"; + }; } diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix new file mode 100644 index 00000000000..c884b5567dd --- /dev/null +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -0,0 +1,23 @@ +{ fetchzip, lib }: + +let + version = "1.500"; +in +fetchzip { + name = "sil-abyssinica-${version}"; + url = "mirror://debian/pool/main/f/fonts-sil-abyssinica/fonts-sil-abyssinica_${version}.orig.tar.xz"; + sha256 = "sha256-fCa88wG2JfHTaHaBkuvoncbcbrh3XNzc8ewS3W+W/fM="; + + postFetch = '' + mkdir -p $out/share/fonts + tar xf $downloadedFile --strip-components=1 -C $out/share/fonts AbyssinicaSIL-${version}/AbyssinicaSIL-R.ttf + ''; + + meta = with lib; { + description = "Unicode font for Ethiopian and Erythrean scripts (Amharic et al.)"; + homepage = "https://software.sil.org/abyssinica/"; + license = licenses.ofl; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix deleted file mode 100644 index 8eacd9706a8..00000000000 --- a/pkgs/development/libraries/libdap/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: - -stdenv.mkDerivation rec { - version = "3.20.6"; - pname = "libdap"; - - nativeBuildInputs = [ bison flex ]; - buildInputs = [ libuuid curl libxml2 ]; - - src = fetchurl { - url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; - sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m"; - }; - - meta = with lib; { - description = "A C++ SDK which contains an implementation of DAP"; - homepage = "https://www.opendap.org/software/libdap"; - license = licenses.lgpl2; - maintainers = [ maintainers.bzizou ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/development/libraries/libssh2/1_10.nix b/pkgs/development/libraries/libssh2/1_10.nix deleted file mode 100644 index edba7a84ef2..00000000000 --- a/pkgs/development/libraries/libssh2/1_10.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ libssh2, fetchurl }: - -libssh2.overrideAttrs (attrs: rec { - version = "1.10.0"; - src = fetchurl { - url = with attrs; "${meta.homepage}/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE="; - }; - patches = []; -}) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 06c073c718a..f0b4d0baf4f 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://xmlsoft.org/"; + homepage = "https://gitlab.gnome.org/GNOME/libxml2"; description = "XML parsing library for C"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix deleted file mode 100644 index 8e56e250ac4..00000000000 --- a/pkgs/development/libraries/openbr/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: - -stdenv.mkDerivation { - - version = "0.5"; - pname = "openbr"; - - src = fetchFromGitHub { - owner = "biometrics"; - repo = "openbr"; - rev = "cc364a89a86698cd8d3052f42a3cb520c929b325"; - sha256 = "12y00cf5dlzp9ciiwbihf6xhlkdxpydhscv5hwp83qjdllid9rrz"; - }; - - buildInputs = [ opencv qtbase qtsvg ]; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "Open Source Biometric Recognition"; - homepage = "http://openbiometrics.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [flosse]; - platforms = with lib.platforms; linux; - broken = true; - }; -} diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index ae311fe4bc7..d788b1e8c7c 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.0.7"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EEgEpil6/pa3gihiLZ5RrtTxP63H24VmMc8Nf1Vsrw8="; + hash = "sha256-FSH7MWtxYdJjCLpit2IhxXUFkGWml6P0SroUJ3iorRw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index de3ddb803aa..feafb56323c 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -3,21 +3,27 @@ , fetchPypi , azure-core , uamqp +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.7.0"; + version = "5.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6ac364e5f1c5b376604c3b5a25ad0be5e3a5f96368f590e05b47e6745f1006ee"; + sha256 = "509c6b351db0c1674a7c33308e6ffebc5a9bd2b0a9d10bcb2fa3d0a3a47d42d0"; }; propagatedBuildInputs = [ azure-core uamqp + typing-extensions ]; # too complicated to set up @@ -31,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Event Hubs Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-eventhub_${version}/sdk/eventhub/azure-eventhub/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 9e1c881805e..590f1d9f824 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.28"; + version = "0.28.29"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-FtZHZ48XGo+0aP4ARSfzI9xzFVptYhG6CDVGTT4oDBQ="; + sha256 = "sha256-Hwe8eshY5j+10fARCp7fMnZf2Sxal7+7Vj5DYVPNXks="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/moku/default.nix b/pkgs/development/python-modules/moku/default.nix new file mode 100644 index 00000000000..3ed68ce8b47 --- /dev/null +++ b/pkgs/development/python-modules/moku/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zeroconf +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "moku"; + version = "2.3"; + + /* + + Pypi's webpage lists + https://github.com/liquidinstruments/moku/archive/${version}.tar.gz as the + download link, but that repository doesn't exist from some reason :/. When + packaging this, I didn't find any mention of a git repo of the sources. Note + that the pymoku repo holds the + sources of the legacy API package. + + */ + src = fetchPypi { + inherit pname version; + hash = "sha256-EzVcECjJyrr2NLQkG0Yp/jYBMnsEP1/FnS5O3UplszI="; + }; + /* + + Note: If you run `moku download` and encounter the error: + + [Errno 13] Permission denied: '/nix/store/.../lib/python 3.9/site-packages/moku/data' + + Then use the $MOKU_DATA_PATH environment variable to control where the + downloaded files will go to. It is undocumented upstream and there's no + repository to contribute such documentation unfortunately. Also there is no + suitable default value for this on Nix systems, so there's no patch we can + apply locally to make the situation better. + + */ + + propagatedBuildInputs = [ + zeroconf + requests + setuptools + ]; + + pythonImportsCheck = [ + "moku" + ]; + + meta = with lib; { + description = "Python scripting interface to the Liquid Instruments Moku"; + homepage = "https://apis.liquidinstruments.com/starting-python.html"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index c233f88c73f..497af2e735d 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -44,8 +44,8 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # requires docker - "test/functional" + # requires kubeconfig + "test/integration" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pcapy-ng/default.nix b/pkgs/development/python-modules/pcapy-ng/default.nix new file mode 100644 index 00000000000..7fec65bfb52 --- /dev/null +++ b/pkgs/development/python-modules/pcapy-ng/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, libpcap +, pkgconfig +, pytestCheckHook +, python +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pcapy-ng"; + version = "1.0.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stamparm"; + repo = pname; + rev = version; + hash = "sha256-6LA2n7Kv0MiZcqUJpi0lDN4Q+GcOttYw7hJwVqK/DU0="; + }; + + nativeBuildInputs = [ + cython + pkgconfig + ]; + + buildInputs = [ + libpcap + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + cd tests + ''; + + pythonImportsCheck = [ + "pcapy" + ]; + + doCheck = pythonOlder "3.10"; + + pytestFlagsArray = [ + "pcapytests.py" + ]; + + meta = with lib; { + description = "Module to interface with the libpcap packet capture library"; + homepage = "https://github.com/stamparm/pcapy-ng/"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 396583b9ee4..6bbcd9d78cc 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-kpEs5LvUz61Wm2IUI6sNXx2R+vtuHq1Y6aaj+zLrr+Q="; + sha256 = "sha256-jdRwaw5hPP8VCmCp3l5idjzrHJ2vLhYpC6yPCmOF56Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index ddef2dcc1c1..967ff88be92 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "praw"; - version = "7.5.0"; + version = "7.6.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xcITJ349ek9Y0HvJwzKJ7xDUV74w2v3yTBaj5n8YJ58="; + sha256 = "sha256-y2eynMsjF4wZd31YoLdtk8F+ga7Z3R+IQkQK0x0RAGA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index baba69922eb..7e80ad35c5c 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.16.0"; + version = "3.16.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-odu8/xT2TuOLT2jRztPDUHcGMfmHvWrsnDRkp4yGaY0="; + sha256 = "sha256-XTt2R0JypbDGJtiWqFzmui7UVLK4/U46co7LcHkSbWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix new file mode 100644 index 00000000000..2cf21522d4b --- /dev/null +++ b/pkgs/development/python-modules/validobj/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "validobj"; + version = "0.5.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "430b0b56931a2cebdb857a9fe9da2467c06a3b4db37b728e7f1a8706e8887705"; + }; + + nativeBuildInputs = [ flit ]; + + checkInputs = [ hypothesis pytestCheckHook ]; + + pythonImportsCheck = [ "validobj" ]; + + meta = with lib; { + description = "Validobj is library that takes semistructured data (for example JSON and YAML configuration files) and converts it to more structured Python objects"; + homepage = "https://github.com/Zaharid/validobj"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index cedf2535df3..ee84ca66b24 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.20.0"; + version = "1.20.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ikMmd+avT8Fl+oZti2aegX4knYmPgEE/FOMAMZriV0g="; + sha256 = "sha256-1zMFetWPfSJn0QSomLf9yHjbjNyKzUKOfKIBEKUWxIs="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-LRXnBSG+xpQ3QqF2SiC2s3luTaBxFHOF3XXxhFZV5D0="; + vendorSha256 = "sha256-klgETD1hw9XPJfgiI3sRlYqfhVoh/fhComkCs4BhSI4="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index c58455ac24b..46e2a7801f6 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -4,14 +4,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloudsmith-cli"; - version = "0.31.1"; + version = "0.32.0"; format = "wheel"; src = python3.pkgs.fetchPypi { pname = "cloudsmith_cli"; inherit format version; - sha256 = "sha256-r8h0fHePZoqy/oFOedkwAke0b+Huasuv+sWcL92EZ+k="; + sha256 = "ZETVtRlzd9KUOeDyAH0MnnIy1WtGLVBm+bActUM4zBw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix deleted file mode 100644 index 2e9e8936ddb..00000000000 --- a/pkgs/development/tools/vogl/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub -, cmake, git, pkg-config, wget, zip -, qtbase, qtx11extras -, libdwarf, libjpeg_turbo, libunwind, xz, tinyxml, libX11 -, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf -, freeglut, libGLU -, fetchpatch -}: - -mkDerivation { - pname = "vogl"; - version = "2016-05-13"; - - src = fetchFromGitHub { - owner = "deepfire"; - repo = "vogl"; - rev = "cbc5f1853e294b363f16c4e00b3e0c49dbf74559"; - sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n"; - }; - - patches = [ - (fetchpatch { - name = "fix-qt59.patch"; - url = "https://github.com/ValveSoftware/vogl/commit/be3d85f.patch"; - sha256 = "1yh4jd35mds337waqxdw3w22w7ghn05b5jm7fb4iihl39mhq6qyv"; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - git wget zip - qtbase qtx11extras - libdwarf libjpeg_turbo libunwind xz tinyxml libX11 - SDL2 SDL2_gfx SDL2_image SDL2_ttf - freeglut libGLU - ]; - - dontUseCmakeBuildDir = true; - preConfigure = '' - cmakeDir=$PWD - mkdir -p vogl/vogl_build/release64 && cd $_ - ''; - cmakeFlags = [ - "-DCMAKE_VERBOSE=On" - "-DBUILD_X64=On" - ]; - - meta = with lib; { - description = "OpenGL capture / playback debugger"; - homepage = "https://github.com/ValveSoftware/vogl"; - license = licenses.mit; - maintainers = [ maintainers.deepfire ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - broken = true; - }; -} diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 0e569ad70df..714cab494f7 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, testers, flyctl }: buildGoModule rec { pname = "flyctl"; @@ -32,9 +32,15 @@ buildGoModule rec { ''; postCheck = '' - go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00+0000'" + go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z'" ''; + passthru.tests.version = testers.testVersion { + package = flyctl; + command = "HOME=$(mktemp -d) flyctl version"; + version = "v${flyctl.version}"; + }; + meta = with lib; { description = "Command line tools for fly.io services"; downloadPage = "https://github.com/superfly/flyctl"; diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix index 95f0d64f197..0260e4f2e20 100644 --- a/pkgs/games/ue4/default.nix +++ b/pkgs/games/ue4/default.nix @@ -76,7 +76,8 @@ stdenv.mkDerivation rec { homepage = "https://www.unrealengine.com/what-is-unreal-engine-4"; license = lib.licenses.unfree; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.puffnfresh ]; + maintainers = [ ]; + # See issue https://github.com/NixOS/nixpkgs/issues/17162 broken = true; }; } diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix deleted file mode 100644 index 92f5fdc409c..00000000000 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -# Tested on linux-x86_64. Might work on linux-i386. Probably won't work on anything else. - -# To use this driver in NixOS, add it to printing.drivers in configuration.nix. -# configuration.nix might look like this when you're done: -# { pkgs, ... }: { -# printing = { -# enable = true; -# drivers = [ pkgs.samsungUnifiedLinuxDriver ]; -# }; -# (more stuff) -# } -# (This advice was tested on 2010 August 2.) - -{ lib, stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf }: - -# Do not bump lightly! Visit -# to see what will break when upgrading. Consider a new versioned attribute. -let - cups' = lib.getLib cups; -in stdenv.mkDerivation rec { - pname = "samsung-UnifiedLinuxDriver"; - version = "4.00.39"; - - src = fetchurl { - url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; - sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k"; - }; - - nativeBuildInputs = [ patchelf ]; - buildInputs = [ cups' gcc ghostscript glibc ]; - - inherit gcc ghostscript glibc; - cups = cups'; - - builder = ./builder.sh; - - meta = with lib; { - description = "Samsung's Linux printing drivers; includes binaries without source code"; - homepage = "http://www.samsung.com/"; - license = licenses.unfree; - platforms = platforms.linux; - broken = true; # libscmssc.so and libmfp.so can't find their library dependencies at run-time - }; -} diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 16b0ac27fc6..99008cfcf28 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,51 +12,51 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.240-hardened1.patch", - "sha256": "1qhrwpjfy5c75zcpvp1b0xb460vyjv04iml2inqrhnj9zcz1kgp8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.240-hardened1/linux-hardened-4.19.240-hardened1.patch" + "name": "linux-hardened-4.19.241-hardened1.patch", + "sha256": "1ynhclfiswgbm0kdg7nvx4lizixhfskbj91imklsy0mp5brgfpbz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.241-hardened1/linux-hardened-4.19.241-hardened1.patch" }, - "sha256": "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j", - "version": "4.19.240" + "sha256": "04zyi22c2d91k7v2w0s8v112cqqf24km599mn18k2nafq79njqjc", + "version": "4.19.241" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.113-hardened1.patch", - "sha256": "0v6blapny74fkhsm5rksxg632hv3chh81wgc96l6ql4sy7p19riv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.113-hardened1/linux-hardened-5.10.113-hardened1.patch" + "name": "linux-hardened-5.10.114-hardened1.patch", + "sha256": "0ml5ghywz550d5vj1qfw0528ax7pilnf5rvwn4780gqnkn44nbcd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.114-hardened1/linux-hardened-5.10.114-hardened1.patch" }, - "sha256": "1z3dd5hrdbn2axsi2n70n41q1dq2dvg7s8aph1p6yiajpc16llc2", - "version": "5.10.113" + "sha256": "09h5ngcl8clsvsv11q6ksvgcs01whlwbbrlpj1jz8mg3gjsrzl07", + "version": "5.10.114" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.36-hardened1.patch", - "sha256": "1y52bayw2n1lc1vp9jz8a39fz32x81ivaw24kc6hdr23yg0a8q5g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.36-hardened1/linux-hardened-5.15.36-hardened1.patch" + "name": "linux-hardened-5.15.38-hardened1.patch", + "sha256": "0nrwxi48v8ij1sfh15qkiil2i28vqy24gr9ciklbdl5kgy3glvf4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.38-hardened1/linux-hardened-5.15.38-hardened1.patch" }, - "sha256": "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n", - "version": "5.15.36" + "sha256": "0lhhl766mrl2mbbvn7gkajfzja4v1f96xm9qq3z8pf4h1515shby", + "version": "5.15.38" }, "5.17": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.17.5-hardened1.patch", - "sha256": "1cv43sp2amai7r75dw07bd2ys6fz1ri9pfra3kaajap55sbalsw0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.5-hardened1/linux-hardened-5.17.5-hardened1.patch" + "name": "linux-hardened-5.17.6-hardened1.patch", + "sha256": "100lvwzrjq6v69faaydyn3cm03l0kq36hjiyid3iwi035a2vljy8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.6-hardened1/linux-hardened-5.17.6-hardened1.patch" }, - "sha256": "11z95wsgmj97pg77yck26l0383gncbla0zwpzv4gjdj4p62x3g4v", - "version": "5.17.5" + "sha256": "035i9i0gg3fxi5ighjrya97592sk0i4xagra6a8m8nxyh21z3k34", + "version": "5.17.6" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.191-hardened1.patch", - "sha256": "117v9xb9y3bmppxmrbya5a4d869fh6l7map25g5n03sca56g7c32", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.191-hardened1/linux-hardened-5.4.191-hardened1.patch" + "name": "linux-hardened-5.4.192-hardened1.patch", + "sha256": "1i0x4f51qlq3bi7zfk8xvjgrl758y8nidb6wp3f507w6ic1757hg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.192-hardened1/linux-hardened-5.4.192-hardened1.patch" }, - "sha256": "0fharjqasvq76pciwci6qamdadpfjh2n8gdyri8fj65drmgsi318", - "version": "5.4.191" + "sha256": "14wyvacajnj6fnxqrash7b8inq0lgmglydqa30kb21zva88jwj1j", + "version": "5.4.192" } } diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 1ac78adf7c7..ba61e44fc75 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.113"; + version = "5.10.114"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1z3dd5hrdbn2axsi2n70n41q1dq2dvg7s8aph1p6yiajpc16llc2"; + sha256 = "09h5ngcl8clsvsv11q6ksvgcs01whlwbbrlpj1jz8mg3gjsrzl07"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 007258e7336..fb0311a523f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.37"; + version = "5.15.38"; # 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; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "09n0l9ly111r6jbpgz1kw2q4n4mmcv5jxfhs5bcsiyjp44d0kgqq"; + sha256 = "0lhhl766mrl2mbbvn7gkajfzja4v1f96xm9qq3z8pf4h1515shby"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix index 4c67169b706..6af5cb06546 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.17.5"; + version = "5.17.6"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "11z95wsgmj97pg77yck26l0383gncbla0zwpzv4gjdj4p62x3g4v"; + sha256 = "035i9i0gg3fxi5ighjrya97592sk0i4xagra6a8m8nxyh21z3k34"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 073d0ef7705..2ce46309465 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.191"; + version = "5.4.192"; # 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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0fharjqasvq76pciwci6qamdadpfjh2n8gdyri8fj65drmgsi318"; + sha256 = "14wyvacajnj6fnxqrash7b8inq0lgmglydqa30kb21zva88jwj1j"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 7bb6e5f7972..78646dddf96 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18688"; - sha256 = "15f83zcwxk28b3a4am8avi0xwd7zr79n00150k6xdf3g8haz7yaj"; + rev = "18713"; + sha256 = "10744jp1i7z3jwpc42vrmdfpq1yblf3vy17yb04xdfhimkflw77p"; } , ... }: diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 82c6d4ba3e6..2b12a47edc8 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -1,17 +1,30 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, fetchurl, nixosTests, postgresql, postgresqlTestHook }: buildGoModule rec { pname = "matrix-dendrite"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-cEqedl6iVt/HZEh1zeEcqby8gfJEcqIDEQnPewyErMI="; + sha256 = "sha256-w4un+TdFTzfVZltvo6ZAPQ3B9HJvnGlJW+LmZHuYk1M="; }; - vendorSha256 = "sha256-nQx+PyjRvECeIerZ9jq7YMTSS8LfohY7NgK8DklREQQ="; + vendorSha256 = "sha256-AJ7Hn23aji/cXioDaOSyF8XD3Mr135DZf7KbUW1SoJ4="; + + checkInputs = [ + postgresqlTestHook + postgresql + ]; + + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + preCheck = '' + export PGUSER=$(whoami) + # temporarily disable this failing test + # it passes in upstream CI and requires further investigation + rm roomserver/internal/input/input_test.go + ''; passthru.tests = { inherit (nixosTests) dendrite; diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index af43c42dd4b..804919665ec 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -1,42 +1,44 @@ -{ lib, stdenv, fetchurl, autoreconfHook -, ncurses #acinclude.m4 wants headers for tgetent(). -, historySupport ? false -, readline ? null -}: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, byacc +, ncurses, readline +, historySupport ? false, readlineSupport ? true }: stdenv.mkDerivation rec { pname = "rc"; - version = "1.7.4"; + version = "unstable-2021-08-03"; - src = fetchurl { - url = "http://static.tobold.org/rc/rc-${version}.tar.gz"; - sha256 = "1n5zz6d6z4z6s3fwa0pscqqawy561k4xfnmi91i626hcvls67ljy"; + src = fetchFromGitHub { + owner = "rakitzis"; + repo = "rc"; + rev = "8ca9ab1305c3e30cd064290081d6e5a1fa841d26"; + sha256 = "0744ars6y9zzsjr9xazms91qy6bi7msg2gg87526waziahfh4s4z"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses ] - ++ lib.optionals (readline != null) [ readline ]; + + # acinclude.m4 wants headers for tgetent(). + buildInputs = [ byacc ncurses ] + ++ lib.optionals readlineSupport [ readline ]; configureFlags = [ "--enable-def-interp=${stdenv.shell}" #183 ] ++ lib.optionals historySupport [ "--with-history" ] - ++ lib.optionals (readline != null) [ "--with-edit=readline" ]; + ++ lib.optionals readlineSupport [ "--with-edit=readline" ]; - prePatch = '' + #reproducible-build + postPatch = '' substituteInPlace configure.ac \ - --replace "date -I" "echo 2015-05-13" #reproducible-build + --replace "$(git describe || echo '(git description unavailable)')" "${builtins.substring 0 7 src.rev}" ''; - passthru = { - shellPath = "/bin/rc"; - }; + passthru.shellPath = "/bin/rc"; meta = with lib; { description = "The Plan 9 shell"; - longDescription = "Byron Rakitzis' UNIX reimplementation of Tom Duff's Plan 9 shell."; - homepage = "http://tobold.org/article/rc"; + longDescription = "Byron Rakitzis' UNIX reimplementation of Tom Duff's Plan 9 shell"; + homepage = "https://web.archive.org/web/20180820053030/tobold.org/article/rc"; license = with licenses; zlib; maintainers = with maintainers; [ ramkromberg ]; + mainProgram = "rc"; platforms = with platforms; all; }; } diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index e14d3732d76..1df8492a8e2 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "snapper"; - version = "0.10.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "sha256-02ufjPuXK3a+gQ8kp968KXd3Jgvx4O6TO2Q5wL5n2cw="; + sha256 = "0x9anracaa19yqkc0x8wangrkdrx01kdy07c55lvlqrjyimfm4ih"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix deleted file mode 100644 index e39be14475e..00000000000 --- a/pkgs/tools/security/neopg/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, sqlite -, botan2 -, boost -, curl -, gettext -, pkg-config -, libusb1 -, gnutls }: - -stdenv.mkDerivation rec { - pname = "neopg"; - version = "0.0.6"; - - src = fetchFromGitHub { - owner = "das-labor"; - repo = "neopg"; - rev = "v${version}"; - sha256 = "15xp5w046ix59cfrhh8ka4camr0d8qqw643g184sqrcqwpk7nbrx"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake gettext pkg-config ]; - - buildInputs = [ sqlite botan2 boost curl libusb1 gnutls ]; - - doCheck = true; - checkTarget = "test"; - dontUseCmakeBuildDir = true; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/3rdparty/googletest/googletest:$(pwd)/neopg - ''; - - meta = with lib; { - homepage = "https://neopg.io/"; - description = "Modern replacement for GnuPG 2"; - license = licenses.gpl3; - longDescription = '' - NeoPG starts as an opiniated fork of GnuPG 2 to clean up the code and make it easier to develop. - It is written in C++11. - ''; - maintainers = with maintainers; [ erictapen ]; - platforms = platforms.linux; - broken = true; # fails to build with recent versions of botan. https://github.com/das-labor/neopg/issues/98 - }; -} diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix deleted file mode 100644 index 18997887037..00000000000 --- a/pkgs/tools/typesetting/pdftk/legacy.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchurl, lib, stdenv, gcj, unzip }: - -stdenv.mkDerivation rec { - pname = "pdftk"; - version = "2.02"; - - src = fetchurl { - url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-${version}-src.zip"; - sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; - }; - - nativeBuildInputs = [ gcj unzip ]; - - hardeningDisable = [ "fortify" "format" ]; - - preBuild = '' - cd pdftk - sed -e 's@/usr/bin/@@g' -i Makefile.* - NIX_ENFORCE_PURITY= \ - make \ - LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \ - GCJ=gcj GCJH=gcjh GJAR=gjar \ - -iC ../java all - ''; - - # Makefile.Debian has almost fitting defaults - makeFlags = [ "-f" "Makefile.Debian" "VERSUFF=" ]; - - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp pdftk $out/bin - cp ../pdftk.1 $out/share/man/man1 - ''; - - - meta = { - description = "Simple tool for doing everyday things with PDF documents"; - homepage = "https://www.pdflabs.com/tools/pdftk-server/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ raskin ]; - platforms = with lib.platforms; linux; - broken = true; # Broken on Hydra since 2020-08-24 - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d44822c31c9..38d1e796db4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1031,6 +1031,7 @@ mapAliases ({ polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 powerdns = pdns; # Added 2022-03-28 + portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10 # postgresql postgresql96 = postgresql_9_6; @@ -1240,6 +1241,7 @@ mapAliases ({ spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead"; # added 2022-01-04 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # Added 2020-10-09 + split2flac = throw "split2flac has been removed. Consider using the shnsplit command from shntool package or help packaging unflac."; # added 2022-01-13 spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 369f864df22..377656e0d2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8535,8 +8535,6 @@ with pkgs; ndisc6 = callPackage ../tools/networking/ndisc6 { }; - neopg = callPackage ../tools/security/neopg { }; - netboot = callPackage ../tools/networking/netboot {}; netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { }; @@ -18331,8 +18329,6 @@ with pkgs; libdaemon = callPackage ../development/libraries/libdaemon { }; - libdap = callPackage ../development/libraries/libdap { }; - libdatrie = callPackage ../development/libraries/libdatrie { }; libdazzle = callPackage ../development/libraries/libdazzle { }; @@ -19155,8 +19151,6 @@ with pkgs; libssh = callPackage ../development/libraries/libssh { }; libssh2 = callPackage ../development/libraries/libssh2 { }; - #FIXME: temporary attribute - libssh2_1_10 = callPackage ../development/libraries/libssh2/1_10.nix { }; libstartup_notification = callPackage ../development/libraries/startup-notification { }; @@ -20075,13 +20069,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon; }; - portaudio2014 = portaudio.overrideAttrs (_: { - src = fetchurl { - url = "http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz"; - sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; - }; - }); - portmidi = callPackage ../development/libraries/portmidi { inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices; }; @@ -24255,9 +24242,10 @@ with pkgs; flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { }; flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { }; - font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; - font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; - font-awesome = font-awesome_5; + font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4; + font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5; + font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6; + font-awesome = font-awesome_6; fraunces = callPackage ../data/fonts/fraunces { }; @@ -24761,6 +24749,8 @@ with pkgs; sierra-gtk-theme = callPackage ../data/themes/sierra { }; + sil-abyssinica = callPackage ../data/fonts/sil-abyssinica { }; + sil-padauk = callPackage ../data/fonts/sil-padauk { }; snap7 = callPackage ../development/libraries/snap7 {}; @@ -25731,7 +25721,6 @@ with pkgs; deadbeefPlugins = { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; - infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { }; @@ -26753,8 +26742,6 @@ with pkgs; moe = callPackage ../applications/editors/moe { }; - multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb { qt5 = qt514; }; - praat = callPackage ../applications/audio/praat { }; quvi = callPackage ../applications/video/quvi/tool.nix { @@ -28863,7 +28850,6 @@ with pkgs; pdftk = callPackage ../tools/typesetting/pdftk { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { }); pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { @@ -29273,8 +29259,6 @@ with pkgs; raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; - rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; }; - rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -29502,10 +29486,6 @@ with pkgs; spideroak = callPackage ../applications/networking/spideroak { }; - split2flac = callPackage ../applications/audio/split2flac { - inherit (python3.pkgs) mutagen; - }; - spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { }; spotify-tray = callPackage ../applications/misc/spotify-tray { }; @@ -30384,8 +30364,6 @@ with pkgs; vocal = callPackage ../applications/audio/vocal { }; - vogl = libsForQt5.callPackage ../development/tools/vogl { }; - volnoti = callPackage ../applications/misc/volnoti { }; vorbis-tools = callPackage ../applications/audio/vorbis-tools { @@ -32403,8 +32381,6 @@ with pkgs; xcowsay = callPackage ../games/xcowsay { }; xjump = callPackage ../games/xjump { }; - # TODO: the corresponding nix file is missing - # xracer = callPackage ../games/xracer { }; xmoto = callPackage ../games/xmoto { }; @@ -34524,7 +34500,6 @@ with pkgs; samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36 { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; - samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3fd57e228de..c922fad2898 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5348,6 +5348,8 @@ in { mohawk = callPackage ../development/python-modules/mohawk { }; + moku = callPackage ../development/python-modules/moku { }; + monero = callPackage ../development/python-modules/monero { }; mongomock = callPackage ../development/python-modules/mongomock { }; @@ -6179,6 +6181,8 @@ in { pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); + pcapy-ng = callPackage ../development/python-modules/pcapy-ng { }; + pcodedmp = callPackage ../development/python-modules/pcodedmp { }; pcpp = callPackage ../development/python-modules/pcpp { }; @@ -10722,6 +10726,8 @@ in { validictory = callPackage ../development/python-modules/validictory { }; + validobj = callPackage ../development/python-modules/validobj { }; + variants = callPackage ../development/python-modules/variants { }; varint = callPackage ../development/python-modules/varint { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 7629790d50d..8551c5f9bff 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -154,8 +154,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; - openbr = callPackage ../development/libraries/openbr { }; - phonon = callPackage ../development/libraries/phonon { }; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };