diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c115c310a35..6c44ee95cb2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -194,6 +194,12 @@ githubId = 124545; name = "Anthony Cowley"; }; + adamlwgriffiths = { + email = "adam.lw.griffiths@gmail.com"; + github = "adamlwgriffiths"; + githubId = 1239156; + name = "Adam Griffiths"; + }; adamt = { email = "mail@adamtulinius.dk"; github = "adamtulinius"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 16541eaaa21..7f2ee5a288a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -26,11 +26,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.11.0"; + version = "5.12.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PI+KIMnslhoagv9U6Mcmo9Onfu8clVqASNlDir8JzUw="; + sha256 = "sha256-N3/y1kSWyM36LpwbimftJ67h4zfk2j9hcvUi/pQL3YU="; }; patches = [ diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index fb340ee1ace..7518e399382 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -23,7 +23,7 @@ , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libxkbcommon -, ltoSupport ? stdenv.isLinux, overrideCC, buildPackages +, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, kerberos , pipewireSupport ? waylandSupport && webrtcSupport, pipewire @@ -111,6 +111,13 @@ let else stdenv; nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss; + + # --enable-release adds -ffunction-sections & LTO that require a big amount of + # RAM and the 32-bit memory space cannot handle that linking + # We also disable adding "-g" for easier linking + releaseFlags = if stdenv.is32bit + then [ "--disable-release" "--disable-debug-symbols" ] + else [ "--enable-release" ]; in buildStdenv.mkDerivation ({ @@ -296,9 +303,9 @@ buildStdenv.mkDerivation ({ ++ lib.optional drmSupport "--enable-eme=widevine" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] - else [ "--disable-debug" "--enable-release" + else ([ "--disable-debug" "--enable-optimize" - "--enable-strip" ]) + "--enable-strip" ] ++ releaseFlags)) ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 8c391e25322..f89fe3e1db3 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas , gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty , readline, gettext, libpng, libao, gfortran, perl -, enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null +, enableGUI ? false, libGL, libGLU, xorg, fltk }: -assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 97b5f88e55b..2866b4b9469 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , dimensions ? 6 # works for <= dimensions dimensions, but is only optimized for that exact value , doSymlink ? true # symlink the executables to the default location (without dimension postfix) @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { ''; preBuild = '' - echo Building PALP optimized for ${dim} dimensions - sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h + echo Building PALP optimized for ${dim} dimensions + sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h ''; # palp has no tests of its own. This test is an adapted sage test that failed @@ -42,14 +43,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p "$out/bin" + mkdir -p $out/bin for file in poly class cws nef mori; do - cp -p $file.x "$out/bin/$file-${dim}d.x" + cp -p $file.x "$out/bin/$file-${dim}d.x" done '' + lib.optionalString doSymlink '' - cd "$out/bin" + cd $out/bin for file in poly class cws nef mori; do - ln -sf $file-6d.x $file.x + ln -sf $file-6d.x $file.x done ''; diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index 7dfa462e225..81c6e546e95 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "πŸΊπŸ™ ZetZ a zymbolic verifier and tranzpiler to bare metal C"; + description = "ZetZ a zymbolic verifier and tranzpiler to bare metal C"; homepage = "https://github.com/zetzit/zz"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index 1c356b59d8a..527545e683f 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,26 +1,32 @@ -{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: +{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }: + stdenv.mkDerivation rec { pname = "arb"; version = "2.17.0"; + src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1"; }; - buildInputs = [mpir gmp mpfr flint]; + + buildInputs = [ mpir gmp mpfr flint ]; + configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-flint=${flint}" ]; + doCheck = true; + meta = with lib; { description = "A library for arbitrary-precision interval arithmetic"; homepage = "https://arblib.org/"; - license = lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; maintainers = teams.sage.members; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index 8922bedccdc..011531b1a23 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }: stdenv.mkDerivation rec { - name = "libspectrum-1.4.4"; + name = "libspectrum-1.5.0"; src = fetchurl { url = "mirror://sourceforge/fuse-emulator/${name}.tar.gz"; - sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx"; + sha256 = "sha256-o1PLRumxooEGHYFjU+oBDQpv545qF6oLe3QnHKXkrPw="; }; nativeBuildInputs = [ perl pkg-config ]; diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix new file mode 100644 index 00000000000..47d8fdb040b --- /dev/null +++ b/pkgs/development/libraries/raylib/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, + mesa, libGLU, glfw, + libX11, libXi, libXcursor, libXrandr, libXinerama, + alsaSupport ? stdenv.hostPlatform.isLinux, alsaLib, + pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, + includeEverything ? true +}: + +stdenv.mkDerivation rec { + pname = "raylib"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "raysan5"; + repo = pname; + rev = version; + sha256 = "0syvd5js1lbx3g4cddwwncqg95l6hb3fdz5nsh5pqy7fr6v84kwj"; + }; + + patches = [ + # fixes examples not compiling in 3.5.0 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/raysan5/raylib/pull/1470.patch"; + sha256 = "1ff5l839wl8dxwrs2bwky7kqa8kk9qmsflg31sk5vbil68dzbzg0"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama + ] ++ lib.optional alsaSupport alsaLib + ++ lib.optional pulseSupport libpulseaudio; + + # https://github.com/raysan5/raylib/wiki/CMake-Build-Options + cmakeFlags = [ + "-DUSE_EXTERNAL_GLFW=ON" + "-DSHARED=ON" + "-DBUILD_EXAMPLES=OFF" + ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"; + + # fix libasound.so/libpulse.so not being found + preFixup = '' + ${lib.optionalString alsaSupport "patchelf --add-needed ${alsaLib}/lib/libasound.so $out/lib/libraylib.so.${version}"} + ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"} + ''; + + meta = with lib; { + description = "A simple and easy-to-use library to enjoy videogames programming"; + homepage = "http://www.raylib.com/"; + license = licenses.zlib; + maintainers = with maintainers; [ adamlwgriffiths ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 29bbfa81ed2..fb080bcc11b 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,20 +1,24 @@ { lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { - pname = "agate-sql"; - version = "0.5.5"; + pname = "agate-sql"; + version = "0.5.5"; - src = fetchPypi { - inherit pname version; - sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; + }; - propagatedBuildInputs = [ agate sqlalchemy crate ]; + propagatedBuildInputs = [ agate sqlalchemy crate ]; - meta = with lib; { - description = "Adds SQL read/write support to agate."; - homepage = "https://github.com/wireservice/agate-sql"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; - }; + pythonImportsCheck = [ "agatesql" ]; + + meta = with lib; { + description = "Adds SQL read/write support to agate."; + homepage = "https://github.com/wireservice/agate-sql"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ vrthra ]; + # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) + broken = true; + }; } diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index 538a861c9f4..9bd32d1ba4a 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -5,18 +5,22 @@ }: buildPythonPackage { - version = "2016-01-04"; pname = "dopy"; + version = "2016-01-04"; src = pkgs.fetchFromGitHub { owner = "Wiredcraft"; repo = "dopy"; rev = "cb443214166a4e91b17c925f40009ac883336dc3"; - sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; + sha256 = "0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; }; propagatedBuildInputs = [ requests six ]; + # contains no tests + doCheck = false; + pythonImportsCheck = [ "dopy" ]; + meta = with pkgs.lib; { description = "Digital Ocean API python wrapper"; homepage = "https://github.com/Wiredcraft/dopy"; diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix index e23c3621c2e..8559339b012 100644 --- a/pkgs/development/python-modules/managesieve/default.nix +++ b/pkgs/development/python-modules/managesieve/default.nix @@ -1,26 +1,25 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "managesieve"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "ee70e298e9b68eb81f93d52a1320a034fdc182f3927fdd551836fc93b0ed2c5f"; + sha256 = "1dx0j8hhjwip1ackaj2m4hqrrx2iiv846ic4wa6ymrawwb8iq8m6"; }; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "ManageSieve client library for remotely managing Sieve scripts"; - homepage = "https://managesieve.readthedocs.io/"; - # PSFL for the python module, GPLv3 for sieveshell - license = with licenses; [ gpl3 psfl ]; + homepage = "https://managesieve.readthedocs.io/"; + # PSFL for the python module, GPLv3 only for sieveshell + license = with licenses; [ gpl3Only psfl ]; maintainers = with maintainers; [ dadada ]; }; } diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 58339e5d26f..2e90176be7e 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -8,7 +8,7 @@ , lib, stdenv }: stdenv.mkDerivation rec { - version = "2.52"; + version = "2.53"; pname = "frotz"; src = fetchFromGitLab { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "DavidGriffith"; repo = "frotz"; rev = version; - sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y"; + sha256 = "sha256-xVC/iE71W/Wdy5aPGH9DtcVAHWCcg3HkEA3iDV6OYUo="; }; buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ]; diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 5726786e5b4..40a304bafba 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.20.0"; + version = "0.21.0"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-vhUj3CVBM5jbwEtnzdgQD3eLguiHQguK01O69JZIUUk="; + sha256 = "sha256-vZFX5YDf722c7xc4oh4SoL91s7XuZsXzFxW+i//mOUw="; }; meta = { diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index 74d8d9ae520..50d2cfa964e 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkg-config, udns, coreutils, python3Packages } : +{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn +, libiconv, botan2, systemd, pkg-config, udns, python3Packages } : +let + louiz_catch = fetchgit { + url = "https://lab.louiz.org/louiz/Catch.git"; + rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 + sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; + }; +in stdenv.mkDerivation rec { pname = "biboumi"; version = "9.0"; @@ -10,22 +17,16 @@ stdenv.mkDerivation rec { sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy"; }; - louiz_catch = fetchgit { - url = "https://lab.louiz.org/louiz/Catch.git"; - rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 - sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; - }; - patches = [ ./catch.patch ]; nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ]; - buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd - udns ]; + buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ]; + buildFlags = [ "all" "man" ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - cp $louiz_catch/single_include/catch.hpp tests/ + cp ${louiz_catch}/single_include/catch.hpp tests/ ''; doCheck = true; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index a84e2e14677..5fa331b8540 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+qNH4Df0wCI3KE6LT3YWKpp7yzJcedmVlm/f1Myz108="; + sha256 = "sha256-FXBClOkGRUey/FnLw3g3uiHUJeNiB4tXqP4Na6CuwIM="; }; installPhase = '' diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 05e0cf119bf..1e1018ae56d 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { patches = [ # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later. - (fetchpatch{ + (fetchpatch { url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch"; sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7"; }) @@ -23,17 +23,22 @@ python3.pkgs.buildPythonApplication rec { agate-dbf agate-sql six - setuptools # `csvsql` requires pkg_resources https://github.com/NixOS/nixpkgs/issues/93594 + setuptools ]; checkInputs = with python3.pkgs; [ - nose pytestCheckHook + nose + pytestCheckHook ]; + pythonImportsCheck = [ "csvkit" ]; + meta = with lib; { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; homepage = "https://github.com/wireservice/csvkit"; + # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) + broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e6416b0c0a..c5823413ac6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16703,6 +16703,8 @@ in raul = callPackage ../development/libraries/audio/raul { }; + raylib = callPackage ../development/libraries/raylib { }; + readline = readline6; readline6 = readline63; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c2ed5395e35..96d3e9b423b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -402,7 +402,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ valgrind.dev ]; - patches = [] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + patches = lib.optionals (lib.versionOlder php.version "7.4") [ (pkgs.writeText "zend_file_cache_config.patch" '' --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c