diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries')
476 files changed, 3955 insertions, 2391 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/CGAL/default.nix index 97ddab1a32e5..6824cb7f1835 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.0.3"; + version = "5.1"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "1p22dwrzzvbmrfjr6m3dac55nq8pp0b9afp3vz6239yp3gf2fcws"; + sha256 = "0rcv86hn5aqna7vr9nfk4np778qjr7l3742v58w6qw0z4y6l1km0"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/LAStools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/LAStools/default.nix new file mode 100644 index 000000000000..c231361acb55 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/LAStools/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "LAStools"; + version = "201003"; # LAStools makes release-ish commits with a message containing their version number as YYMMDD; these align with their website changelog + + src = fetchFromGitHub { + owner = "LAStools"; + repo = "LAStools"; + rev = "635b76b42cc4912762da31b92f875df5310e1714"; + sha256 = "0682ca3bp51lmfp46vsjnd1bqpn05g95pf4kclvjv1y8qivkxsaq"; + }; + + patches = [ + ./drop-64-suffix.patch # necessary to prevent '64' from being appended to the names of the executables + ]; + + hardeningDisable = [ + "format" + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with stdenv.lib; { + description = "Software for rapid LiDAR processing"; + homepage = http://lastools.org/; + license = licenses.unfree; + maintainers = with maintainers; [ stephenwithph ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/LAStools/drop-64-suffix.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/LAStools/drop-64-suffix.patch new file mode 100644 index 000000000000..2090baeb3b2b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/LAStools/drop-64-suffix.patch @@ -0,0 +1,13 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -32,6 +32,6 @@ endforeach(TARGET) + foreach(TARGET ${ALL_TARGETS}) + target_link_libraries(${TARGET} LASlib) + set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin64) +- set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}64) ++ set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}) + install(TARGETS ${TARGET} RUNTIME DESTINATION bin) + endforeach(TARGET) +-- +2.28.0 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch index a6b10ddb7edf..69dde41c7e2f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch @@ -1,7 +1,7 @@ -diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in ---- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300 -+++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300 -@@ -6,5 +6,6 @@ +diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in +--- SDL2-2.0.12/sdl2-config.cmake.in 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12-new/sdl2-config.cmake.in 2020-11-11 11:59:05.178703826 +0100 +@@ -6,7 +6,8 @@ set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") set(SDL2_LIBDIR "@libdir@") @@ -9,9 +9,29 @@ diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in +set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) +separate_arguments(SDL2_INCLUDE_DIRS) set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") -diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in ---- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300 -+++ SDL2-2.0.4-new/sdl2-config.in 2016-08-22 05:32:02.256397839 +0300 + string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) + +@@ -20,14 +21,14 @@ + + add_library(SDL2::SDL2 SHARED IMPORTED) + set_target_properties(SDL2::SDL2 PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" ++ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "@libdir@/libSDL2.so" + INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") + + add_library(SDL2::SDL2-static STATIC IMPORTED) + set_target_properties(SDL2::SDL2-static PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" ++ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "@libdir@/libSDL2.a" + INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") +Només a SDL2-2.0.12-new/: sdl2-config.cmake.in.orig +diff -ru3 SDL2-2.0.12/sdl2-config.in SDL2-2.0.12-new/sdl2-config.in +--- SDL2-2.0.12/sdl2-config.in 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12-new/sdl2-config.in 2020-11-11 11:56:26.432955479 +0100 @@ -42,7 +42,11 @@ echo @SDL_VERSION@ ;; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/SDL_image/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/SDL_image/default.nix index 8e3078563e2b..968fc3d38af8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/SDL_image/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/SDL_image/default.nix @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = [ + # Disable its dynamic loading or dlopen will fail because of no proper rpath + "--disable-jpg-shared" + "--disable-png-shared" + "--disable-tif-shared" + ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ace/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ace/default.nix index b2a31edd0b63..49c8e14a74f4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ace/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "6.5.10"; + version = "6.5.11"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "1qnq63r9cnaaqb5yrbb7apr7kjl6x31wfclizplri3lj4rwl7plh"; + sha256 = "0fbbysy6aymys30zh5m2bygs84dwwjnbsdl9ipj1rvfrhq8jbylb"; }; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix index 13ca6c52d71a..fb6cc7279671 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.3.1"; + version = "0.1.4"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "08mc20qaz9vp5rhi60rh8wvjkg5aby3bgwwdhfnxha1663qf1q24"; + sha256 = "1bcvmxcnl1ig38fxqkx8ydidhxq6a0kn2k9waf0lygh4ap928sgk"; }; buildInputs = [ standard-library ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/generic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/generic/default.nix index 1287e08bda1d..08a1d8e12e03 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/generic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/generic/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "generic"; - version = "0.1"; + version = "0.1.0.1"; src = fetchFromGitHub { repo = "Generic"; owner = "effectfully"; rev = "v${version}"; - sha256 = "121121rg3daaqp91845fbyws6g28hyj1ywmh12n54r3nicb35g5q"; + sha256 = "07l44yzx1jly20kmkmkjk8q493bn6x7i3xxpz6mhadkqlxyhmc8s"; }; buildInputs = [ @@ -17,7 +17,7 @@ mkDerivation rec { preBuild = '' echo "module Everything where" > Everything.agda - find src -name '*.agda' | sed -e 's/src\///;s/\//./g;s/\.agda$//;s/^/import /' >> Everything.agda + find src -name '*.agda' | sed -e 's/src\///;s/\//./g;s/\.agda$//;s/^/import /' >> Everything.agda ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix index 4bff585ac3a9..e43e1bad3b6c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "18kl20z3bjfgx5m3nvrdj5776qmpi7jl2p12pqybsls2lf86m0d5"; + sha256 = "1asjbisb7pfkgzqy7gf9b23z63bba8l8p1wqfd6ff5ddgqwj3dhp"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/alembic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/alembic/default.nix index 1bb79a64ba10..126300aa1945 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.7.14"; + version = "1.7.16"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "0yri063v7j5jsvqbmlwr0hf2d1a55dgc1nj85rf10sxqhijwzk55"; + sha256 = "1vmhwjhppjv8m0ysk2qz0wl47cbl8i40bjjq5l4jmmp1ysvlbknf"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index c4a0a460f897..c3e526115546 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q3.6"; + version = "2020.Q4.5"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "05bvxxgaz94y85g1sq0jzjxd4j8vgdfan04q2fzmfcw3h6p7syjy"; + sha256 = "1CcupEm19ZGEma0TIkGxOa0doKhlPbfXFX2S44EBNp0="; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/aml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aml/default.nix index 0b753618ba6a..37d8859ba50d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/aml/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + broken = stdenv.isDarwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/amtk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/amtk/default.nix index b33c45adb41c..e514b8b5c31b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/amtk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/amtk/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, gtk3 -, pkgconfig, gnome3, dbus, xvfb_run }: -let - version = "5.1.1"; +{ stdenv +, fetchurl +, gtk3 +, pkgconfig +, gobject-introspection +, gnome3 +, dbus +, xvfb_run +}: + +stdenv.mkDerivation rec { pname = "amtk"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "5.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wax6mim8dj0m21k8ima7ysm3bzzp54r00jganwbzakq8bfnnrgr"; + sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2"; }; nativeBuildInputs = [ pkgconfig dbus + gobject-introspection ]; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/appstream/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/appstream/default.nix index 45f27b38a63d..820e73832462 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "appstream"; - version = "0.12.11"; + version = "0.13.1"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "sha256-bCDyMwQdn9Csxs2hy4dm+LjtxK4+YBK6yDkAdhu1QVU="; + sha256 = "16nxaw4fx78maldi3kvr8fiwzhmy5276wd4x2fxny16zzf01098j"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/arb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/arb/default.nix index 6393e25f561d..a9fb5de0bd9f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/arb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/arb/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = ''A library for arbitrary-precision interval arithmetic''; homepage = "http://arblib.org/"; license = stdenv.lib.licenses.lgpl21Plus; - maintainers = with maintainers; [ raskin timokau ]; + maintainers = teams.sage.members; platforms = stdenv.lib.platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/armadillo/default.nix index a4d359b985b2..450182138a40 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.900.3"; + version = "10.1.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "02pwhf3y2qq50dswjvfcijaw938d1zi1hxr17msv2x1ahlvff5fn"; + sha256 = "0pb3ypdaiiw0895x1zzzjvkrfp39bsl3s4f6zb5bzv4wbjv7kvwn"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 695cd136857a..1d9a528b4c6a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -7,25 +7,25 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "f552c4dcd2ae3d14048abd20919748cce5276ade"; - sha256 = "1smaidk5k2q6xdav7qp74ak34vvwv5qyfqw0szi573awsrsrahr8"; + rev = "860376d4e586a3ac34ec93089889da624ead6c2a"; + sha256 = "16k3lz4ji4y3qcjhr765q14jwwlac8iqscwndwd8ll3zr0vy69b0"; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "bcd9ebcf9204a346df47204fe21b85c8d0498816"; - sha256 = "0m16pqzbvxiaradq088q5ai6fwnz9srbap996397znwppvva479b"; + rev = "d914f9d289488c7db1759d7a88a4a1b8f062c7dd"; + sha256 = "0xj3ynck2wv6l70xnmvs13bz1jycqjrl5k4lwhhwgag338048als"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0p67dni8dwqbwq96gfdq3pyk799id6dgdl9h7cpp9icsjsmad70l"; + sha256 = "1ghzqw0rx4rxa2d7i76y3szisv0bd9cl7vzadbc41cvvhk6440xy"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -43,26 +43,13 @@ in stdenv.mkDerivation rec { # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt url = - "https://github.com/microsoft/mimalloc/archive/v1.6.3.tar.gz"; - sha256 = "0pia8b4acv1w8qzcpc9i1a2fasnn3rmp996k0l87p2di0lbls0w5"; + "https://github.com/microsoft/mimalloc/archive/v1.6.4.tar.gz"; + sha256 = "1b8av0974q70alcmaw5cwzbn6n9blnpmj721ik1qwmbbwwd6nqgs"; }; patches = [ # patch to fix python-test ./darwin.patch - # Properly exported static targets. Remove at the next version bump. - (fetchpatch { - url = "https://github.com/apache/arrow/commit/b040600b39a4f803b704934252665f9440dd1276.patch"; - sha256 = "1mvw29ybcsz77zprmsk41blxmrj8ywayg7ghf6xkkf98907ws8m8"; - includes = [ "*.cmake" ]; - stripLen = 1; - }) - (fetchpatch { - url = "https://github.com/apache/arrow/commit/81d3f2657b17436d6d5a6af9aaf6f36c3f5e4ac9.patch"; - sha256 = "18fmzr5f79hvx2qpyfgvvl98p4zgzfxrmrd1d2basp0w0da1ciqs"; - includes = [ "*CMakeLists.txt" "*.cmake" "*.cmake.in" ]; - stripLen = 1; - }) ]; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix index fd5ccf9696cc..88b1302271fb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/aspell/aspell-with-dicts.nix @@ -33,4 +33,4 @@ in buildEnv { done popd ''; -}
\ No newline at end of file +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix index 32405d6a5251..bc2a189a887a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix @@ -132,15 +132,15 @@ let # drop comments aspell-affix() { words-only \ - | grep -v '#' \ + | grep -a -v '#' \ | aspell-create "$@" } # Hack: drop comments and words with affixes aspell-plain() { words-only \ - | grep -v '#' \ - | grep -v '/' \ + | grep -a -v '#' \ + | grep -a -v '/' \ | aspell-create "$@" } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix index 6a1ca6d24d36..04f8c266131b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-atk"; - version = "2.34.2"; + version = "2.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh"; + sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8="; }; nativeBuildInputs = [ meson ninja pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 2c959434f01d..ba77020ec703 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.36.1"; + version = "2.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m3crrdbc9vdn9dr4lssdwrjmm8z5wxs2qhhnbkh1w5vkn87nhcp"; + sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU="; }; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/atk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/atk/default.nix index b54ba5313011..aa132515b3e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/atk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/atk/default.nix @@ -17,9 +17,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ # Required by atk.pc diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/attica/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/attica/default.nix deleted file mode 100644 index d883100fd3ce..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/attica/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4 }: - -stdenv.mkDerivation rec { - name = "attica-0.4.2"; - - src = fetchurl { - url = "mirror://kde/stable/attica/${name}.tar.bz2"; - sha256 = "1y74gsyzi70dfr9d1f1b08k130rm3jaibsppg8dv5h3211vm771v"; - }; - - buildInputs = [ qt4 ]; - nativeBuildInputs = [ cmake ]; - - meta = with stdenv.lib; { - description = "Library to access Open Collaboration Service providers"; - license = "LGPL"; - maintainers = [ maintainers.sander maintainers.phreedom ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index 124828b0ff5f..e8008058626a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.8"; + version = "0.24.10"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a"; + sha256 = "1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi"; }; patches = [ ./lilv-pkgconfig.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix index d4a0f671e8f8..6bc487e26162 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set C++ wrappers around the LV2 C API"; - homepage = "http://lvtoolkit.org"; + homepage = "https://lvtk.org/"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/audiofile/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/audiofile/default.nix index 46c29e2fa125..9f945b15dec2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/audiofile/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/audiofile/default.nix @@ -28,6 +28,21 @@ stdenv.mkDerivation rec { # fix build with gcc9 NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc"; + # Even when statically linking, libstdc++.la is put in dependency_libs here, + # and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the + # compiler do what it does best. (libaudiofile.la is a generated file, so we + # have to run `make` that far first). + # + # Without this, the executables in this package (sfcommands and examples) + # fail to build: https://github.com/NixOS/nixpkgs/issues/103215 + # + # There might be a more sensible way to do this with autotools, but I am not + # smart enough to discover it. + preBuild = lib.optionalString stdenv.targetPlatform.isStatic '' + make -C libaudiofile $makeFlags + sed -i "s/dependency_libs=.*/dependency_libs=' -lstdc++'/" libaudiofile/libaudiofile.la + ''; + patches = [ ./gcc-6.patch ./CVE-2015-7747.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/avahi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/avahi/default.nix index 3f36b87af704..a560cc39d162 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -1,8 +1,10 @@ { fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages -, expat, gettext, intltool, glib, libiconv, writeShellScriptBin +, expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent , gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false +, qt5 ? null +, qt5Support ? false , withLibdnssdCompat ? false , python ? null , withPython ? false }: @@ -16,11 +18,11 @@ in stdenv.mkDerivation rec { name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}"; - version = "0.7"; + version = "0.8"; src = fetchurl { url = "https://github.com/lathiat/avahi/releases/download/v${version}/avahi-${version}.tar.gz"; - sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; + sha256 = "1npdixwxxn3s9q1f365x9n9rc5xgfz39hxf23faqvlrklgbhj0q6"; }; prePatch = '' @@ -30,17 +32,13 @@ stdenv.mkDerivation rec { patches = [ ./no-mkdir-localstatedir.patch - (fetchpatch { - name ="CVE-2017-6519-CVE-2018-100084.patch"; - url = "https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch"; - sha256 = "06n7b7kz6xcc35c7xjfc1kj3k2llyjgi09nhy0ci32l1bhacjw0q"; - }) ]; - buildInputs = [ libdaemon dbus glib expat libiconv ] + buildInputs = [ libdaemon dbus glib expat libiconv libevent ] ++ (with perlPackages; [ perl XMLParser ]) ++ (stdenv.lib.optional gtk3Support gtk3) - ++ (stdenv.lib.optional qt4Support qt4); + ++ (stdenv.lib.optional qt4Support qt4) + ++ (stdenv.lib.optional qt5Support qt5); propagatedBuildInputs = stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); @@ -52,6 +50,7 @@ stdenv.mkDerivation rec { "--disable-gtk" "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" (stdenv.lib.enableFeature gtk3Support "gtk3") "--${if qt4Support then "enable" else "disable"}-qt4" + "--${if qt5Support then "enable" else "disable"}-qt5" (stdenv.lib.enableFeature withPython "python") "--localstatedir=/var" "--with-distro=none" # A systemd unit is provided by the avahi-daemon NixOS module diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index b028813558f5..6470566d5c71 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "aws-c-common"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # can be removed once https://github.com/awslabs/aws-c-common/pull/735 gets merged, and version bumped + patches = [ + (fetchpatch { + name = "fix-re-export-of-target.patch"; + url = "https://github.com/awslabs/aws-c-common/pull/735/commits/3fca5c629ce0c4d66f50f7152685f3fe73941cb4.patch"; + sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a"; + }) + ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-nullability-extension -Wno-typedef-redefinition"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix index d4ba15e52db4..ea3633d2e4d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "aws-checksums"; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # can be removed once https://github.com/awslabs/aws-checksums/pull/40 gets merged, and version bumped + patches = [ + (fetchpatch { + url = "https://github.com/awslabs/aws-checksums/pull/40/commits/fb5a57b3c072bd88e45de76fbb76bdc89c67b193.patch"; + sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a"; + }) + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix index 7b24f08822bf..127fe1c97504 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p"; + sha256 = "1mcw6gmacrzx4cyg4223dpwcmj3qf8l30mxsg43292lajzwsm2hz"; }; nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/babl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/babl/default.nix index ac622fb290ea..9bb6e9e1c5e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Image pixel format conversion library"; - homepage = "http://gegl.org/babl/"; - license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ jtojnar ]; + homepage = "https://gegl.org/babl/"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index d99ee57ef9e0..0f99484f5a08 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.0"; + version = "4.4.13"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1r3ymwk10ry6mz4zd08q7l5msq7h15931l7f0clw2siqs8r81x7c"; + sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; }; # Do not build static libraries @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; # Still using GPLv2 but as the rest of the Linphone projects have switched # to GPLv3, this might too, so check this when bumping the version number. - license = licenses.gpl2Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ raskin jluttine ]; platforms = platforms.linux; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/belcard/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/belcard/default.nix index 11de04889159..34b0560f3f46 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1w6rbp53cwxr00clp957458x27cgc2y9ylwa5mp812qva7zadmfw"; + sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"; }; buildInputs = [ bctoolbox belr ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/belr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/belr/default.nix index 90067e493a15..546949d9f21c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/belr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/belr/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=NO" ]; meta = with stdenv.lib; { - description = "Belr is Belledonne Communications' language recognition library"; + description = "Belledonne Communications' language recognition library"; homepage = "https://gitlab.linphone.org/BC/public/belr"; license = licenses.gpl3; platforms = platforms.all; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/bobcat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/bobcat/default.nix index 17f7bbc667c5..5473801f85d2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/bobcat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/bobcat/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchFromGitHub, icmake +{ stdenv, fetchFromGitLab, icmake , libmilter, libX11, openssl, readline -, utillinux, yodl }: +, util-linux, yodl }: stdenv.mkDerivation rec { pname = "bobcat"; - version = "4.08.03"; + version = "5.05.00"; - src = fetchFromGitHub { - sha256 = "163mdl8hxids7123bjxmqhcaqyc1dv7hv8k33s713ac6lzawarq2"; + src = fetchFromGitLab { + sha256 = "sha256:14lvxzkxmkk54s97ah996m6s1wbw1g3iwawbhsf8qw7sf75vlp1h"; + domain = "gitlab.com"; rev = version; repo = "bobcat"; owner = "fbb-git"; }; - buildInputs = [ libmilter libX11 openssl readline utillinux ]; + buildInputs = [ libmilter libX11 openssl readline util-linux ]; nativeBuildInputs = [ icmake yodl ]; setSourceRoot = '' @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brokken's Own Base Classes And Templates"; - homepage = "https://fbb-git.github.io/bobcat/"; + homepage = "https://fbb-git.gitlab.io/bobcat/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/1.73.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/1.73.nix new file mode 100644 index 000000000000..99a5486f197e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/1.73.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.73.0"; + + src = fetchurl { + #url = "mirror://sourceforge/boost/boost_1_73_0.tar.bz2"; + urls = [ + "mirror://sourceforge/boost/boost_1_73_0.tar.bz2" + "https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_73_0.html + sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402"; + }; +}) + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/1.74.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/1.74.nix new file mode 100644 index 000000000000..35b4013dcb36 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/1.74.nix @@ -0,0 +1,15 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.74.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_1_74_0.tar.bz2" + "https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_74_0.html + sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1"; + }; +}) + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/cmake-paths-173.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/cmake-paths-173.patch new file mode 100644 index 000000000000..7b88da0e42a9 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/cmake-paths-173.patch @@ -0,0 +1,22 @@ +diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam +index 4238f921e..8fc1ea269 100644 +--- a/tools/boost_install/boost-install.jam ++++ b/tools/boost_install/boost-install.jam +@@ -649,7 +649,7 @@ rule generate-cmake-config- ( target : sources * : properties * ) + "" + "# Compute the include and library directories relative to this file." + "" +- "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)" ++ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)" + : true ; + + if [ path.is-rooted $(cmakedir) ] +@@ -668,6 +668,8 @@ rule generate-cmake-config- ( target : sources * : properties * ) + " unset(_BOOST_CMAKEDIR_ORIGINAL)" + "endif()" + "" ++ "# Assume that the installer actually did know where the libs were to be installed" ++ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)" + : true ; + } + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/generic.nix index 6d1c20f323d3..a195a2c7bb98 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -113,7 +113,8 @@ stdenv.mkDerivation { if version == "1.55.0" then ./darwin-1.55-no-system-python.patch else ./darwin-no-system-python.patch) - ++ optional (versionAtLeast version "1.70") ./cmake-paths.patch; + ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch + ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch; meta = { homepage = "http://boost.org/"; @@ -145,11 +146,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which ] + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu - ++ optional stdenv.isDarwin fixDarwinDylibNames ++ optional enablePython python ++ optional enableNumpy python.pkgs.numpy; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/botan/2.0.nix index 91f7f6647304..22ddb76b29bd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -1,9 +1,9 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.7"; + baseVersion = "2.9"; revision = "0"; - sha256 = "142aqabwc266jxn8wrp0f1ffrmcvdxwvyh8frb38hx9iaqazjbg4"; + sha256 = "06fiyalvc68p11qqh953azx2vrbav5vr00yvcfp67p9l4csn8m9h"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/boxfort/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/boxfort/default.nix index fb6e735c46e7..9a4e2c233561 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/boxfort/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/boxfort/default.nix @@ -1,36 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libcsptr, dyncall -, nanomsg, python37Packages }: +{ stdenv, fetchFromGitHub, meson, ninja, python37Packages }: stdenv.mkDerivation rec { - version = "unstable-2019-09-19"; + version = "unstable-2019-10-09"; pname = "boxfort"; src = fetchFromGitHub { owner = "Snaipe"; repo = "BoxFort"; - rev = "926bd4ce968592dbbba97ec1bb9aeca3edf29b0d"; - sha256 = "0mzy4f8qij6ckn5578y3l4rni2470pdkjy5xww7ak99l1kh3p3v6"; + rev = "356f047db08b7344ea7980576b705e65b9fc8772"; + sha256 = "1p0llz7n0p5gzpvqszmra9p88vnr0j88sp5ixhgbfz89bswg62ss"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ meson ninja ]; - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - dyncall - gettext - libcsptr - nanomsg - ]; + preConfigure = '' + patchShebangs ci/isdir.py + ''; checkInputs = with python37Packages; [ cram ]; - cmakeFlags = [ "-DBXF_FORK_RESILIENCE=OFF" ]; - doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; outputs = [ "dev" "out" ]; @@ -38,10 +27,7 @@ stdenv.mkDerivation rec { description = "Convenient & cross-platform sandboxing C library"; homepage = "https://github.com/Snaipe/BoxFort"; license = licenses.mit; - maintainers = with maintainers; [ - thesola10 - Yumasi - ]; + maintainers = with maintainers; [ thesola10 Yumasi ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index d54539d9f25a..4fe53a5d629d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; meta = with stdenv.lib; { - description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol"; + description = "An opensource implementation of ZRTP keys exchange protocol"; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; # They have switched to GPLv3 on git HEAD so probably the next release will # be GPL3. diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/c-ares/default.nix index 2751565670af..ac0dc43c67a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -7,11 +7,12 @@ let self = stdenv.mkDerivation rec { - name = "c-ares-1.15.0"; + pname = "c-ares"; + version = "1.17.1"; src = fetchurl { - url = "https://c-ares.haxx.se/download/${name}.tar.gz"; - sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc"; + url = "https://c-ares.haxx.se/download/${pname}-${version}.tar.gz"; + sha256 = "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/c-blosc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/c-blosc/default.nix index 8f7cee75e92a..20b82df6169f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/c-blosc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/c-blosc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0a3yrig78plzjbazfqcfrzqhnw17xd0dcayvp4z4kp415kgs2a3s"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cairo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cairo/default.nix index a414191ac0df..3a7c63165b7f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -35,6 +35,9 @@ in stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1"; }) + ] ++ optionals stdenv.hostPlatform.isDarwin [ + # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 + ./skip-configure-stderr-check.patch ]; outputs = [ "out" "dev" "devdoc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch new file mode 100644 index 000000000000..6deecf2a9717 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch @@ -0,0 +1,89 @@ +https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6 + +Comment 6 Jeremy Huddleston Sequoia 2014-07-15 04:12:40 UTC + +Yes, it is still an issue. We just disable the buggy '"x$cairo_cc_stderr" != "x"' logic, but that's not really a portable solution for you: + +diff -Naurp cairo-1.12.2.orig/configure cairo-1.12.2/configure +--- cairo-1.12.2.orig/configure 2012-04-29 11:49:59.000000000 -0700 ++++ cairo-1.12.2/configure 2012-05-03 11:23:49.000000000 -0700 +@@ -18044,7 +18044,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -18091,7 +18091,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -18161,7 +18161,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -18217,7 +18217,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -19663,7 +19663,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -19710,7 +19710,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -32692,7 +32692,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -32811,7 +32811,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false ; then + cairo_cc_flag=no + fi + +@@ -32892,7 +32892,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/catch2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/catch2/default.nix index 49b2e9be02ca..4e41f39b49b1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.12.3"; + version = "2.13.3"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="0rp30754frp88wbl17ksr40mmffw5xibq73blgx9jj42d7nl891x"; + sha256="0m7pwsam1nb93akgnf5fxi737pgbrbcj0y28bavhzcss7yrm4gys"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cddlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cddlib/default.nix index a9a10fc6317b..f286c881e46c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cddlib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cddlib/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { inherit version; description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron''; license = licenses.gpl2Plus; - maintainers = with maintainers; [raskin timokau]; + maintainers = teams.sage.members; platforms = platforms.unix; homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cdk/default.nix index 8487435981ca..4613eefd3b90 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cdk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cdk"; - version ="5.0-20190224"; + version ="5.0-20200923"; buildInputs = [ ncurses @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "0767xqwm377ak909c589vqm0v83slsnkm2ycq7bg545xx5nycncs"; + sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cimg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cimg/default.nix index c50838bc0d52..61d3996a4f5b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.2"; + version = "2.9.4"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "01hvjlxclbmrzqb8qz1h2sdkpybpg14q81na8kfi94w3bkkkmzzf"; + sha256 = "1sb0z5ryh34y80ghlr2agsl64gayjmxpl96l9fjaylf5k2m3fg2b"; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cogl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cogl/default.nix index 08b3b96784a9..f2a69e87d85e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cogl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cogl/default.nix @@ -7,11 +7,11 @@ let pname = "cogl"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.22.6"; + version = "1.22.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd"; + sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8"; }; patches = [ @@ -29,12 +29,6 @@ in stdenv.mkDerivation rec { url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056"; sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490"; }) - - # Fix build with libglvnd headers (these headers used to be provided by mesa) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/cogl/commit/9c4764224aded552fb855b1c2b85b26d2b894adf.patch"; - sha256 = "1v9drpzgcd5pq2shhdcw5px7mdiggk6ga13qjbklq8xpd92ac0i1"; - }) ]; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/comedilib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/comedilib/default.nix index f011c04d8856..98811b97c87e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/comedilib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/comedilib/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "comedilib"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Linux-Comedi"; repo = "comedilib"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "159sv4jdgmcaqz76vazkyxxb85ni7pg14p1qv7y94hib3kspc195"; + sha256 = "0kfs2dw62vjz8j7fgsxq6ky8r8kca726gyklbm6kljvgfh47lyfw"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index cbe628aaf4ee..08940b4800df 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.6.0"; + version = "5.9.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0998pyrxicpalm2w1wmv7qrfhzgr45kl6xh9gv0zxhx2a4xjqq5v"; + sha256 = "0lcbvmighmc03qxcf03vqmn6188wx4dr3m9d5ldxm2v7mw5xbq82"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cppzmq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cppzmq/default.nix index 240710b5a50f..fdd98cb00bf0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cppzmq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.6.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h"; + sha256 = "00lb3pv923nbpaf7ric2cv6lbpspknj0pxj6yj5jyah7r3zw692m"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cre2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cre2/default.nix index 6f101fb5d471..fa4f5d232aa3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cre2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cre2/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "cre2"; - version = "0.3.0"; + version = "0.3.6"; src = fetchFromGitHub { owner = "marcomaggi"; - repo = "cre2"; + repo = pname; rev = "v${version}"; sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix index 1e12afd95ca9..d82296c3e66b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ctypes.sh"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "taviso"; repo = pname; rev = "v${version}"; - sha256 = "07rqbdxw33h92mllh0srymjjx52mddafs3jyzqpsflq3v0l0dk37"; + sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cutelyst/default.nix index d5e83f0410c4..1befa89c7d05 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cutelyst/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1ngacc7ackp08hajby0xvzpvnqahwm2dbxmisw7j7qs1lqrx9k3n"; + sha256 = "1xbw8ag3iwm69dhrsg54anrlzvvflj6pwsj42z6hrl0yckabn99z"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cxxtest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cxxtest/default.nix index 00629339e086..e1898044efaf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cxxtest/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cxxtest/default.nix @@ -1,10 +1,8 @@ -{ stdenv, fetchFromGitHub, python2Packages}: +{ stdenv, buildPythonApplication, fetchFromGitHub }: -let +buildPythonApplication rec { pname = "cxxtest"; version = "4.4"; -in python2Packages.buildPythonApplication { - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CxxTest"; @@ -13,16 +11,26 @@ in python2Packages.buildPythonApplication { sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - setSourceRoot = '' - sourceRoot=$(echo */python) + sourceRoot = "source/python"; + + postCheck = '' + python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../test/GoodSuite.h + $CXX -I.. -o build/GoodSuite build/GoodSuite.cpp + build/GoodSuite + ''; + + postInstall = '' + mkdir -p "$out/include" + cp -r ../cxxtest "$out/include" ''; + dontWrapPythonPrograms = true; + meta = with stdenv.lib; { homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; - platforms = platforms.unix ; + platforms = platforms.unix; license = licenses.lgpl3; maintainers = [ maintainers.juliendehos ]; }; } - diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index 1ffb53599924..96778e8960be 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = - [ "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz" + [ "https://github.com/cyrusimap/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz" + "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz" "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz" ]; sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; @@ -18,7 +19,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "devdoc" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames pruneLibtoolFiles ]; + nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ openssl db gettext kerberos ] ++ lib.optional enableLdap openldap diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/dav1d/default.nix index 0889fdd0d8f4..a56184e9a179 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -9,14 +9,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "1yawrbaazj6a2rvvb58k6kh492fjxdwlm94bl6ipry0fqmz0rlnl"; + sha256 = "0mjn87xjdqv0q1gj4s4f6fdmsj504mhk4qmqiyrhq2rs7yqj4csv"; }; nativeBuildInputs = [ meson ninja nasm pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix index 376fe9f64eec..4480d197fa7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -5,6 +5,8 @@ , expat , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , systemd +, audit +, libapparmor , libX11 ? null , libICE ? null , libSM ? null @@ -30,7 +32,13 @@ stdenv.mkDerivation rec { sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp"; }; - patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + patches = [ + # 'generate.consistent.ids=1' ensures reproducible docs, for further details see + # http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html + # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189, + # expected in version 1.14 + ./docs-reproducible-ids.patch + ] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch); postPatch = '' substituteInPlace tools/Makefile.in \ @@ -64,7 +72,8 @@ stdenv.mkDerivation rec { libX11 libICE libSM - ] ++ lib.optional enableSystemd systemd; + ] ++ lib.optional enableSystemd systemd + ++ lib.optionals (!stdenv.isDarwin) [ audit libapparmor ]; # ToDo: optional selinux? configureFlags = [ @@ -80,7 +89,8 @@ stdenv.mkDerivation rec { "--with-system-socket=/run/dbus/system_bus_socket" "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" - ] ++ lib.optional (!x11Support) "--without-x"; + ] ++ lib.optional (!x11Support) "--without-x" + ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ]; # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/docs-reproducible-ids.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/docs-reproducible-ids.patch new file mode 100644 index 000000000000..2356b64d95cf --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/docs-reproducible-ids.patch @@ -0,0 +1,15 @@ +diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in +--- dbus-1.12.20-original/doc/Makefile.in 2020-07-02 12:10:41.000000000 +0200 ++++ dbus-1.12.20-hacked2/doc/Makefile.in 2020-11-07 09:57:15.297694773 +0100 +@@ -870,8 +870,10 @@ + .PRECIOUS: Makefile + + ++# 'generate.consistent.ids=1' ensures reproducible docs, for further details see ++# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html + @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml +-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $< ++@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $< + + @DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml + @DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) man $< diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix index e714b96b7e9f..ce5c0b3b5772 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -1,6 +1,7 @@ { runCommand, writeText, libxslt, dbus , serviceDirectories ? [] , suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" +, apparmor ? "disabled" # one of enabled, disabled, required }: /* DBus has two configuration parsers -- normal and "trivial", which is used @@ -10,7 +11,7 @@ */ runCommand "dbus-1" { - inherit serviceDirectories suidHelper; + inherit serviceDirectories suidHelper apparmor; preferLocalBuild = true; allowSubstitutes = false; XML_CATALOG_FILES = writeText "dbus-catalog.xml" '' @@ -33,10 +34,12 @@ runCommand "dbus-1" xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ --stringparam suidHelper "$suidHelper" \ + --stringparam apparmor "$apparmor" \ ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \ > $out/system.conf xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ + --stringparam apparmor "$apparmor" \ ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \ > $out/session.conf '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl index 6a19ee14a22c..a744905cdd39 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl @@ -15,12 +15,16 @@ <xsl:output method='xml' encoding="UTF-8" doctype-system="busconfig.dtd" /> <xsl:param name="serviceDirectories" /> + <xsl:param name="apparmor" /> <xsl:template match="/busconfig"> <busconfig> <!-- We leave <standard_session_servicedirs/> because it includes XDG dirs and therefore user Nix profile. --> <xsl:copy-of select="child::node()[name() != 'include' and name() != 'servicedir' and name() != 'includedir']" /> + <!-- configure AppArmor --> + <apparmor mode="{$apparmor}"/> + <xsl:for-each select="str:tokenize($serviceDirectories)"> <servicedir><xsl:value-of select="." />/share/dbus-1/services</servicedir> <includedir><xsl:value-of select="." />/etc/dbus-1/session.d</includedir> diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-system-conf.xsl b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-system-conf.xsl index dd644b4bce7c..06233e764e16 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-system-conf.xsl +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/dbus/make-system-conf.xsl @@ -16,11 +16,15 @@ <xsl:param name="serviceDirectories" /> <xsl:param name="suidHelper" /> + <xsl:param name="apparmor" /> <xsl:template match="/busconfig"> <busconfig> <xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_system_servicedirs' and name() != 'servicehelper' and name() != 'servicedir' and name() != 'includedir']" /> + <!-- configure AppArmor --> + <apparmor mode="{$apparmor}"/> + <!-- set suid helper --> <servicehelper><xsl:value-of select="$suidHelper" /></servicehelper> diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/dconf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/dconf/default.nix index 444b1430dd5c..c9c1b9be9228 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/dconf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/dconf/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , meson , ninja , python3 @@ -19,24 +18,15 @@ stdenv.mkDerivation rec { pname = "dconf"; - version = "0.36.0"; + version = "0.38.0"; outputs = [ "out" "lib" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz"; + sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5"; }; - patches = [ - # Fix bash-completion installation - # https://gitlab.gnome.org/GNOME/dconf/merge_requests/58 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/dconf/commit/b3c9423c6151f3c28e526083ea2f04987a780fdf.patch"; - sha256 = "0kdapiw3zq041jhzsx90kk08vqfgzr6vy2k541iav984d0m0zcnf"; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/doctest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/doctest/default.nix index 5a2561056876..d647d5f38880 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/doctest/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - sha256 = "1yi95saqv8qb3ix6w8d7ffvs7qbwvqmq6wblckhxhicxxdxk85cd"; + sha256 = "17g7n6rjs90i0b231x5s934qnr8m80ga2yg1z344bnsdiqcjd63w"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/draco/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/draco/default.nix index f8b806482aca..02feba0a43e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/draco/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -2,14 +2,14 @@ }: stdenv.mkDerivation rec { - version = "1.3.6"; + version = "1.4.0"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; rev = version; - sha256 = "06adhz8gsnns6q98yzjm64xs04qp2fhm9bv0wxny68rkw0bh95a0"; + sha256 = "0s65il754fpiygbg0yq2xynpbnmhiiaxghkzprjqxziyz6gi87lm"; }; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/default.nix index 0d3e2913ce8e..5cef17f11196 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen -, fluidsynth, pkgconfig, qt5 +{ stdenv, fetchurl +, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook +, alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio }: stdenv.mkDerivation rec { @@ -11,18 +12,25 @@ stdenv.mkDerivation rec { sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m"; }; + patches = [ + ./drumstick-fluidsynth.patch + ./drumstick-plugins.patch + ]; + + postPatch = '' + substituteInPlace library/rt/backendmanager.cpp --subst-var out + ''; + outputs = [ "out" "dev" "man" ]; enableParallelBuilding = true; - #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket - postInstall = '' - rm $out/bin/drumstick-vpiano - ''; + nativeBuildInputs = [ + cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook + ]; - nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ]; buildInputs = [ - alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg + alsaLib fluidsynth libpulseaudio qtbase qtsvg ]; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch new file mode 100644 index 000000000000..b8cdf63fb649 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch @@ -0,0 +1,9 @@ +It works with fluidsynth 2. + +Backported from r400: https://sourceforge.net/p/drumstick/code/400/ + +--- a/library/rt-backends/CMakeLists.txt ++++ b/library/rt-backends/CMakeLists.txt +@@ -54,1 +54,1 @@ if (PKG_CONFIG_FOUND) +- pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1 fluidsynth<=1.1.11) ++ pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/drumstick-plugins.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/drumstick-plugins.patch new file mode 100644 index 000000000000..cbb0a0e34896 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/drumstick/drumstick-plugins.patch @@ -0,0 +1,12 @@ +Make it look for its plugin in its own installation directory. + +--- a/library/rt/backendmanager.cpp ++++ b/library/rt/backendmanager.cpp +@@ -159,6 +159,7 @@ namespace rt { + foreach(const QString& path, QCoreApplication::libraryPaths()) { + d->appendDir( path + QDir::separator() + QSTR_DRUMSTICK, result ); + } ++ d->appendDir( "@out@/lib/drumstick", result ); + return result; + } + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/duckdb/default.nix index dde0806add4a..1aedee5c3b68 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -5,20 +5,20 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "18l4qdzfm8k9ggn49r3h99cbcmmq01byzkxps3pvmq8q246hb55x"; + sha256 = "1pzz2zjzpvji5am21vd9kjxj0pnxsjmrsfqrym9h2rk2mi7p2cx8"; }; nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = "https://github.com/cwida/duckdb"; - description = "DuckDB is an embeddable SQL OLAP Database Management System"; + description = "Embeddable SQL OLAP Database Management System"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ costrouc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/eclib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/eclib/default.nix index b6dfd429d75a..9273fb7fd78e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = ''Elliptic curve tools''; homepage = "https://github.com/JohnCremona/eclib"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin timokau ]; + maintainers = teams.sage.members; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/embree/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/embree/default.nix index 60d6af94762c..650c1d4ce497 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "1q06fkfww8z8pcnhaqc4d2zi8hn620i9h9dmpnrfy3azalvizhkq"; + sha256 = "0aznd16n7h8g3f6jcahzfp1dq4r7wayqvn03wsaskiq2dvsi4srd"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index b7b86de92c01..02215a30418b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.11"; + version = "2.2.13"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "opxXd8TkX8rCWVwVxJ1tKqQ0+l58mT3/P582e2X+Ryo="; + sha256 = "084aqsrkzz2c1ls47p759d9bsi26d0m6wq9901k37483g46zkfga"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/enet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/enet/default.nix index e1172870ede7..61b8c1be4f2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/enet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/enet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.15"; + name = "enet-1.3.17"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas"; + sha256 = "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3"; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/expat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/expat/default.nix index a356d7be1a9e..29d2c2b3acb9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { - name = "expat-2.2.8"; +let + version = "2.2.10"; +in stdenv.mkDerivation rec { + name = "expat-${version}"; src = fetchurl { - url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz"; - sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1"; + url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${name}.tar.xz"; + sha256 = "sha256-Xf5Tj4tbY/A+mO2sUg19mmpNIuSC5cltTQb8xUhcJfI="; }; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/faad2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/faad2/default.nix index 6842f191abe3..90b1a182e553 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/faad2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/faad2/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "faad2"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "knik0"; repo = "faad2"; rev = builtins.replaceStrings [ "." ] [ "_" ] version; - sha256 = "0rdi6bmyryhkwf4mpprrsp78m6lv1nppav2f0lf1ywifm92ng59c"; + sha256 = "0q52kdd95ls6ihzyspx176wg9x22425v5qsknrmrjq30q25qmmlg"; }; configureFlags = [] diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/faudio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/faudio/default.nix index cc1bb09d3906..02544d74782e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.09"; + version = "20.12"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "097pdpd34aw420c46j6nrl5wdklgqrsznml0q2qxw1m7hrl7gkk6"; + sha256 = "1iwfsfbd2ji7lkk5fh0wla287gph0sadlf0pz2j0vyddpkvr0xgx"; }; - nativeBuildInputs = [cmake]; + nativeBuildInputs = [cmake]; buildInputs = [ SDL2 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index 23b31fe439fd..faa8ed3c70e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { inherit version; description = ''Finite Field Linear Algebra Subroutines''; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ raskin timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; homepage = "https://linbox-team.github.io/fflas-ffpack/"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index c23fb87f2fae..a2f5e366e008 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -164,9 +164,8 @@ * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: - * frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh - * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab - * wavpack x265 xavs + * gsm libjack2 libmodplug libmfx(intel-media-sdk) nvenc pulseaudio samba + * vid-stab * * Need fixes to support AArch64: * libmfx(intel-media-sdk) nvenc @@ -244,6 +243,15 @@ stdenv.mkDerivation rec { pname = "ffmpeg-full"; inherit (ffmpeg) src version; + # this should go away in the next release + patches = [ + (fetchpatch { + url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315"; + sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o="; + name = "fix_libsrt.patch"; + }) + ]; + prePatch = '' patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/fmt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/fmt/default.nix index eb9ecea7a182..8eac88df796c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -1,60 +1,48 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }: -stdenv.mkDerivation rec { - pname = "fmt"; - version = "6.2.1"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "fmtlib"; - repo = "fmt"; - rev = version; - sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic"; - }; - - patches = [ - # Fix BC break breaking Kodi - # https://github.com/xbmc/xbmc/issues/17629 - # https://github.com/fmtlib/fmt/issues/1620 - (fetchpatch { - url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch"; - sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx"; - }) - - # Fix paths in pkg-config file - # https://github.com/fmtlib/fmt/pull/1657 - (fetchpatch { - url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; - sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6"; - }) - - # Fix cmake config paths. - (fetchpatch { - url = "https://github.com/fmtlib/fmt/pull/1702.patch"; - sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Small, safe and fast formatting library"; - longDescription = '' - fmt (formerly cppformat) is an open-source formatting library. It can be - used as a fast and safe alternative to printf and IOStreams. - ''; - homepage = "http://fmtlib.net/"; - downloadPage = "https://github.com/fmtlib/fmt/"; - maintainers = [ maintainers.jdehaas ]; - license = licenses.bsd2; - platforms = platforms.all; +let + generic = { version, sha256, patches ? [ ] }: + stdenv.mkDerivation { + pname = "fmt"; + inherit version; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "fmtlib"; + repo = "fmt"; + rev = version; + inherit sha256; + }; + + inherit patches; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Small, safe and fast formatting library"; + longDescription = '' + fmt (formerly cppformat) is an open-source formatting library. It can be + used as a fast and safe alternative to printf and IOStreams. + ''; + homepage = "http://fmtlib.net/"; + downloadPage = "https://github.com/fmtlib/fmt/"; + maintainers = [ maintainers.jdehaas ]; + license = licenses.bsd2; + platforms = platforms.all; + }; + }; +in +{ + fmt_7 = generic { + version = "7.1.3"; + sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/folks/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/folks/default.nix index e9df0ef4016b..6181cb45e19e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -16,7 +16,6 @@ , nss , dbus , libgee -, telepathy-glib , evolution-data-server , libsecret , db @@ -26,6 +25,8 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, telepathy-glib +, telepathySupport ? false }: # TODO: enable more folks backends @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" + "-Dtelepathy_backend=${stdenv.lib.boolToString telepathySupport}" ]; nativeBuildInputs = [ @@ -69,8 +71,7 @@ stdenv.mkDerivation rec { nspr nss readline - telepathy-glib - ]; + ] ++ stdenv.lib.optional telepathySupport telepathy-glib; propagatedBuildInputs = [ glib @@ -109,6 +110,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Folks"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/fontconfig/default.nix index 72df121200e0..e08149903a2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/fontconfig/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/fontconfig/default.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ - "--disable-docs" # just <1MB; this is what you get when loading config fails for some reason "--with-default-fonts=${dejavu_fonts.minimal}" ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ @@ -108,6 +107,9 @@ stdenv.mkDerivation rec { ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ > fonts.conf.tmp mv fonts.conf.tmp $out/etc/fonts/fonts.conf + # We don't keep section 3 of the manpages, as they are quite large and + # probably not so useful. + rm -r $bin/share/man/man3 ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/fplll/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/fplll/default.nix index 107635267c6f..82d56ea2af41 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/fplll/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/fplll/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "https://groups.google.com/forum/#!searchin/fplll-devel/FPLLL$20${version}" ]; license = licenses.lgpl21Plus; - maintainers = with maintainers; [raskin timokau]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/freetype/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/freetype/default.nix index 24757af09e3d..b87e64c2afbf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { pname = "freetype"; - version = "2.10.2"; + version = "2.10.4"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "12rd181yzz6952cyjqaa4253f5szam93cmhw18p33rnj4l8dchqm"; + sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/fribidi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/fribidi/default.nix index 35ae4c8e6ca9..f10af240720d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/fribidi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/fribidi/default.nix @@ -1,6 +1,6 @@ { stdenv +, buildPackages , fetchurl -, fetchpatch , meson , ninja , pkgconfig @@ -10,24 +10,16 @@ stdenv.mkDerivation rec { pname = "fribidi"; - version = "1.0.7"; + version = "1.0.10"; outputs = [ "out" "devdoc" ]; # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { - url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das"; + url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "009wcpgk4jj5x52skjkfs6xar6x38mcngs75rb59nj9ig1y6h73z"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-18397.patch"; - url = "https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch"; - sha256 = "102xrbf1l5gvavkxd6csx8pj3rlgcw10c0y4h4d40yhn84b1p0y8"; - }) - ]; - postPatch = '' patchShebangs test ''; @@ -35,6 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + doCheck = true; checkInputs = [ python3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gamin/abstract-socket-namespace.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/gamin/abstract-socket-namespace.patch new file mode 100644 index 000000000000..ff1610559721 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gamin/abstract-socket-namespace.patch @@ -0,0 +1,73 @@ +From 737452159d521aef2041a2767f3ebf9f68f4b6a9 Mon Sep 17 00:00:00 2001 +From: Christian Kampka <christian@kampka.net> +Date: Tue, 1 Sep 2020 13:54:35 +0200 +Subject: [PATCH] Pin abstract namespace sockets to host_os + +Running programs with AC_RUN_IFELSE fails when cross-compiling. +Since abstract namespace sockets are linux feature, we can easily +assume it is available for linux and not for darwin. +--- + configure.in | 47 ++++++----------------------------------------- + 1 file changed, 6 insertions(+), 41 deletions(-) + +diff --git a/configure.in b/configure.in +index eb129db..0ed82ba 100644 +--- a/configure.in ++++ b/configure.in +@@ -387,47 +387,12 @@ fi + + #### Abstract sockets + +-AC_MSG_CHECKING(abstract socket namespace) +-AC_LANG_PUSH(C) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +-[[ +-#include <sys/types.h> +-#include <stdlib.h> +-#include <string.h> +-#include <stdio.h> +-#include <sys/socket.h> +-#include <sys/un.h> +-#include <errno.h> +-]], +-[[ +- int listen_fd; +- struct sockaddr_un addr; +- +- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); +- +- if (listen_fd < 0) +- { +- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); +- exit (1); +- } +- +- memset (&addr, '\0', sizeof (addr)); +- addr.sun_family = AF_UNIX; +- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); +- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ +- +- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) +- { +- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", +- strerror (errno)); +- exit (1); +- } +- else +- exit (0); +-]])], +- [have_abstract_sockets=yes], +- [have_abstract_sockets=no]) +-AC_LANG_POP(C) ++AC_MSG_CHECKING([whether target os has abstract socket namespace]) ++if test x$target_os = xlinux-gnu ; then ++ have_abstract_sockets=yes ++else ++ have_abstract_sockets=no ++fi + AC_MSG_RESULT($have_abstract_sockets) + + if test x$enable_abstract_sockets = xyes; then +-- +2.25.4 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gamin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gamin/default.nix index 38451571d8b6..89096c887450 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gamin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gamin/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }: -stdenv.mkDerivation (rec { +let + cross = stdenv.hostPlatform != stdenv.buildPlatform; +in stdenv.mkDerivation (rec { name = "gamin-0.1.10"; src = fetchurl { @@ -8,7 +10,7 @@ stdenv.mkDerivation (rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ glib ]; @@ -27,7 +29,7 @@ stdenv.mkDerivation (rec { name = "fix-pthread-mutex.patch"; url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; - }); + }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gcr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gcr/default.nix index 55827b1ad0bc..212b087fbe2c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.36.0"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00b6bzpr8rj8mvj66r2273r417wg2y21m6n88mhkq9m22z8bxyda"; + sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch new file mode 100644 index 000000000000..7583deb81098 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch @@ -0,0 +1,25 @@ +From 2c31a95d9e57a4308c5159c50e69b5c9178dee72 Mon Sep 17 00:00:00 2001 +From: Christian Kampka <christian@kampka.net> +Date: Fri, 13 Nov 2020 16:52:12 +0100 +Subject: [PATCH] Remove duplicate assignments + +--- + src/parseopt.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/parseopt.c b/src/parseopt.c +index 268e080..a4c8576 100644 +--- a/src/parseopt.c ++++ b/src/parseopt.c +@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin) + } + + char *parseopt_program_name; +-char *parseopt_program_doc; +-char *parseopt_program_args; + const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; + void (*parseopt_help_hook) (FILE *stream); + +-- +2.25.4 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gdbm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gdbm/default.nix index 6cee01e799e7..3d333e503b2e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gdbm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gdbm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; + patches = [ ./0001-Remove-duplicate-assignments.patch ]; + # Linking static stubs on cygwin requires correct ordering. # Consider upstreaming this. diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index 08b8f70b2d9a..2d6fae915f8c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -20,30 +20,23 @@ , gobject-introspection , doCheck ? false , makeWrapper -, fetchpatch +, lib }: stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.40.0"; + version = "2.42.0"; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"; + sha256 = "1ixfmmamgv67is7snzighfr7c9y2maq3q4a075xdq0d9s4w16i3k"; }; patches = [ # Move installed tests to a separate output ./installed-tests-path.patch - - # Temporary until the fix is released. - (fetchpatch { - name = "tests-circular-table.patch"; - url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/59.diff"; - sha256 = "0kaflac3mrh6031hwxk7j9fhli775hc503818h8zfl6b28zyn93f"; - }) ]; nativeBuildInputs = [ @@ -60,9 +53,7 @@ stdenv.mkDerivation rec { gobject-introspection makeWrapper glib - ] ++ stdenv.lib.optional stdenv.isDarwin [ - fixDarwinDylibNames - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ glib @@ -72,9 +63,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Ddocs=true" - "-Dx11=false" # use gdk-pixbuf-xlib - "-Dgir=${if gobject-introspection != null then "true" else "false"}" + "-Dgtk_doc=true" + "-Dintrospection=${if gobject-introspection != null then "enabled" else "disabled"}" "-Dgio_sniffing=false" ]; @@ -136,7 +126,7 @@ stdenv.mkDerivation rec { description = "A library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gegl/4.0.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gegl/4.0.nix index 6b38251a6806..c25f9145ea5e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gegl/4.0.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gegl/4.0.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg"; + sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ="; }; patches = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch"; - sha256 = "CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE="; + sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE="; }) ]; @@ -120,8 +120,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graph-based image processing framework"; - homepage = "http://www.gegl.org"; - license = licenses.gpl3; + homepage = "https://www.gegl.org"; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gegl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gegl/default.nix index 1b8643172177..a99ec05d771c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gegl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gegl/default.nix @@ -1,12 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk2, bzip2, intltool, libintl +{ stdenv +, fetchurl +, pkgconfig +, babl +, libpng +, cairo +, libjpeg +, librsvg +, pango +, gtk2 +, bzip2 +, intltool +, libintl , OpenGL ? null }: stdenv.mkDerivation rec { - name = "gegl-0.2.0"; + pname = "gegl"; + version = "0.2.0"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2"; + url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2"; sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; }; @@ -17,7 +29,7 @@ stdenv.mkDerivation rec { name = "CVE-2012-4433.patch"; })]; - # needs fonts otherwise don't know how to pass them + # needs fonts otherwise don't know how to pass them configureFlags = [ "--disable-docs" ]; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] @@ -27,10 +39,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails 3 out of 19 tests - meta = { + meta = with stdenv.lib; { description = "Graph-based image processing framework"; - homepage = "http://www.gegl.org"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + homepage = "https://www.gegl.org"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gensio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gensio/default.nix index daca5fc0bdb1..b3bf33f0e881 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.1.4"; + version = "2.1.7"; src = fetchFromGitHub { owner = "cminyard"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; - sha256 = "0c44qhhrknjl7sp94q34z7nv7bvnlqs8wzm385661liy4mnfn4dc"; + sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih"; }; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/geoclue/default.nix index da76c6dfedcf..74d778c5c555 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/geoclue/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/geoclue/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system" - "-Ddemo-agent=${if withDemoAgent then "true" else "false"}" + "-Ddemo-agent=${boolToString withDemoAgent}" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" "-Ddbus-srv-user=geoclue" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gf2x/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gf2x/default.nix index 2409ee314d64..14ea3021914a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gf2x/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gf2x/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = ''Routines for fast arithmetic in GF(2)[x]''; homepage = "http://gf2x.gforge.inria.fr"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/git2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/git2/default.nix index 3f0279950338..96b67c7ccca8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/git2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/git2/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, python3 +{ stdenv, fetchFromGitHub, cmake, pkg-config, python3 , zlib, libssh2, openssl, pcre, http-parser , libiconv, Security }: stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.0.0"; + version = "1.1.0"; # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc"; + sha256 = "1vj7q7b8j3smiyi1acbc5x86lqk00igdm2adjnqs9n011i13rykl"; }; cmakeFlags = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DUSE_HTTP_PARSER=system" ]; - nativeBuildInputs = [ cmake python3 pkgconfig ]; + nativeBuildInputs = [ cmake python3 pkg-config ]; buildInputs = [ zlib libssh2 openssl pcre http-parser ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gjs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gjs/default.nix index 1cad5c0deb96..9437d76335d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -8,7 +8,7 @@ , gtk3 , atk , gobject-introspection -, spidermonkey_68 +, spidermonkey_78 , pango , cairo , readline @@ -29,11 +29,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.64.4"; + version = "1.66.1"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0k6l2qc2vkws34zrgdhl57qxf0jjkar2iziz6qn4n1w7va73mk53"; + sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld"; }; outputs = [ "out" "dev" "installedTests" ]; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { gobject-introspection cairo readline - spidermonkey_68 + spidermonkey_78 dbus # for dbus-run-session ]; @@ -88,22 +88,22 @@ in stdenv.mkDerivation rec { # in the GIR files. When running tests, the library is not yet installed, # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that will be overridden during installation. - mkdir -p $out/lib $installedTests/libexec/gjs/installed-tests + mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 - ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/gjs/installed-tests/libgimarshallingtests.so - ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/gjs/installed-tests/libregress.so - ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/gjs/installed-tests/libwarnlib.so + ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so + ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so + ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so ''; postInstall = '' - # TODO: make the glib setup hook handle this + # TODO: make the glib setup hook handle moving the schemas in other outputs. installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}" mkdir -p "$installedTestsSchemaDatadir" mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir" ''; postFixup = '' - wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \ + wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \ --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch index f9b1515b68e3..09cd8eaff434 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gjs/installed-tests-path.patch @@ -1,22 +1,22 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build -index 7e842025..1e5029e0 100644 +index 04c7910f..9647908c 100644 --- a/installed-tests/meson.build +++ b/installed-tests/meson.build @@ -1,7 +1,7 @@ ### Installed tests ############################################################ --installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests' +-installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name() -installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name() -+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests' ++installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name() +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name() # Simple shell script tests # diff --git a/meson.build b/meson.build -index 084d5396..e5d73fcd 100644 +index 9ab29475..42ffe07f 100644 --- a/meson.build +++ b/meson.build -@@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp', +@@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp', install_dir: get_option('datadir') / api_name / 'lsan') if get_option('installed_tests') @@ -26,7 +26,7 @@ index 084d5396..e5d73fcd 100644 meson.add_install_script('build/compile-gschemas.py', schemadir) endif diff --git a/meson_options.txt b/meson_options.txt -index 66f66024..008687cb 100644 +index 825ba77a..21f0323c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false, diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index 1b9fcb9586b3..fbc1cb818ca8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libGL ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ] - ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index 59bf8485971f..fc85b50e07f3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.64.3"; + version = "2.66.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0s518l4bwvdvcp51lbjqcw8g0vq18bznpf5hq2zi6a054jqhcylk"; + sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5"; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/glib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/glib/default.nix index 88848deec412..3382af17c35d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 -# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) -, utillinuxMinimal ? null +# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) +, util-linuxMinimal ? null , buildPackages # this is just for tests (not in the closure of any regular package) @@ -13,7 +13,7 @@ with stdenv.lib; -assert stdenv.isLinux -> utillinuxMinimal != null; +assert stdenv.isLinux -> util-linuxMinimal != null; # TODO: # * Make it build without python @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.64.5"; + version = "2.66.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04fczq693wivkqd2qxvvi3sncqgznsvzfiiwsll1rbayf795pgcw"; + sha256 = "1cdmyyycw2mf5s0f5sfd59q91223s4smcqi8n2fwrccwm5ji7wvr"; }; patches = optionals stdenv.isDarwin [ @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ optionals stdenv.isLinux [ libselinux - utillinuxMinimal # for libmount + util-linuxMinimal # for libmount ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Carbon Cocoa CoreFoundation CoreServices Foundation ]); @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { mesonFlags = [ # Avoid the need for gobject introspection binaries in PATH in cross-compiling case. # Instead we just copy them over from the native output. - "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}" + "-Dgtk_doc=${boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" "-Dnls=enabled" "-Ddevbindir=${placeholder ''dev''}/bin" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/common.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/common.nix index 3de840d4e3c6..630b6b82446a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -160,6 +160,10 @@ stdenv.mkDerivation ({ "libc_cv_as_needed=no" ] ++ lib.optional withGd "--with-gd"; + makeFlags = [ + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + ]; + installFlags = [ "sysconfdir=$(out)/etc" ]; outputs = [ "out" "bin" "dev" "static" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/globalarrays/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/globalarrays/default.nix index 423272fcd455..5f700f73515a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/globalarrays/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/globalarrays/default.nix @@ -3,7 +3,7 @@ } : let - version = "5.7.2"; + version = "5.8"; in stdenv.mkDerivation { pname = "globalarrays"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "GlobalArrays"; repo = "ga"; rev = "v${version}"; - sha256 = "0c1y9a5jpdw9nafzfmvjcln1xc2gklskaly0r1alm18ng9zng33i"; + sha256 = "0bky91ncz6vy0011ps9prsnq9f4a5s5xwr23kkmi39xzg0417mnd"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/glpk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/glpk/default.nix index 124e03baee19..d771f7df7892 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/glpk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/glpk/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { description = "The GNU Linear Programming Kit"; longDescription = @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/glpk/"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ bjg timokau ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ bjg ] ++ teams.sage.members; + platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gmp/6.x.nix index f4432cfc5b87..10e63f733a2d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gmp/6.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gmp/6.x.nix @@ -11,11 +11,11 @@ let inherit (stdenv.lib) optional; in let self = stdenv.mkDerivation rec { - name = "gmp-6.2.0"; + name = "gmp-6.2.1"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; - sha256 = "1sji8i9yjzfv5l2fsadpgjfyn452q6ab9zvm02k23ssd275rj77m"; + sha256 = "0z2ddfiwgi0xbf65z4fg4hqqzlhv0cc6hdcswf3c6n21xdmk5sga"; }; #outputs TODO: split $cxx due to libstdc++ dependency diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix index 7b254b922bcc..342cfcbc4da2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitLab -, pkgconfig +, pkg-config , vala , glib , meson @@ -18,7 +18,7 @@ , icu , glib-networking , libsoup -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_412 , gnome3 , gcr @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.36.0"; + version = "3.38.0"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "15j3xh93rqjphjw56j00g40m684nr4zy3hs7dsngm6a21l87fkfd"; + sha256 = "sha256-NRGab/CMJxe31rr20+5wYZF2rOzoSNdztfNVojBd5ag="; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -52,16 +52,16 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - dbus # used for checks and pkgconfig to install dbus service/s + dbus # used for checks and pkg-config to install dbus service/s docbook_xml_dtd_412 - docbook_xsl + docbook-xsl-nons gettext gobject-introspection gtk-doc libxslt meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gnutls/default.nix index 2436fc4afcb2..d3d50fd6d652 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -1,6 +1,6 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv -, unbound, dns-root-data, gettext, cacert, utillinux +, unbound, dns-root-data, gettext, cacert, util-linux , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring , withSecurity ? false, Security # darwin Security.framework @@ -75,7 +75,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ perl pkgconfig ] ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ] - ++ lib.optionals doCheck [ which nettools utillinux ]; + ++ lib.optionals doCheck [ which nettools util-linux ]; propagatedBuildInputs = [ nettle ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index 03b0d1767d9f..97b3ea9a8f10 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.64.1"; + version = "1.66.1"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"; + sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"; }; patches = [ @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { bison gtk-doc docbook-xsl-nons - docbook_xml_dtd_43 # FIXME: remove in next release docbook_xml_dtd_45 python3 setupHook # move .gir files @@ -91,6 +90,12 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; + # During configurePhase, two python scripts are generated and need this. See + # https://github.com/NixOS/nixpkgs/pull/98316#issuecomment-695785692 + postConfigure = '' + patchShebangs tools/* + ''; + preCheck = '' # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running tests, the library is not yet installed, diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix index 7eb69d075cab..7528925088e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -57,6 +57,7 @@ in stdenv.mkDerivation rec { license = with licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; - maintainers = with maintainers; [ andir flokli ]; + maintainers = with maintainers; [ ]; + broken = true; # Broken on Hydra since 2020-05-19 }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gpgme/default.nix index ed07d8ba0580..067d62a11a27 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - sha256 = "01s3rlspykbm9vmi5rfbdm3d20ip6yni69r48idqzlmhlq8ggwff"; + sha256 = "0nqfipv5s4npfidsm1rs3kpq0r0av9bfqfd5r035jibx5k0jniqb"; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix index 3dced2d62116..9073a501c09f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wyd3n5mn7b77hxylkc3f62v01mlavh96901pz342hwrn42ydqnx"; + sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6"; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/grilo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/grilo/default.nix index 12f069891e88..858e8d81fd42 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/grilo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/grilo/default.nix @@ -4,7 +4,7 @@ let pname = "grilo"; - version = "0.3.12"; # if you change minor, also change ./setup-hook.sh + version = "0.3.13"; # if you change minor, also change ./setup-hook.sh in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0w8sq5g6g1rg85h53vbll8va70fcp6082mlpmy98aa03444ddyyv"; + sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; }; setupHook = ./setup-hook.sh; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix index e7d1aa4bf92b..c41bd5ff5aa3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "1.32.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.34.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0v48h0j0gxcp9s63z1ibwgz4416qd6iq728la80y6gl8rklrqf0c"; + sha256 = "0kipk26kg2x06mrkhb74k8vk5cn4mr89kw1f9mb04n616wkxjyxy"; fetchSubmodules = true; }; patches = [ @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp libnsl ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ] + ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 6a94944e9f18..1032f15196cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -1,22 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection +{ stdenv +, fetchurl +, pkgconfig +, glib +, gobject-introspection , meson , ninja , python3 # just for passthru -, gnome3 }: +, gnome3 +}: stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.36.1"; + version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; - }; + nativeBuildInputs = [ + glib + meson + ninja + pkgconfig + python3 + ]; + + buildInputs = [ + glib + gobject-introspection + ]; + + postPatch = '' + chmod +x build-aux/meson/post-install.py + patchShebangs build-aux/meson/post-install.py + ''; # meson installs the schemas to share/glib-2.0/schemas # We add the override file there too so it will be compiled and later moved by @@ -32,16 +51,15 @@ stdenv.mkDerivation rec { EOF ''; - postPatch = '' - chmod +x build-aux/meson/post-install.py - patchShebangs build-aux/meson/post-install.py - ''; - - buildInputs = [ glib gobject-introspection ]; - - nativeBuildInputs = [ pkgconfig python3 meson ninja glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { + description = "Collection of GSettings schemas for settings shared by various components of a desktop"; + license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gsoap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gsoap/default.nix index fd9e327c1bc9..2614c50cca78 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gsoap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gsoap/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "gsoap"; - version = "${majorVersion}.53"; + version = "${majorVersion}.108"; src = fetchurl { url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip"; - sha256 = "0n35dh32gidi65c36cwjd91304pwiabfblvd64kg21djpjl06qcr"; + sha256 = "0x58bwlclk7frv03kg8bp0pm7zl784samvbzskrnr7dl5v866nvl"; }; buildInputs = [ openssl zlib ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gspell/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gspell/default.nix index 17e98b8e4092..37e54c825955 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -1,27 +1,50 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobject-introspection, gnome3 }: +{ stdenv +, fetchurl +, pkgconfig +, libxml2 +, glib +, gtk3 +, enchant2 +, icu +, vala +, gobject-introspection +, gnome3 +}: -let +stdenv.mkDerivation rec { pname = "gspell"; - version = "1.8.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.9.1"; outputs = [ "out" "dev" ]; outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1s1dns070pz8dg04ppshdbx1r86n9406vkxcfs8hdghn0bfi9ras"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw"; }; - propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig + nativeBuildInputs = [ + pkgconfig + vala + gobject-introspection + libxml2 + ]; - nativeBuildInputs = [ pkgconfig vala gobject-introspection libxml2 ]; - buildInputs = [ glib gtk3 isocodes ]; + buildInputs = [ + glib + gtk3 + icu + ]; + + propagatedBuildInputs = [ + # required for pkgconfig + enchant2 + ]; passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "none"; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 903ca661486f..c5edeb2021f5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -29,6 +29,7 @@ , libbs2b , libmodplug , mpeg2dec +, libmicrodns , openjpeg , libopus , librsvg @@ -65,6 +66,7 @@ , wayland-protocols , wildmidi , fluidsynth +, libva , libvdpau , wayland , libwebp @@ -87,41 +89,35 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.16.2"; + version = "1.18.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi"; + sha256 = "1cn18cbqyysrxnrk5bpxdzd5xcws9g2kmm5rbv00cx6rhn69g5f1"; }; patches = [ - # Fix build with neon 0.31 - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165 - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/f10b424418e448211e3427a76fcd046e157ef0b7.patch"; - sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p"; - }) ./fix_pkgconfig_includedir.patch - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235 - ./opencv-4.3.patch ]; nativeBuildInputs = [ meson ninja pkgconfig + orc # for orcc python3 gettext gobject-introspection ] ++ optionals stdenv.isLinux [ - wayland-protocols + wayland # for wayland-scanner ]; buildInputs = [ gst-plugins-base orc + gobject-introspection faad2 libass libkate @@ -130,6 +126,7 @@ in stdenv.mkDerivation rec { libbs2b libmodplug mpeg2dec + libmicrodns openjpeg libopus librsvg @@ -172,7 +169,9 @@ in stdenv.mkDerivation rec { faac ] ++ optionals stdenv.isLinux [ bluez + libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland + wayland-protocols ] ++ optionals (!stdenv.isDarwin) [ # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin @@ -215,11 +214,14 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + "-Davtp=disabled" "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" "-Dzbar=${if enableZbar then "enabled" else "disabled"}" "-Dfaac=${if faacSupport then "enabled" else "disabled"}" "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing + "-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support # As of writing, with `libmpcdec` in `buildInputs` we get # "Could not find libmpcdec header files, but Musepack was enabled via options" @@ -236,19 +238,19 @@ in stdenv.mkDerivation rec { "-Dopenni2=disabled" # not packaged in nixpkgs as of writing "-Dopensles=disabled" # not packaged in nixpkgs as of writing "-Dsctp=disabled" # required `usrsctp` library not packaged in nixpkgs as of writing + "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing "-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support + "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing - - # Requires CUDA and we haven't figured out how to make Meson find CUDA yet; - # it probably searches via pkgconfig, for which we have no .pc files, - # see https://github.com/NixOS/nixpkgs/issues/54395 - "-Dnvdec=disabled" - "-Dnvenc=disabled" + "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing + ] + ++ optionals (!stdenv.isLinux) [ + "-Dva=disabled" # see comment on `libva` in `buildInputs` ] ++ optionals stdenv.isDarwin [ "-Dbluez=disabled" @@ -263,6 +265,7 @@ in stdenv.mkDerivation rec { "-Ddvb=disabled" "-Dfbdev=disabled" "-Duvch264=disabled" # requires gudev + "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs "-Dwildmidi=disabled" # see dependencies above @@ -276,6 +279,14 @@ in stdenv.mkDerivation rec { "-Dapplemedia=disabled" ]; + # Argument list too long + strictDeps = true; + + postPatch = '' + patchShebangs \ + scripts/extract-release-date-from-doap-file.py + ''; + # This package has some `_("string literal")` string formats # that trip up clang with format security enabled. hardeningDisable = [ "format" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch deleted file mode 100644 index 55155d5c5e77..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build -index f38b55d..05b142e 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -65,7 +65,7 @@ if opencv_found - endif - endforeach - else -- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) -+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false) - opencv_found = opencv_dep.found() - if opencv_found - foreach h : libopencv4_headers diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 79405e5077e0..da3434a77cd2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -19,11 +19,9 @@ , libvisual , tremor # provides 'virbisidec' , libGL -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 , enableX11 ? stdenv.isLinux , libXv +, libXext , enableWayland ? stdenv.isLinux , wayland , wayland-protocols @@ -42,13 +40,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.16.2"; + version = "1.18.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi"; + sha256 = "0hf66sh8d4x2ksfnvaq2rqrrfq0vi0pv6wbh9i5jixrhvvbm99hv"; }; patches = [ @@ -66,9 +64,7 @@ stdenv.mkDerivation rec { gobject-introspection # docs - gtk-doc - docbook_xsl - docbook_xml_dtd_43 + # TODO add hotdoc here ] ++ lib.optional enableWayland wayland; buildInputs = [ @@ -89,6 +85,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableAlsa [ alsaLib ] ++ lib.optionals enableX11 [ + libXext libXv pango ] ++ lib.optionals enableWayland [ @@ -103,17 +100,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" - # We must currently disable gtk_doc API docs generation, - # because it is not compatible with some features being disabled. - # See for example - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/564 - # for it failing because some Wayland symbols are missing. - # This problem appeared between 1.15.1 and 1.16.0. - # In 1.18 they should switch to hotdoc, which should make this issue irrelevant. - "-Dgtk_doc=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" # TODO How to disable Wayland? @@ -125,7 +115,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs common/scangobj-merge.py + patchShebangs \ + common/scangobj-merge.py \ + scripts/extract-release-date-from-doap-file.py ''; # This package has some `_("string literal")` string formats diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index 9c4f3ee0251d..3ea0bd8903af 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , meson , ninja , pkgconfig @@ -16,34 +15,30 @@ , darwin , elfutils # for libdw , bash-completion -, docbook_xsl -, docbook_xml_dtd_43 -, gtk-doc , lib , CoreServices }: stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.16.2"; + version = "1.18.1"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ + "out" + "dev" + # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs, see: + # - https://github.com/NixOS/nixpkgs/pull/98767 + # - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551 + ]; outputBin = "dev"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73"; + sha256 = "1fpcpsw740svvdxvvwn0hly5i72miizm4s0mbid10ji83zi8vpvr"; }; patches = [ ./fix_pkgconfig_includedir.patch - - # Fix build with bash-completion 2.10 - # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/436 - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/commit/dd2ec3681e2d38e13e01477efa36e851650690fb.patch"; - sha256 = "07hwf67vndsibm1khvs4rfq30sbs9fss8k5vs502xc0kccbi1ih8"; - }) ]; nativeBuildInputs = [ @@ -60,9 +55,7 @@ stdenv.mkDerivation rec { bash-completion # documentation - gtk-doc - docbook_xsl - docbook_xml_dtd_43 + # TODO add hotdoc here ]; buildInputs = [ @@ -82,6 +75,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ] ++ lib.optionals stdenv.isDarwin [ # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. "-Dlibunwind=disabled" @@ -93,7 +87,8 @@ stdenv.mkDerivation rec { gst/parse/get_flex_version.py \ gst/parse/gen_grammar.py.in \ gst/parse/gen_lex.py.in \ - libs/gst/helpers/ptp_helper_post_install.sh + libs/gst/helpers/ptp_helper_post_install.sh \ + scripts/extract-release-date-from-doap-file.py ''; postInstall = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch index c388a82fa2a8..db1684269350 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch @@ -7,8 +7,10 @@ index edb0586c2..7ed46dfce 100644 pkgconf.set('prefix', join_paths(get_option('prefix'))) pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('libexecdir', '${prefix}/@0@'.format(get_option('libexecdir'))) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) +pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) +pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) pkgconf.set('GST_API_VERSION', apiversion) pkgconf.set('VERSION', gst_version) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index e7e11db61298..1fdd67d836e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -17,13 +17,13 @@ rec { gst-libav = callPackage ./libav { inherit gst-plugins-base; }; - gst-editing-services = callPackage ./ges { inherit gst-plugins-base; }; + gst-devtools = callPackage ./devtools { inherit gstreamer gst-plugins-base; }; + + gst-editing-services = callPackage ./ges { inherit gst-plugins-base gst-plugins-bad gst-devtools; }; gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; }; - gst-validate = callPackage ./validate { inherit gstreamer gst-plugins-base; }; - # note: gst-python is in ./python/default.nix - called under pythonPackages } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index 74e898481634..fe4c7005f603 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchurl +, meson +, ninja , pkgconfig , gstreamer , gst-plugins-base @@ -9,19 +11,32 @@ }: stdenv.mkDerivation rec { - pname = "gst-validate"; - version = "1.16.2"; + pname = "gst-devtools"; + version = "1.18.1"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1jpfrzg3yc6kp66bgq3jy14xsj3x71mk2zh0k16yf0326awwqqa8"; + sha256 = "1pxhg8n5nl34baq6mb07i27b33gaw47zrv5yalyj6f12pnx148ki"; }; - outputs = [ "out" "dev" ]; + patches = [ + ./fix_pkgconfig_includedir.patch + ]; + + outputs = [ + "out" + "dev" + # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs + ]; nativeBuildInputs = [ + meson + ninja pkgconfig gobject-introspection + + # documentation + # TODO add hotdoc here ]; buildInputs = [ @@ -34,6 +49,10 @@ stdenv.mkDerivation rec { gst-plugins-base ]; + mesonFlags = [ + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ]; + meta = with stdenv.lib; { description = "Integration testing infrastructure for the GStreamer framework"; homepage = "https://gstreamer.freedesktop.org"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch index f68ad603a37c..ff19c7cbf6f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch @@ -1,15 +1,15 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index b3bf0d4d4..3e6e576c0 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build +diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build +index a612b21b..c017eaff 100644 +--- a/validate/pkgconfig/meson.build ++++ b/validate/pkgconfig/meson.build @@ -2,8 +2,8 @@ pkgconf = configuration_data() - + pkgconf.set('prefix', get_option('prefix')) pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) +pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) +pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('GST_API_VERSION', apiversion) pkgconf.set('VERSION', gst_version) - + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index af2579d0594b..075b2059dbf9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,11 +1,13 @@ { stdenv , fetchurl -, fetchpatch , meson , ninja , pkgconfig , python3 +, bash-completion , gst-plugins-base +, gst-plugins-bad +, gst-devtools , libxml2 , flex , gettext @@ -13,14 +15,18 @@ }: stdenv.mkDerivation rec { - pname = "gstreamer-editing-services"; - version = "1.16.2"; + pname = "gst-editing-services"; + version = "1.18.1"; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs + ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "05hcf3prna8ajjnqd53221gj9syarrrjbgvjcbhicv0c38csc1hf"; + sha256 = "09rr5a198p1r9wcbsjl01xg6idkfkgj5h9x7xxywarb5i7qv6g79"; }; patches = [ @@ -33,26 +39,31 @@ stdenv.mkDerivation rec { pkgconfig gettext gobject-introspection + gst-devtools python3 flex + + # documentation + # TODO add hotdoc here ]; buildInputs = [ + bash-completion libxml2 ]; propagatedBuildInputs = [ gst-plugins-base + gst-plugins-bad ]; mesonFlags = [ - "-Dgtk_doc=disabled" + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ]; postPatch = '' - # for some reason, gst-plugins-bad cannot be found - # fortunately, they are only used by tests, which we do not run - sed -i -r -e 's/p(bad|good) = .*/p\1 = pbase/' tests/check/meson.build + patchShebangs \ + scripts/extract-release-date-from-doap-file.py ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 100d270673fc..99b00e6ca9d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , meson +, nasm , ninja , pkgconfig , python3 @@ -29,40 +30,45 @@ , mpg123 , twolame , gtkSupport ? false, gtk3 ? null +, raspiCameraSupport ? false, libraspberrypi ? null , enableJack ? true, libjack2 , libXdamage , libXext , libXfixes , ncurses +, wayland +, wayland-protocols , xorg , libgudev , wavpack }: assert gtkSupport -> gtk3 != null; +assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64); let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.16.2"; + version = "1.18.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0"; + sha256 = "0v329xi4qhlfh9aksfyviryqk9lclm4wj1lxrjnbdv4haldfj472"; }; - patches = [ ./fix_pkgconfig_includedir.patch ]; - nativeBuildInputs = [ pkgconfig python3 meson ninja gettext + nasm + ] ++ optionals stdenv.isLinux [ + wayland-protocols ]; buildInputs = [ @@ -91,6 +97,8 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXdamage wavpack + ] ++ optionals raspiCameraSupport [ + libraspberrypi ] ++ optionals gtkSupport [ # for gtksink gtk3 @@ -102,12 +110,14 @@ stdenv.mkDerivation rec { libavc1394 libiec61883 libgudev + wayland ] ++ optionals enableJack [ libjack2 ]; mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps ] ++ optionals (!gtkSupport) [ "-Dgtk3=disabled" @@ -122,8 +132,14 @@ stdenv.mkDerivation rec { "-Dv4l2=disabled" # Linux-only "-Dximagesrc=disabled" # Linux-only "-Dpulse=disabled" # TODO check if we can keep this enabled + ] ++ optionals (!raspiCameraSupport) [ + "-Drpicamsrc=disabled" ]; + postPatch = '' + patchShebangs \ + scripts/extract-release-date-from-doap-file.py + ''; NIX_LDFLAGS = [ # linking error on Darwin diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index e36eba370071..276352473917 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.16.2"; + version = "1.18.1"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967"; + sha256 = "1n1fkkbxxsndblnbm0c2ziqp967hrz5gag6z36xbpvqk4sy1g9rr"; }; outputs = [ "out" "dev" ]; @@ -37,6 +37,15 @@ stdenv.mkDerivation rec { libav ]; + mesonFlags = [ + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ]; + + postPatch = '' + patchShebangs \ + scripts/extract-release-date-from-doap-file.py + ''; + meta = with lib; { description = "FFmpeg/libav plugin for GStreamer"; homepage = "https://gstreamer.freedesktop.org"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 92e8a45a4f6f..87aca8a7cf90 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -3,6 +3,7 @@ , meson , ninja , pkgconfig +, python3 , gettext , gobject-introspection , gst-plugins-base @@ -11,14 +12,18 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.16.2"; + version = "1.18.1"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0vn23nxwvs96g7gcxw5zbnw23hkhky8a8r42wq68411vgf1s41yy"; + sha256 = "0m7p7sarvi6n9pz0rrl9k3gp3l5s42qs8z0165kyd6fiqdjjia0h"; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs + ]; patches = [ # To use split outputs, we need this so double prefix won't be used in the @@ -35,6 +40,10 @@ stdenv.mkDerivation rec { gettext gobject-introspection pkgconfig + python3 + + # documentation + # TODO add hotdoc here ]; buildInputs = [ @@ -44,8 +53,14 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ]; + postPatch = '' + patchShebangs \ + scripts/extract-release-date-from-doap-file.py + ''; + meta = with stdenv.lib; { description = "GStreamer RTSP server"; homepage = "https://gstreamer.freedesktop.org"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index d8c36fa40705..ab922f98808f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.16.2"; + version = "1.18.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m"; + sha256 = "09gpbykjchw3lb51ipxj53fy238gr9mg9jybcg5135pb56w6rk8q"; }; nativeBuildInputs = [ @@ -56,10 +56,15 @@ stdenv.mkDerivation rec { ]); mesonFlags = [ - "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing ]; + postPatch = '' + patchShebangs \ + scripts/extract-release-date-from-doap-file.py + ''; + meta = with lib; { description = "Gstreamer Ugly Plugins"; homepage = "https://gstreamer.freedesktop.org"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index cac56f64cc91..a1a6223798fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -16,25 +16,32 @@ , gst-plugins-bad , nasm , libvpx -, python +, python3 }: stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.16.2"; + version = "1.18.1"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "00f6sx700qm1ximi1ag2c27m35dywwhhg6awhz85va34mfqff78r"; + sha256 = "1sm6x2qa7ng78w0w8q4mjs7pbpbbk8qkfgzhdmbb8l0bh513q3a0"; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs + ]; nativeBuildInputs = [ meson ninja pkgconfig bzip2 + + # documentation + # TODO add hotdoc here ]; buildInputs = [ @@ -55,13 +62,19 @@ stdenv.mkDerivation rec { libGLU nasm libvpx - python + python3 ]; mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ]; + postPatch = '' + patchShebangs \ + scripts/extract-release-date-from-doap-file.py + ''; + meta = with stdenv.lib; { description = "Set of VAAPI GStreamer Plug-ins"; homepage = "https://gstreamer.freedesktop.org"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix index 62234651aa93..4e8ce95737d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, ninja, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "gtest"; @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { patches = [ ./fix-cmake-config-includedir.patch + (fetchpatch { + name = "fix-pkgconfig-paths.patch"; + url = "https://github.com/google/googletest/commit/5126ff48d9ac54828d1947d1423a5ef2a8efee3b.patch"; + sha256 = "sha256-TBvECU/9nuvwjsCjWJP2b6DNy+FYnHIFZeuVW7g++JE="; + }) ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index 14f822432ee3..87f9698bec0a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.2.0"; + version = "0.5.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg"; + sha256 = "1yfqfv3hn92cy9y5zgvz7qhq2ypill2z5857ki5snjimhjdz0cnw"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 09cb016dbb6a..be5f8521f9c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -13,10 +13,11 @@ assert cupsSupport -> cups != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "gtk+-2.24.32"; + pname = "gtk+"; + version = "2.24.32"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; + url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz"; sha256 = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index bf78d15d39c6..aee846ccfcd0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -25,10 +25,13 @@ , epoxy , json-glib , libxkbcommon +, libxml2 , gmp , gnome3 , gsettings-desktop-schemas , sassc +, trackerSupport ? stdenv.isLinux +, tracker , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux , mesa @@ -48,7 +51,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.21"; + version = "3.24.23"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +63,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "0llgq2adzn9p3bfq9rv2dhscmvzs35jp3glrfvy3vs1mrpknmsmf"; + sha256 = "1cg2vbwbcp7bc84ky0b69ipgdr9djhspnf5k8lajb8jphcj4v1jx"; }; patches = [ @@ -71,8 +74,8 @@ stdenv.mkDerivation rec { sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # Fix path handling in pkg-config - # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1793 + # Fix path handling in pkg-config. MR for the gtk-3-24 branch: + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2605 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch"; sha256 = "0rd1kjh0m4mrj2hkcqlsq1j0d6ahn5c237fd211r158gd1jiwys0"; @@ -90,6 +93,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=${boolToString withGtkDoc}" "-Dtests=false" + "-Dtracker3=${boolToString trackerSupport}" ]; # These are the defines that'd you'd get with --enable-debug=minimum (default). @@ -97,11 +101,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' - # TODO: Remove in 3.24.21 - # https://gitlab.gnome.org/GNOME/gtk/issues/2669 - echo "${stdenv.shell}" > check-version.py - chmod +x check-version.py - files=( build-aux/meson/post-install.py demos/gtk-demo/geninclude.py @@ -130,6 +129,8 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 docbook_xsl gtk-doc + # For xmllint + libxml2 ]; buildInputs = [ @@ -139,6 +140,7 @@ stdenv.mkDerivation rec { isocodes ] ++ optional stdenv.isDarwin AppKit + ++ optional trackerSupport tracker ; propagatedBuildInputs = with xorg; [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index d882d3b1a6c1..d32a0eebf137 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala -, libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: +, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { pname = "gtksourceview"; @@ -42,13 +42,6 @@ stdenv.mkDerivation rec { make check ''; - passthru = { - updateScript = gnome3.updateScript { - packageName = "gtksourceview"; - attrPath = "gtksourceview3"; - }; - }; - meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index 565b7f782d57..2041e83fb0c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.6.1"; + version = "4.8.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0x7q9lwgrc4kkciy7vgwd80v2ji7plyqiqbvkvx2yqarmfkqgx33"; + sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880"; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gumbo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gumbo/default.nix index 9acc48ae0b85..e8035d8b1cf9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gumbo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gumbo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "C99 HTML parsing algorithm"; homepage = "https://github.com/google/gumbo-parser"; maintainers = [ maintainers.nico202 ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; license = licenses.asl20; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gusb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gusb/default.nix index 204c9d8dd743..a2e157691459 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -1,20 +1,26 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection -, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44 +, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 , glib, systemd, libusb1, vala, hwdata }: + +let + pythonEnv = python3.withPackages(ps: with ps; [ + setuptools + ]); +in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.3.3"; + version = "0.3.5"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "14pbd0812151ga7jrpzi88fcrwkckx6m07ay84l7dzkxbdc44fgr"; + sha256 = "1pv5ivbwxb9anq2j34i68r8fgs8nwsi4hmss7h9v1i3wk7300ajv"; }; nativeBuildInputs = [ - meson ninja pkgconfig gettext + meson ninja pkgconfig gettext pythonEnv gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 gobject-introspection vala ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gvfs/default.nix index cff6569be50b..f79ffa579c87 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.44.1"; + version = "1.46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ipv0jgzim6glsgizmfjkx0m3gd1l9lr242m0jj6cdmhs52k5vsh"; + sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 8110f13d14ca..6c5703f521d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.7.1"; + version = "2.7.2"; inherit (stdenv.lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "172jmwp666xbs6yy1pc2495gnkz8xw11b8zkz3j19jxlvvp4mxcs"; + sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/herqq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/herqq/default.nix index 8dc0df3a9f2f..265289f06f38 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/herqq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/herqq/default.nix @@ -1,25 +1,26 @@ -{ stdenv, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: +{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: -stdenv.mkDerivation rec { - version = "2.1.0"; +mkDerivation rec { + version = "unstable-20-06-26"; pname = "herqq"; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase unzip qtmultimedia ]; - preConfigure = "cd herqq"; + outputs = [ "out" "dev" ]; + + sourceRoot = "source/herqq"; src = fetchFromGitHub { owner = "ThomArmax"; repo = "HUPnP"; - rev = version; - sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m"; + rev = "c8385a8846b52def7058ae3794249d6b566a41fc"; + sha256 = "FxN/QlLB3sZ6Vn/9VIKNUntX/B4+crQZ7t760pwFqY8="; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://herqq.org"; description = "A software library for building UPnP devices and control points"; platforms = platforms.linux; maintainers = [ ]; - broken = true; # 2018-09-21, built with qt510 (which was removed) but neither qt59 nor qt511 }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/hidapi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/hidapi/default.nix index 11cdd0ab7e0c..c42a35282233 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/hidapi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/hidapi/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb1 +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1 , darwin }: stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i"; + sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 systemd ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ]; enableParallelBuilding = true; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for communicating with USB and Bluetooth HID devices"; homepage = "https://github.com/libusb/hidapi"; + maintainers = with maintainers; [ prusnak ]; # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal) license = licenses.bsd3; platforms = platforms.unix; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/hpx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/hpx/default.nix index b6d6b6887525..ba7da8f5b774 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "10hgjavhvn33y3k5j3l1326x13bxffghg2arxjrh7i7zd3qprfv5"; + sha256 = "1ld2k00500p107jarw379hsd1nlnm33972nv9c3ssfq619bj01c9"; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/hyperscan/default.nix index 6e0d351b8bc8..17246f0aa0a9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/hyperscan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/hyperscan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, ragel, python3 -, coreutils, gnused, utillinux +, coreutils, gnused, util-linux , boost , withStatic ? false # build only shared libs by default, build static+shared if true }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cmake ragel python3 # Consider simply using busybox for these # Need at least: rev, sed, cut, nm - coreutils gnused utillinux + coreutils gnused util-linux ]; cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/hyphen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/hyphen/default.nix index 9f30ff54823f..9251b2853f1c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/hyphen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/hyphen/default.nix @@ -22,6 +22,6 @@ in stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/hunspell/files/Hyphen/"; platforms = platforms.all; license = with licenses; [ gpl2 lgpl21 mpl11 ]; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/icu/base.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/icu/base.nix index 81f75ad526a7..d8e9bd16ab89 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/icu/base.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/icu/base.nix @@ -57,7 +57,7 @@ let # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; # remove dependency on bootstrap-tools in early stdenv build postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/igraph/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/igraph/default.nix index 6a55359e168b..6019a69f3524 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "015yh9s19lmxm7l1ld8adlsqh1lrmzicl801saixdwl9w05hfva4"; + sha256 = "159qd4al19k1i5a54m2q2mxvig4z2lz9h3rd5rq44bklybdc0i7j"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/incrtcl/default.nix index 614a8f048aa5..c08d5924b0c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/incrtcl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/incrtcl/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { postInstall = '' rmdir $out/bin mv $out/lib/itcl${version}/* $out/lib + ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ + $out/lib/libitcl${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} rmdir $out/lib/itcl${version} ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/default.nix index fadd2657b688..1635827340e2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchFromGitHub , cmake , cfitsio , libusb1 @@ -9,14 +9,18 @@ , curl , libjpeg , gsl +, fftw }: -stdenv.mkDerivation { - name = "indilib-1.1.0"; +stdenv.mkDerivation rec { + pname = "indilib"; + version = "1.8.7"; - src = fetchurl { - url = "mirror://sourceforge/indi/libindi_1.1.0.tar.gz"; - sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; + src = fetchFromGitHub { + owner = "indilib"; + repo = "indi"; + rev = "v${version}"; + sha256 = "0cy9l1vpsnfilxslvmn88hhq8iw8cnx3xpbnl78c0dgjyfv5xmhz"; }; patches = [ @@ -36,12 +40,14 @@ stdenv.mkDerivation { libnova libjpeg gsl + fftw ]; - meta = { + meta = with stdenv.lib; { homepage = "https://www.indilib.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - description = "Implementaion of the INDI protocol for POSIX operating systems"; - platforms = stdenv.lib.platforms.unix; + description = "Implementation of the INDI protocol for POSIX operating systems"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ hjones2199 ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch index 0f497419e706..701680012914 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch @@ -1,12 +1,11 @@ -diff -Naur libindi-1.0.0-upstream/CMakeLists.txt libindi-1.0.0/CMakeLists.txt ---- libindi-1.0.0-upstream/CMakeLists.txt 2015-03-28 21:06:49.576863460 -0430 -+++ libindi-1.0.0/CMakeLists.txt 2015-03-28 21:07:48.420677548 -0430 -@@ -28,7 +28,7 @@ - ## the following are directories where stuff will be installed to
- set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/")
- set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/")
--set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
-+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
-
- ################## Includes ################################
- Include (CheckCXXSourceCompiles)
+--- indi-1.8.6/CMakeLists.txt 2020-08-21 05:56:59.000000000 -0500 ++++ CMakeLists.txt 2020-11-01 12:50:57.621293870 -0600 +@@ -77,7 +77,7 @@ + ## the following are directories where stuff will be installed to + set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") + set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") +-set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") ++set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") + + set(PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 89305baaee80..8d9a323fa497 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.2.5"; + version = "20.3.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "0jg3kc74iqmbclx77a6dp4h85va8wi210x4zf5jypiq35c57r8hh"; + sha256 = "1diq1gqpfv5bawvag6bzwnd3ilhacwmwx3bl67abjvbb0m3jw4lk"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index c43787c29dd0..43dbe6765699 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.2.0"; + version = "20.4.2"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "02a9wm7cz0nkpyfwic4a0dfm9bx1d2sybgh5rv0c618pl41mla33"; + sha256 = "1nz0f2chfm3rr8aggb7md0cmikwpd9159ql1rc59208nvl2fshrb"; }; cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 90f6b4d49b84..71e6d3d700ab 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11 +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11 , libXau, libXdmcp, libpthreadstubs }: stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.2.1"; + version = "20.4.1"; - src = fetchurl { - url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; - sha256 = "0m3ipfdknpgrdwiywlinl4sfkfrvyv7wmq1j83pmbr54z067sgg1"; + src = fetchFromGitHub { + owner = "Intel-Media-SDK"; + repo = "MediaSDK"; + rev = "intel-mediasdk-${version}"; + sha256 = "0qnq43qjcmzkn6v2aymzi3kycndk9xw6m5f5g5sz5x53nz556bp0"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/itktcl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/itktcl/default.nix index 36503fc1add9..3c70369eb91e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/itktcl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/itktcl/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { postInstall = '' rmdir $out/bin mv $out/lib/itk${version}/* $out/lib + ln -s libitk${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ + $out/lib/libitk${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} rmdir $out/lib/itk${version} ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix index c545ad68e727..10587a72ecda 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.6"; + version = "2.8.0"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn"; + sha256 = "02c54cjf3sdwbc9rcgg3xkx1f3yk8p5iv3iwvq78f5vfxsj53lkk"; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index 5928d99b6c24..5a1210036056 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.18.12"; + name = "lombok-1.18.16"; src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "01jl6i5wzjxyk36fcq6ji90x9h143gvnwhv86cbkqaxhxh41af29"; + sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj"; }; buildCommand = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix index a6eb56423954..4004c9f387ef 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jbig2dec"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/${pname}-${version}.tar.gz"; - sha256 = "0pigfw2v0ppvr0lbysm69gx0zsa5q2q92yrb8af2j3im6x97f6cy"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz"; + sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/json-c/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/json-c/default.nix index 164f7c44ba9d..d72d50214348 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/json-c/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/json-c/default.nix @@ -1,21 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, cmake }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "json-c-0.14"; + pname = "json-c"; + version = "0.15"; + src = fetchurl { - url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz"; - sha256 = "1yia8417qljmczs9w3rn4c4i2p2iywq098pgrj11s81599j4x4cr"; + url = "https://s3.amazonaws.com/json-c_releases/releases/${pname}-${version}.tar.gz"; + sha256 = "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q"; }; - patches = [ - # https://nvd.nist.gov/vuln/detail/CVE-2020-12762 - (fetchpatch { - name = "CVE-2020-12762.patch"; - url = "https://github.com/json-c/json-c/commit/5d6fa331418d49f1bd488553fd1cfa9ab023fabb.patch"; - sha256 = "0aar7kgbycqxnhh0lrr61adfbb903nbapalhs5i6h8anxwy1ylcm"; - }) - ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/json-glib/default.nix index 4ae4a71091e4..f89d4bc45341 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 5e361a09d357..73aaaec4e4c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "jsoncpp"; - version = "1.9.2"; + version = "1.9.4"; + + outputs = ["out" "dev"]; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; + sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; /* During darwin bootstrap, we have a cp that doesn't understand the @@ -23,30 +25,17 @@ stdenv.mkDerivation rec { # Hack to be able to run the test, broken because we use # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="`pwd`/src/lib_json''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + export DYLD_LIBRARY_PATH="$PWD/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" '' else '' - export LD_LIBRARY_PATH="`pwd`/src/lib_json''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; nativeBuildInputs = [ cmake python validatePkgConfig ]; - patches = [ - # Fix generation of pkg-config file (https://github.com/open-source-parsers/jsoncpp/pull/1199) - (fetchpatch { - url = "https://github.com/open-source-parsers/jsoncpp/commit/b05a21342a646a986b11c28ba6b19665756d21d2.patch"; - sha256 = "0dn4cvvkcp9mnxbzyaqb49z6bv5yqsx1wlf1lyki1n2rni2hn63p"; - }) - ] ++ stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ - # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 - (fetchpatch { - url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch"; - sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5"; - }) - ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix index b641a5473023..61f357689c4d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.34.0"; + version = "3.38.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j05x4xv2cp3cbmp30m68z8g4rdw7b030ip4wszyfj9ya15v5kni"; + sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI="; }; mesonFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/kdiagram/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/kdiagram/default.nix index 50f3e6a6c025..b9f16d3cfaef 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kdiagram/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kdiagram/default.nix @@ -1,14 +1,18 @@ { - mkDerivation, fetchurl, lib, + mkDerivation, fetchFromGitLab, lib, extra-cmake-modules, qttools, qtbase, qtsvg, }: -mkDerivation { - name = "kdiagram-2.6.0"; - src = fetchurl { - url = "https://download.kde.org/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz"; - sha256 = "10hqk12wwgbiq4q5145s8v7v96j621ckq1yil9s4pihmgsnqsy02"; +mkDerivation rec { + pname = "kdiagram"; + version = "2.7.0"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "graphics"; + repo = pname; + rev = "v${version}"; + sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc="; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtbase qtsvg ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/kdsoap/default.nix index dde2e5cb1a77..50ba2c300b3f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kdsoap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kdsoap/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.9.0"; + version = "1.9.1"; in mkDerivation { @@ -24,7 +24,7 @@ mkDerivation { }; src = fetchurl { url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "0a28k48cmagqxhaayyrqnxsx1zbvw4f06dgs16kl33xhbinn5fg3"; + sha256 = "09rxx7h98niawz7i94g279c2rgh7xmq1hqxwlyzwsaqsx4kfl850"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/keystone/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/keystone/default.nix new file mode 100644 index 000000000000..dc83209c1479 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/keystone/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, cmake +, python3 +}: + +stdenv.mkDerivation rec { + pname = "keystone"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "keystone-engine"; + repo = pname; + rev = version; + sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa"; + }; + + nativeBuildInputs = [ + pkg-config + cmake + python3 + ]; + + meta = with stdenv.lib; { + description = "Lightweight multi-platform, multi-architecture assembler framework"; + homepage = "https://www.keystone-engine.org"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/kpeoplevcard/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/kpeoplevcard/default.nix index c405532e4363..d2244a252347 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kpeoplevcard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kpeoplevcard/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { meta = with lib; { description = "Pulseaudio bindings for Qt"; - homepage = "KPeople VCard Support"; + homepage = "https://github.com/KDE/kpeoplevcard"; license = with licenses; [ lgpl2 ]; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/kpmcore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/kpmcore/default.nix index 7903fc746390..1c00b6be2f20 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kpmcore/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kpmcore/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, extra-cmake-modules -, qtbase, kdeFrameworks +, qtbase, kio , libatasmart, parted -, utillinux }: +, util-linux }: stdenv.mkDerivation rec { pname = "kpmcore"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { libatasmart parted # we only need the library - kdeFrameworks.kio + kio - utillinux # needs blkid (note that this is not provided by utillinux-compat) + util-linux # needs blkid (note that this is not provided by util-linux-compat) ]; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/lcms2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/lcms2/default.nix index 0cf622858900..6e81dfc0718a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/lcms2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/lcms2/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libtiff libjpeg zlib ]; + # See https://trac.macports.org/ticket/60656 + LDFLAGS = if stdenv.hostPlatform.isDarwin then "-Wl,-w" else null; + meta = with stdenv.lib; { description = "Color management engine"; homepage = "http://www.littlecms.com/"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ldutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ldutils/default.nix index 6d7745b0e32c..5f09c08d4d1e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ldutils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ldutils/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitLab -, qtbase , qtcharts , qtsvg , qmake @@ -9,17 +8,16 @@ mkDerivation rec { pname = "ldutils"; - version = "1.01"; + version = "1.03"; src = fetchFromGitLab { owner = "ldutils-projects"; repo = pname; rev = "v_${version}"; - sha256 = "09k2d5wj70xfr3sb4s9ajczq0lh65705pggs54zqqqjxazivbmgk"; + sha256 = "0pi05py71hh5vlhl0kjh9wxmd7yixw10s0kr2wb4l4c0abqxr82j"; }; buildInputs = [ - qtbase qtcharts qtsvg ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 4623e5ca70ef..a1de88ef1ca4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.1"; + version = "1.12.3"; src = fetchFromGitHub { - sha256 = "1mgd7jqfg6f0y2yrh2m1njlwrpd15kas88776jdd5fsl7gvb5khn"; + sha256 = "1mhj29n40z7bvn1ns61wf8812ikm2mpc0d5ip0ha920z0anzqhwr"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/leveldb/default.nix index 33eca603c267..14d426701ba3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/leveldb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/leveldb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; nativeBuildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildPhase = '' make all diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/lib3mf/default.nix index 5d1894da5799..10732a14e488 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/lib3mf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/lib3mf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lib3mf"; - version = "1.8.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = pname; rev = "v${version}"; - sha256 = "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd"; + sha256 = "0w4d9zvl95g1x3r5nyd6cr27g6fwhhwaivh8a5r1xs5l6if21x19"; }; nativeBuildInputs = [ cmake ninja ]; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]; postPatch = '' - rmdir UnitTests/googletest - ln -s ${gtest.src} UnitTests/googletest + rmdir Tests/googletest + ln -s ${gtest.src} Tests/googletest # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libLAS/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libLAS/default.nix index 95569c0a8132..27db14e71660 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libLAS/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libLAS/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ]; cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix index 885338793f1e..eca7170bfff2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.1.7"; + version = "4.3.10"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "16xgl0yqzqkqfrz7x9rbbv8rj5rg5jlz4a7apj9igqb58q0w362x"; + sha256 = "0yy6sq4rvv9c0f09vljnqx92zvr39bn1spl735hzn6253d7fm3a5"; }; buildInputs = [ openssl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libarchive/default.nix index d1917de37d6a..3c97ce21ce07 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -2,8 +2,10 @@ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, - # Optional but increases closure only negligibly. - xarSupport ? true, + # Optional but increases closure only negligibly. Also, while libxml2 + # builds fine on windows, but libarchive has trouble linking windows + # things it depends on for some reason. + xarSupport ? stdenv.hostPlatform.isUnix, }: assert xarSupport -> libxml2 != null; @@ -22,7 +24,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ sharutils zlib bzip2 openssl xz lzo zstd ] + buildInputs = + stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils + ++ [ zlib bzip2 openssl xz lzo zstd ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] ++ stdenv.lib.optional xarSupport libxml2; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libargon2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libargon2/default.nix index 9bf05a679cc0..f559c10456bb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libargon2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libargon2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch }: +{ stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libargon2"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; }; + nativeBuildInputs = [ fixDarwinDylibNames ]; + patches = [ # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released (fetchpatch { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix index 508a57b203d2..9d8cf7434c23 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, pkgconfig, yasm -, freetype, fribidi +, freetype, fribidi, harfbuzz , encaSupport ? true, enca ? null # enca support , fontconfigSupport ? true, fontconfig ? null # fontconfig support -, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support , rasterizerSupport ? false # Internal rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer , libiconv @@ -10,7 +9,6 @@ assert encaSupport -> enca != null; assert fontconfigSupport -> fontconfig != null; -assert harfbuzzSupport -> harfbuzz != null; let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; @@ -19,27 +17,25 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libass"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8"; + sha256 = "0cz8v6kh3f2j5rdjrra2z0h715fa16vjm7kambvqx9hak86262cz"; }; configureFlags = [ (mkFlag encaSupport "enca") (mkFlag fontconfigSupport "fontconfig") - (mkFlag harfbuzzSupport "harfbuzz") (mkFlag rasterizerSupport "rasterizer") (mkFlag largeTilesSupport "large-tiles") ]; nativeBuildInputs = [ pkgconfig yasm ]; - buildInputs = [ freetype fribidi ] + buildInputs = [ freetype fribidi harfbuzz ] ++ optional encaSupport enca ++ optional fontconfigSupport fontconfig - ++ optional harfbuzzSupport harfbuzz ++ optional stdenv.isDarwin libiconv; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libassuan/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libassuan/default.nix index e92db2ab87ee..aa798668f8ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libassuan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libassuan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libassuan"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i"; + sha256 = "1w7vnnycq4z7gf4bk38pi4hrb8qrrzgfpz3cd7frwldxnfbfx060"; }; outputs = [ "out" "dev" "info" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libavif/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libavif/default.nix index 7b6d1ecfbb27..25422c8b7d90 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libavif/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libavif/default.nix @@ -11,21 +11,22 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "1fs222cn1d60pv5fjsr92axk5dival70b6yqw0wng5ikk9zsdkhy"; + sha256 = "1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d"; }; # reco: encode libaom slowest but best, decode dav1d fastest cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DAVIF_CODEC_AOM=ON" - "-DAVIF_CODEC_DAV1D=ON" + "-DAVIF_CODEC_AOM=ON" # best encoder (slow but small) + "-DAVIF_CODEC_DAV1D=ON" # best decoder (fast) + "-DAVIF_CODEC_AOM_DECODE=OFF" "-DAVIF_BUILD_APPS=ON" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libbfd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libbfd/default.nix index 75db780b7bb6..e622cc6be687 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libbfd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libbfd/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = binutils-unwrapped.patches ++ [ - ../../tools/misc/binutils/build-components-separately.patch + (binutils-unwrapped.patchesDir + "/build-components-separately.patch") (fetchpatch { url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index 7628212800f4..39646db87ecd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted -, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key +, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive , thin-provisioning-tools, makeWrapper }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid utillinux libbytesize + glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid util-linux libbytesize libndctl nss volume_key libyaml ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libbluray/default.nix index 7bfd9a8a2d02..a00e2272d668 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - sha256 = "04bcd53ml0zn8b4f9r1grs0yy20rcirji1v3pxzaf4i5zl3flhfd"; + sha256 = "1v1nmq631j0prih7pjl01ixhhwgrkjpxrjmmc342rsl8g4zyh8sj"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libburn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libburn/default.nix index f436f947d0a9..42c680835f14 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libburn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.2"; + version = "1.5.2.pl01"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "09sjrvq8xsj1gnl2wwyv4lbmicyzzl6x1ac2rrn53xnp34bxnckv"; + sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcbor/default.nix index 9b6a54d92f97..ae5154eac034 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcbor/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcbor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcbor"; - version = "unstable-2019-07-25"; + version = "0.8.0"; src = fetchFromGitHub { owner = "PJK"; repo = pname; - rev = "82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6"; - sha256 = "01hy7n21gxz4gp3gdwm2ywz822p415bj2k9ccxgwz3plvncs4xa1"; + rev = "v${version}"; + sha256 = "01dv4vxcmbvpphqy16vqiwh25wx11x630js5wfnx7cryarsh9ld7"; }; nativeBuildInputs = [ cmake ]; @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - NIX_CFLAGS_COMPILE = "-fno-lto"; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ]; meta = with stdenv.lib; { description = "CBOR protocol implementation for C and others"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcec/default.nix index a1c2967dde73..792d899333e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }: -let version = "4.0.5"; in +let version = "4.0.7"; in stdenv.mkDerivation { pname = "libcec"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0hvp33mq0kg544hw20aq3vy5lxf5zid6gxm3qdga7wxw1r1lkmz4"; + sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcef/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcef/default.nix index 4d08c2ba1fb3..93aaebc110e2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "74.1.14-g50c3c5c"; + version = "75.1.14-gc81164e"; src = fetchurl { - name = "cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131_linux64_minimal.tar.bz2"; - url = "http://opensource.spotify.com/cefbuilds/cef_binary_74.1.19%2Bgb62bacf%2Bchromium-74.0.3729.157_linux64_minimal.tar.bz2"; - sha256 = "0v3540kq4y68gq7mb4d8a9issm363lm5ngrd6d96pcc7vckkw4wn"; + name = "cef_binary_75.1.14+gc81164e+chromium-75.0.3770.100_linux64_minimal.tar.bz2"; + url = "http://opensource.spotify.com/cefbuilds/cef_binary_75.1.14%2Bgc81164e%2Bchromium-75.0.3770.100_linux64_minimal.tar.bz2"; + sha256 = "0985b2bx505j0q693hifjgidzb597wqf5idql5aqxs8lfxhc2pgg"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcint/default.nix index b7dd32a056c4..8415b964bb99 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.0.2"; + version = "4.0.6"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "0j8fkkp3vb1936qy80sc08c327b47qxh0x2aadd1225jjq6xqxmn"; + sha256 = "1bgzsyz1i0hvla5ax0lawp1kw25fkhzh9ddhq92mplizrj9y05c1"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libconfuse/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libconfuse/default.nix index cfef09c480a2..b7afe5ed03af 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libconfuse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libconfuse/default.nix @@ -2,15 +2,21 @@ stdenv.mkDerivation rec { pname = "libconfuse"; - version = "3.2.2"; + version = "3.3"; src = fetchFromGitHub { - sha256 = "0djjq7j9iiyqxqqrlzm476xkibjasqvgzjwkalgj1l3f2smi53aw"; + sha256 = "1npfk5jv59kk4n8pkyx89fn9s6p8x3gbffs42jaw24frgxfgp8ca"; rev = "v${version}"; repo = "libconfuse"; owner = "martinh"; }; + postPatch = '' + substituteInPlace tests/Makefile.am \ + --replace 'TESTS += empty_string' "" \ + --replace 'TESTS += print_filter' "" + ''; + nativeBuildInputs = [ autoreconfHook flex ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcork/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcork/default.nix new file mode 100644 index 000000000000..3875ff91185a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcork/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, cmake +, lib +, pkg-config +, check +}: +stdenv.mkDerivation rec { + pname = "libcork"; + version = "1.0.0--rc3"; + + src = fetchFromGitHub { + owner = "dcreager"; + repo = pname; + rev = version; + sha256 = "152gqnmr6wfmflf5l6447am4clmg3p69pvy3iw7yhaawjqa797sk"; + }; + + # N.B. We need to create this file, otherwise it tries to use git to + # determine the package version, which we do not want. + # + # N.B. We disable tests by force, since their build is broken. + postPatch = '' + echo "${version}" > .version-stamp + echo "${version}" > .commit-stamp + sed -i '/add_subdirectory(tests)/d' ./CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ check ]; + + doCheck = false; + + postInstall = '' + ln -s $out/lib/libcork.so $out/lib/libcork.so.1 + ''; + + meta = with lib; { + homepage = "https://github.com/dcreager/libcork"; + description = "A simple, easily embeddable cross-platform C library"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdatrie/default.nix new file mode 100644 index 000000000000..0d3faf69e3b7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdatrie/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libiconv }: + +stdenv.mkDerivation rec { + pname = "libdatrie"; + version = "0.2.12"; + + src = fetchurl { + url = "https://github.com/tlwg/libdatrie/releases/download/v${version}/libdatrie-${version}.tar.xz"; + sha256 = "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5"; + }; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + + postInstall = '' + installManPage man/trietool.1 + ''; + + meta = with stdenv.lib;{ + homepage = "https://linux.thai.net/~thep/datrie/datrie.html"; + description = "This is an implementation of double-array structure for representing trie"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index 5351b2c9fcbd..6c430682251f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.36.0"; + version = "3.38.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0n6r16a07in82cnzw91vl675pbjzbvazkxwbqxq2kihganzipcw2"; + sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libde265/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libde265/default.nix index 9d88a61ad10f..6c2f3b8e1071 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.0.8"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "v${version}"; - sha256 = "0x7g9771457z49qvzpk4iswfhq018i0mzsflv9gg8if5hjqhfdp0"; + sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdeflate/default.nix index 25fa4db38f6b..f0bf60cdfb88 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdeflate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdeflate/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "1rhichmalqz7p1hiwvn6y0isralpbf0w5nyjp4lg0asawkxy9cww"; + sha256 = "1hnn1yd9s5h92xs72y73izak47kdz070kxkw3kyz2d3az6brfdgh"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdevil/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdevil/default.nix index 132e1d1dbf55..5d00d6b01ff3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdevil/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdevil/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ( fetchurl { - url = "http://patch-tracker.debian.org/patch/series/dl/devil/1.7.8-6.1/03_CVE-2009-3994.diff"; + url = "https://sources.debian.org/data/main/d/devil/1.7.8-10/debian/patches/03_CVE-2009-3994.diff"; sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; } ) ./ftbfs-libpng15.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 940093ed4ba4..d966631dc276 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.3"; + version = "3.14.4"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "1hq1q2frqnm4wxcfr7vn8kqwyfdz3hx22w40kn69zh140pig6jc5"; + sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l"; }; nativeBuildInputs = [ cmake pkgconfig xxd ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdrm/default.nix index 328c85830fbf..b9825d9cfdff 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.102"; + version = "2.4.103"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0nx0bd9dhymdsd99v4ifib77yjirkvkxf5hzdkbr7qr8dhrzkjwb"; + sha256 = "08h2nnf4w96b4ql7485mvjgbbsb8rwc0qa93fdm1cq34pbyszq1z"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libe57format/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libe57format/default.nix index 6bb48c9530c8..137c73990f6a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libe57format/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libe57format/default.nix @@ -5,6 +5,9 @@ boost, xercesc, icu, + + dos2unix, + fetchpatch, }: stdenv.mkDerivation rec { @@ -25,9 +28,39 @@ stdenv.mkDerivation rec { buildInputs = [ boost icu + ]; + + propagatedBuildInputs = [ + # Necessary for projects that try to find libE57Format via CMake + # due to the way that libe57format's CMake config is written. xercesc ]; + # TODO: Remove CMake patching when https://github.com/asmaloney/libE57Format/pull/60 is available. + + # GNU patch cannot patch `CMakeLists.txt` that has CRLF endings, + # see https://unix.stackexchange.com/questions/239364/how-to-fix-hunk-1-failed-at-1-different-line-endings-message/243748#243748 + # so convert it first. + prePatch = '' + ${dos2unix}/bin/dos2unix CMakeLists.txt + ''; + patches = [ + (fetchpatch { + name = "libE57Format-cmake-Fix-config-filename.patch"; + url = "https://github.com/asmaloney/libE57Format/commit/279d8d6b60ee65fb276cdbeed74ac58770a286f9.patch"; + sha256 = "0fbf92hs1c7yl169i7zlbaj9yhrd1yg3pjf0wsqjlh8mr5m6rp14"; + }) + ]; + # It appears that while the patch has + # diff --git a/cmake/E57Format-config.cmake b/cmake/e57format-config.cmake + # similarity index 100% + # rename from cmake/E57Format-config.cmake + # rename to cmake/e57format-config.cmake + # GNU patch doesn't interpret that. + postPatch = '' + mv cmake/E57Format-config.cmake cmake/e57format-config.cmake + ''; + # The build system by default builds ONLY static libraries, and with # `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see: # https://github.com/asmaloney/libE57Format/issues/48 diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/liberfa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/liberfa/default.nix index 097b0b85e3e8..a1ca15536da6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/liberfa/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/liberfa/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "erfa"; - version = "1.7.0"; + version = "1.7.1"; buildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "liberfa"; repo = "erfa"; rev = "v${version}"; - sha256 = "1z4k2phrw6wwi0kax6ac80jk9c036gi7pmhmg6gaf3lk81k6xz2r"; + sha256 = "0j7v9y7jsw9vjmhdpksq44ah2af10b9gl1vfm8riw178lvf246wg"; }; configureFlags = [ "--enable-shared" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libevdev/default.nix index fdd5e20640ad..ba846ed07db2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libevdev/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libevdev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1jvsphdrs1i54ccjcn6ll26jy42am7h28lbsvwa6pmxgqm43qq7m"; + sha256 = "0jidjv78lay8kl3yigwhx9fii908sk7gn9nfd2ny12ql5ipc48im"; }; nativeBuildInputs = [ python3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libevent/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libevent/default.nix index e23c7d55c5ed..cbde32067172 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -23,10 +23,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional sslSupport "openssl" ; + nativeBuildInputs = [] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ; + buildInputs = [] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional stdenv.isCygwin findutils - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; doCheck = false; # needs the net diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libewf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libewf/default.nix index 4ebf0835351e..ff644599b8a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libewf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libewf/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }: stdenv.mkDerivation rec { - version = "20171104"; + version = "20201129"; pname = "libewf"; src = fetchurl { url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; - sha256 = "0h7036gpj5cryvh17aq6i2cpnbpwg5yswmfydxbbwvd9yfxd6dng"; + sha256 = "168k1az9hm0lajh57zlbknsq5m8civ1rzp81zz4sd7v64xilzxdk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libexif/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libexif/default.nix index fd2ed39e34a4..a0f831e927ef 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libexif/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libexif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gettext }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: stdenv.mkDerivation rec { pname = "libexif"; @@ -11,6 +11,20 @@ stdenv.mkDerivation rec { sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-0198.patch"; + url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch"; + sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k"; + }) + (fetchpatch { + name = "CVE-2020-0452.patch"; + url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch"; + excludes = [ "NEWS" ]; + sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6"; + }) + ]; + nativeBuildInputs = [ autoreconfHook gettext ]; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch new file mode 100644 index 000000000000..84ee18084c29 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch @@ -0,0 +1,25 @@ +From f974fe07de9e6820bb1de50b31e480296d1d97b7 Mon Sep 17 00:00:00 2001 +From: Christian Kampka <christian@kampka.net> +Date: Wed, 25 Nov 2020 20:09:50 +0100 +Subject: [PATCH] Remove unsupported clang flags + +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index f13a6bb..b305150 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -69,7 +69,7 @@ PREFIX ?= /usr/local + LIBDIRNAME ?= /lib/faketime + PLATFORM ?=$(shell uname) + +-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ++CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) + ifeq ($(PLATFORM),SunOS) + CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 + endif +-- +2.28.0 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/default.nix index 10cc5cace7b5..6c751e07b831 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { patches = [ ./no-date-in-gzip-man-page.patch - ]; + ] ++ (stdenv.lib.optionals stdenv.cc.isClang [ + # https://github.com/wolfcw/libfaketime/issues/277 + ./0001-Remove-unsupported-clang-flags.patch + ]); postPatch = '' patchShebangs test src @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { PREFIX = placeholder "out"; LIBDIRNAME = "/lib"; - NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type -Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; checkInputs = [ perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libff/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libff/default.nix new file mode 100644 index 000000000000..8413d5be4410 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libff/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }: + +stdenv.mkDerivation rec { + pname = "libff"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "scipr-lab"; + repo = "libff"; + rev = "v${version}"; + sha256 = "0dczi829497vqlmn6n4fgi89bc2h9f13gx30av5z2h6ikik7crgn"; + fetchSubmodules = true; + }; + + cmakeFlags = [ "-DWITH_PROCPS=Off" ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost gmp openssl ]; + + meta = with stdenv.lib; { + description = "C++ library for Finite Fields and Elliptic Curves"; + changelog = "https://github.com/scipr-lab/libff/blob/develop/CHANGELOG.md"; + homepage = "https://github.com/scipr-lab/libff"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index 455d42e30502..e5b76b1435fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.24.1"; + version = "0.25.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-/dW07hkWr3sdQC591GfwXfdiS7ZfuVoIdaA3EuzC1v0="; + sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfishsound/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfishsound/default.nix index 3843f4a97ce4..23d828033e3e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfishsound/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfishsound/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://xiph.org/fishsound/"; - description = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. + description = "A simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; + longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfprint/default.nix index 7c6168c3d3e4..469633afb10c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.2"; + version = "1.90.4"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "0g890y49anqd7yfz86iyvywxgbfmfmj6813fy58m5n8jain7iy1b"; + sha256 = "0grhck0h29i7hm7npvby7pn7wdc446kv0r4mkpbssp46lqbjb96b"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index d49fa37325aa..2290d2fa07dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "0xdrsxgqw5v7szshjdgdv60rgpvzzaqic32ahqrzr6bvc402gfhc"; + sha256 = "0j27jxhjay78by940d64778nxwbysxynv5mq6iq1nmlrh810zdq3"; }; outputs = [ "out" "dev" "info" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgda/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgda/default.nix index a46b2aa74118..f0b430c91d81 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgda/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgda/default.nix @@ -9,11 +9,11 @@ assert postgresSupport -> postgresql != null; (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec { pname = "libgda"; - version = "5.2.9"; + version = "5.2.10"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16vxv2qvysh22s8h9h6irx96sacagxkz0i4qgi1wc6ibly6fvjjr"; + sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; }; configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgdata/default.nix index 162b5d233951..50eac4057062 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgdata"; - version = "0.17.12"; + version = "0.17.13"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0613nihsvwvdnmlbjnwi8zqxgmpwyxdapzznq4cy1fp84246zzd0"; + sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga"; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgnurl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgnurl/default.nix index 25917c44bd02..5daeba2c06e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgnurl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgnurl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgnurl"; - version = "7.70.0"; + version = "7.72.0"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "0px9la8v4bj1dzxb95fx3yxk0rcjqjrxpj733ga27cza45wwzkqa"; + sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix index 95bb24ecb583..93c98bb1f121 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext +, libusb1 +, libtool +, libexif +, libjpeg +}: stdenv.mkDerivation rec { - name = "libgphoto2-${meta.version}"; + pname = "libgphoto2"; + version = "2.5.23"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; - rev = meta.tag; + rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2"; }; patches = []; - nativeBuildInputs = [ pkgconfig gettext autoreconfHook ]; - buildInputs = [ libtool libjpeg libusb1 ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + gettext + libtool + ]; + + buildInputs = [ + libjpeg + libusb1 + ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. propagatedBuildInputs = [ libexif ]; @@ -33,8 +48,6 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.23"; - tag = "libgphoto2-2_5_23-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch new file mode 100644 index 000000000000..f2ee8e8d3d73 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch @@ -0,0 +1,31 @@ +From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001 +From: Johannes Lode <johannes.lode@dynainstruments.com> +Date: Thu, 14 Nov 2019 10:44:00 +0100 +Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as + regular functions. + +While cross-compiling there occurred "undefined reference to +`rpl_malloc'", the suggested change fixes the problem. + +Tested for native X86_64 and armv7a-unknown-linux-gnueabihf. +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 008499d..b492dc4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX], + + # This is always checked (library needs this) + AC_HEADER_STDC +-AC_FUNC_MALLOC ++# AC_FUNC_MALLOC -- does not work while cross-compiling ++AC_CHECK_FUNC([malloc realloc]) + AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])]) + AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])]) + AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])]) +-- +2.25.1 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpiod/default.nix index 68078bbc9a03..a3178e548048 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpiod/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpiod/default.nix @@ -4,13 +4,19 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.5.2"; + version = "1.6.2"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "1bknh7kn5gxc8xwf913lsdm9zgn1bwj42nsnp6kbkyn6ip7s6c4r"; + sha256 = "1k8mxkzvd6y9aawxghddrjkldzskhb6607qhbwjfl9f945ns87qa"; }; + patches = [ + # cross compiling fix + # https://github.com/brgl/libgpiod/pull/45 + ./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch + ]; + buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgudev/default.nix index 439dd3827ec3..c7c3064acb8d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libgudev"; - version = "233"; + version = "234"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q"; + sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv"; }; nativeBuildInputs = [ pkgconfig gobject-introspection ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libguestfs/default.nix index d8a037aa5f15..b875b3579037 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libguestfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libguestfs/default.nix @@ -91,5 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://libguestfs.org/"; maintainers = with maintainers; [offline]; platforms = platforms.linux; + # this is to avoid "output size exceeded" + hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix new file mode 100644 index 000000000000..9cf4f615dd28 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala +, gtk-doc, docbook_xsl, docbook_xml_dtd_43 +, gtk3, gnome3 +, dbus, xvfb_run, libxml2 +, hicolor-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "libhandy"; + version = "0.0.13"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = pname; + rev = "v${version}"; + sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig gobject-introspection vala libxml2 + gtk-doc docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ]; + checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dglade_catalog=disabled" + "-Dintrospection=enabled" + ]; + + doCheck = true; + + checkPhase = '' + NO_AT_BRIDGE=1 \ + XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + ''; + + meta = with stdenv.lib; { + description = "A library full of GTK widgets for mobile phones"; + homepage = "https://source.puri.sm/Librem5/libhandy"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 2923f2da25d0..7dce08b4cc24 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -1,48 +1,71 @@ -{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3, glade -, dbus, xvfb_run, libxml2 +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gobject-introspection +, vala +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, gtk3 +, gnome3 +, glade +, dbus +, xvfb_run +, libxml2 +, gdk-pixbuf +, librsvg , hicolor-icon-theme +, at-spi2-atk +, at-spi2-core }: stdenv.mkDerivation rec { pname = "libhandy"; - version = "0.0.13"; + version = "1.0.2"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; - src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; - repo = pname; - rev = "v${version}"; - sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0b8wvjabv5mg8jbng8rsd5g84lk571nm0qpna20pwp0njh2qvmrs"; }; - patches = [ - # Fix build with Glade 3.36.0 - # https://source.puri.sm/Librem5/libhandy/merge_requests/451 - (fetchpatch { - url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch"; - sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5"; - excludes = [ "glade/glade-hdy-header-bar.c" ]; - }) + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xsl + gobject-introspection + gtk-doc + libxml2 + meson + ninja + pkgconfig + vala ]; - nativeBuildInputs = [ - meson ninja pkgconfig gobject-introspection vala libxml2 - gtk-doc docbook_xsl docbook_xml_dtd_43 + buildInputs = [ + gdk-pixbuf + glade + gtk3 + libxml2 + ]; + + checkInputs = [ + dbus + xvfb_run + at-spi2-atk + at-spi2-core + librsvg + hicolor-icon-theme ]; - buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ]; - checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ "-Dgtk_doc=true" - "-Dglade_catalog=enabled" - "-Dintrospection=enabled" ]; + # Uses define_variable in pkgconfig, but we still need it to use the glade output PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; @@ -51,16 +74,18 @@ stdenv.mkDerivation rec { checkPhase = '' NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ + GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; meta = with stdenv.lib; { - description = "A library full of GTK widgets for mobile phones"; - homepage = "https://source.puri.sm/Librem5/libhandy"; + changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}"; + description = "Building blocks for modern adaptive GNOME apps"; + homepage = "https://gitlab.gnome.org/GNOME/libhandy"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix index 73d53bdccd73..577457afdbf8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20200521"; + version = "20200907"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "0s0683bwyd10n3r2sanlyd07ii3fmi3vl9w9a2rwlpcclzq3h456"; + sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb"; }; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libimagequant/default.nix index 44fa395204bb..2bca09be45f4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libimagequant/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libimagequant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.12.6"; + version = "2.13.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "00w7fny3xf14cfyhbdnmqyh9ddqdh1irvgzxd35a2z65kp7vnvj0"; + sha256 = "1543h1i59k2hbj2g8shcl8fvhz2silipacynwjgw412r38hkr33j"; }; preConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix index 47408f8cb6f4..dcbb71c7c3ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { devices to the Linux Desktop. ''; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libinput/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libinput/default.nix index 576a2fec921a..18a5dcbab65c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support @@ -27,11 +27,14 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.16.1"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "e6fRru3RUWi7IdF+nmKKocJ5V5Y6Qjo/6jk4pQF1hTk="; + version = "1.16.3"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = pname; + repo = pname; + rev = version; + sha256 = "0dj2m92kh3xpnjmzp416c73hpw6ban0f6yj39chwxckdgyliak6z"; }; outputs = [ "bin" "out" "dev" ]; @@ -80,7 +83,7 @@ stdenv.mkDerivation rec { meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = "http://www.freedesktop.org/wiki/Software/libinput"; + homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libinsane/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libinsane/default.nix index cbc4c001b151..075d5761036c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libinsane/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libinsane/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libinsane"; - version = "1.0.7"; + version = "1.0.8"; outputs = [ "out" "dev" "devdoc" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "03r6niyzfahnlpvhn68h59i6926ciwz88krqbf0akd9f42y9zf2k"; + sha256 = "0mcvqpixilzs4d4afkbxa1nqm6ddmhpaz5j56pfvc5wpv6s99h44"; }; nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libipt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libipt/default.nix index 79ae927fc24b..e585a2b090fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libipt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libipt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "095agnk7r2sq5yas6c1ri8fmsl55n4l5hkl6j5l397p9nxvxvrkc"; + sha256 = "1i6jmv345rqd88qmap6iqbaph4pkd6wbjgkixf22a80pj7cfm1s4"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libirecovery/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libirecovery/default.nix index 59f09c8d2538..5b0b60b16b35 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libirecovery/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libirecovery/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21; # Upstream description says it works on more platforms, but packager hasn't tried that yet - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nh2 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libjcat/default.nix index bbf0db233821..1eca110f8cb5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libjcat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.3"; + version = "0.1.4"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "157bi1v9qqk45rkq7lg08l7g3bxwacl4h89vnr7msjmg0hri36kc"; + sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh"; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 2a25a565a8fc..6aa4e049e4c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; rev = version; - sha256 = "0p32yivybxdicm01qa9h1vj91apygzxpvnklrjmbx8z9z2l3qxc9"; + sha256 = "0njdxfmyk8smj8bbd6fs3lxjaq3lybivwgg16gpnbiyl984dpi9b"; }; patches = diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/liblinear/default.nix index 86d306d0a07f..67eb8748f16c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -4,13 +4,13 @@ let soVersion = "4"; in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.41"; + version = "2.42"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "1mykrzka2wxnvvjh21hisabs5fsxqzdhkxw9m08h24c58vfiwsd8"; + sha256 = "0p0hpjajfkskhd7jiv5zwhfa8hi49q3mgifjlkqvy99xspv98ijj"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/liblouis/default.nix index c394e3dc4d54..d29cbf6a7195 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.15.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "1ljy5xsy7vf2r0ix0d7bqcr6qvr6897f8madsx9zlm1mrj31n5px"; + sha256 = "0q9ixy8cjgd2d2lzxgkfd4chzr5j1bz783mg10pnwviyg6k630m5"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmanette/default.nix index eb3cbf4bfef0..0cb233ad271c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmanette/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmanette/default.nix @@ -5,6 +5,9 @@ , pkgconfig , vala , gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 , glib , libgudev , libevdev @@ -13,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libmanette"; - version = "0.2.4"; + version = "0.2.6"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xrc6rh73v5w3kbkflzv1yg8sbxk4wf06hfk95raxhxlssza9q2g"; + sha256 = "1b3bcdkk5xd5asq797cch9id8692grsjxrc1ss87vv11m1ck4rb3"; }; nativeBuildInputs = [ @@ -28,6 +31,9 @@ stdenv.mkDerivation rec { pkgconfig vala gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ @@ -36,6 +42,10 @@ stdenv.mkDerivation rec { libevdev ]; + mesonFlags = [ + "-Ddoc=true" + ]; + doCheck = true; passthru = { @@ -46,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple GObject game controller library"; - homepage = "https://gitlab.gnome.org/aplazas/libmanette"; + homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 0e9a3784f383..fdf724c09fda 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.24.2"; + version = "1.24.4"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "1r41d4yddp8rgccxrkz9vg5lbrj3dr5vy71d8igrr147k44qq69j"; + sha256 = "11djb1d8w9ms07aklfm3pskjw9rnff4p4n3snanschv22zk8wj6x"; }; outputs = [ "out" "dev" "man" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index e6650db85cc7..31d64101e6bf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "20.08"; + version = "20.09"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "19n8h9jq42b6r3dbag77fzwfksfywszmzpi636w87fvc1nqldlqj"; + sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix index 0a9c8e69733e..69dd052dc036 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Minimal mDNS resolver library, used by VLC"; homepage = "https://github.com/videolabs/libmicrodns"; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.shazow ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.70.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.70.nix new file mode 100644 index 000000000000..1cd04b0b2777 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.70.nix @@ -0,0 +1,10 @@ +{ stdenv, callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.70"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h"; + }; +}) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix new file mode 100644 index 000000000000..74bd6cce42c4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix @@ -0,0 +1,10 @@ +{ stdenv, callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.71"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78"; + }; +}) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix index 4a7a228150ce..9b817f21b94c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -1,13 +1,8 @@ -{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: +{ stdenv, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl, version, src }: stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.71"; - - src = fetchurl { - url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78"; - }; + inherit version src; outputs = [ "out" "dev" "devdoc" "info" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmkv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmkv/default.nix index 190c573577a5..9a754eda592f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmkv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmkv/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchgit, libtool, autoconf, automake }: +{ stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { pname = "libmkv"; version = "0.6.5.1"; - src = fetchgit { - url = "https://github.com/saintdev/libmkv.git"; + src = fetchFromGitHub { + owner = "saintdev"; + repo = pname; rev = "refs/tags/${version}"; sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmtp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmtp/default.nix index 21bde84181b4..e9cfd0f9856a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmtp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmtp/default.nix @@ -1,18 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, libiconv }: +{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkgconfig +, libusb1 +, libiconv +}: stdenv.mkDerivation rec { - name = "libmtp-1.1.17"; + pname = "libmtp"; + version = "1.1.18"; - src = fetchurl { - url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "1p3r38nvdip40ab1h4scj3mzfjkx6kd14szjqyw9r6wz5pslr8zq"; + src = fetchFromGitHub { + owner = "libmtp"; + repo = "libmtp"; + rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}"; + sha256 = "0rya6dsb67a7ny2i1jzdicnday42qb8njqw6r902k712k5p7d1r9"; }; outputs = [ "bin" "dev" "out" ]; - buildInputs = [ libiconv ]; - propagatedBuildInputs = [ libusb1 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + autoconf + automake + gettext + libtool + pkgconfig + ]; + + buildInputs = [ + libiconv + ]; + + propagatedBuildInputs = [ + libusb1 + ]; + + preConfigure = '' + ./autogen.sh + ''; # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmwaw/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmwaw/default.nix index fbba02fcd0c5..2ab23015af32 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmwaw/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.16"; + version="0.3.17"; name="${baseName}-${version}"; - hash="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.16/libmwaw-0.3.16.tar.xz"; - sha256="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; + hash="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.17/libmwaw-0.3.17.tar.xz"; + sha256="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libndctl/default.nix index 7c4c49baffab..6ca6c3018316 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libndctl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libndctl/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, autoreconfHook , asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt -, json_c, kmod, which, utillinux, systemd, keyutils +, json_c, kmod, which, util-linux, udev, keyutils }: stdenv.mkDerivation rec { pname = "libndctl"; - version = "69"; + version = "70.1"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "1l7p0ycj27d4z07gf9qp796xpg16kfsg3rwx6plhilbhip1as4w7"; + sha256 = "09ymdibcr18vpmyf2n0xrnzgccfvr7iy3p2l5lbh7cgz7djyl5wq"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ json_c kmod utillinux systemd keyutils + [ json_c kmod util-linux udev keyutils ]; configureFlags = diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnest2d/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnest2d/default.nix new file mode 100644 index 000000000000..ee61ef8a7232 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnest2d/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: + +stdenv.mkDerivation rec { + version = "2020-10-09-unstable"; + pname = "libnest2d"; + + # This revision is waiting to be merged upstream + # Once it has been merged, this should be switched to it + # Upstream PR: https://github.com/tamasmeszaros/libnest2d/pull/18 + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "libnest2d"; + rev = "31391fd173249ad9b906390058e13b09238fadc8"; + sha256 = "1hzqi4z55x76rss3xk7hfqhy9hcaq2jaav5jqxa1aqmbvarr2gla"; + }; + + propagatedBuildInputs = [ clipper nlopt boost ]; + nativeBuildInputs = [ cmake ]; + + CLIPPER_PATH = "${clipper.out}"; + cmakeFlags = [ "-DLIBNEST2D_HEADER_ONLY=OFF" ]; + + meta = with stdenv.lib; { + description = + "2D irregular bin packaging and nesting library written in modern C++"; + homepage = "https://github.com/Ultimaker/libnest2d"; + license = licenses.lgpl3; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix index 55e07c03b287..7a0796166270 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.5"; pname = "libnetfilter_queue"; src = fetchurl { url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2"; - sha256 = "0w7s6g8bikch1m4hnxdakpkwgrkw64ikb6wb4v4zvgyiywrk5yai"; + sha256 = "1xdra6i4p8jkv943ygjw646qx8df27f7p5852kc06vjx608krzzr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnftnl/default.nix index f9def04f99b7..3da2ccce4422 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnftnl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - version = "1.1.7"; + version = "1.1.8"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "13zd90bfrr0q3j0l0cbc8kiizccw6n8gp727kqnfljh024zw3nr0"; + sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libngspice/default.nix index e1b9e4f0bdca..84bd9b33e790 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "31"; + version = "33"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "10n2lnfrpsv4vyrirkphr4jwjjhy7i617g6za78dwirfjq63npw4"; + sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; }; nativeBuildInputs = [ flex bison ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnixxml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnixxml/default.nix new file mode 100644 index 000000000000..5741d4cb5b8a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnixxml/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, libxml2, gd, glib, getopt, libxslt, nix }: + +stdenv.mkDerivation { + name = "libnixxml"; + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "libnixxml"; + rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a"; + sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; + }; + configureFlags = [ "--with-gd" "--with-glib" ]; + CFLAGS = "-Wall"; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pkgconfig libxml2 gd.dev glib getopt libxslt nix ]; + doCheck = false; + postPatch = '' + ./bootstrap + ''; + + meta = with stdenv.lib; { + description = "XML-based Nix-friendly data integration library"; + homepage = https://github.com/svanderburg/libnixxml; + license = licenses.mit; + maintainers = with maintainers; [ tomberek ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnova/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnova/default.nix index 413e404ce1dd..8cdbdbd747a9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnova/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnova/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation rec { - name = "libnova-0.12.3"; + pname = "libnova"; + version = "0.16"; - src = fetchurl { - url = "mirror://sourceforge/libnova/${name}.tar.gz"; - sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc"; + # pull from git repo because upstream stopped tarball releases after v0.15 + src = fetchgit { + url = "https://git.code.sf.net/p/libnova/${pname}"; + rev = "v${version}"; + sha256 = "0icwylwkixihzni0kgl0j8dx3qhqvym6zv2hkw2dy6v9zvysrb1b"; }; + nativeBuildInputs = [ + autoreconfHook + ]; + meta = with stdenv.lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; homepage = "http://libnova.sf.net"; - platforms = platforms.unix; license = licenses.gpl2; + maintainers = with maintainers; [ hjones2199 ]; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libopcodes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libopcodes/default.nix index 8db034683dc7..f596ddfafc44 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libopcodes/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libopcodes/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = binutils-unwrapped.patches ++ [ - ../../tools/misc/binutils/build-components-separately.patch + (binutils-unwrapped.patchesDir + "/build-components-separately.patch") ]; # We just want to build libopcodes diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix index d9ccf77ea928..5b02d70f6836 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix @@ -2,16 +2,22 @@ stdenv.mkDerivation rec { pname = "libopenaptx"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "pali"; repo = "libopenaptx"; rev = version; - sha256 = "0996qmkmbax7ccknxrd3bx8xibs79a1ffms69scsj59f3kgj6854"; + sha256 = "nTpw4vWgJ765FM6Es3SzaaaZr0YDydXglb0RWLbiigI="; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + # disable static builds + "ANAME=" + "AOBJECTS=" + "STATIC_UTILITIES=" + ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libp11/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libp11/default.nix index 4bf0b020118d..a1e6d05440c0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libp11/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libp11/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libp11"; - version = "0.4.10"; + version = "0.4.11"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; rev = "${pname}-${version}"; - sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz"; + sha256 = "0hcl706i04nw5c1sj7l6sj6m0yjq6qijz345v498jll58fp5wif8"; }; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libpaper/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libpaper/default.nix index 28c6030a0ffb..d7863e29d58d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libpaper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libpaper/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.1.24"; + version = "1.1.28"; pname = "libpaper"; src = fetchurl { url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz"; - sha256 = "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q"; + sha256 = "sha256-yLuUbsk9PCxyu7HXJX6QFyoipEoHoH+2uAKluyyV/dw="; }; + nativeBuildInputs = [ autoreconfHook ]; + # The configure script of libpaper is buggy: it uses AC_SUBST on a headerfile # to compile sysconfdir into the library. Autoconf however defines sysconfdir # as "${prefix}/etc", which is not expanded by AC_SUBST so libpaper will look diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libpeas/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libpeas/default.nix index 6c2276a08ccb..1d360b45052a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libpeas/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libpeas/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.26.0"; + version = "1.28.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xkk9zhkw8f2fm7g9nb4ry4xxig5n27s7rjmx6l7jr2941zdfxm9"; + sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2"; }; nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 0b36efa189bb..ac8552fa9ef4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -15,24 +15,16 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "2.72.0"; + version = "2.72.2"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "1yhf9xyxdawbihsx89dpjlac800wrmpwx63rphad2nj225y9q40f"; + sha256 = "1ijqpx1pagc6qg63ynqrinvckwc8aaw1i0lx48gg5szwk8afib4i"; }; - patches = [ - # to work with latest glslang, remove on release >2.72.0 - (fetchpatch { - url = "https://code.videolan.org/videolan/libplacebo/-/commit/523056828ab86c2f17ea65f432424d48b6fdd389.patch"; - sha256 = "051vhd0l3yad1fzn5zayi08kqs9an9j8p7m63kgqyfv1ksnydpcs"; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libplist/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libplist/default.nix index 6608ccd1abc5..a626e7a5377b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libplist/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libplist/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/libimobiledevice/libplist"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ infinisil ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix index 61c25e183bd0..7fcc8c58c1ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -71,6 +71,17 @@ stdenv.mkDerivation rec { url = "https://github.com/libproxy/libproxy/pull/95.patch"; sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi"; }) + (fetchpatch { + name = "CVE-2020-25219.patch"; + url = "https://github.com/libproxy/libproxy/commit/a83dae404feac517695c23ff43ce1e116e2bfbe0.patch"; + sha256 = "0wdh9qjq99aw0jnf2840237i3hagqzy42s09hz9chfgrw8pyr72k"; + }) + (fetchpatch { + name = "CVE-2020-26154.patch"; + url = "https://github.com/libproxy/libproxy/commit/4411b523545b22022b4be7d0cac25aa170ae1d3e.patch"; + sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8"; + }) + ] ++ stdenv.lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libpsl/default.nix index fdc352869f0a..67e87a5faab4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libpsl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libpsl/default.nix @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { lzip pkgconfig python3 - valgrind libxslt + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + valgrind ]; buildInputs = [ @@ -56,15 +57,16 @@ stdenv.mkDerivation rec { configureFlags = [ # "--enable-gtk-doc" "--enable-man" - "--enable-valgrind-tests" "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + "--enable-valgrind-tests" ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with stdenv.lib; { description = "C library for the Publix Suffix List"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 11816beee040..bc142b0a57c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0nd0hrnp0a9p7hy6l6s45kfd267r7qg91aqn8g2dyam5hngskayk"; + sha256 = "1j4sr9s7152xmci677pnz64spv8s3ia26fbp5cqx8ydv7swlivh2"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libqmi/default.nix index e8db7501534c..de38e5d3b6e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.2"; + version = "1.26.6"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "00vvvfq74awg6mk0si1cdv79f6z6wqx11h47nl78a1h7zsr6fd0k"; + sha256 = "1fbwz6534q6n4bgabdx4svbgkf4mdyisjh3y51jjd94p22xn66d7"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libquotient/default.nix index 9ece2c13bd21..4971e37a4272 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.5.3.2"; + version = "0.6.2"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs"; + sha256 = "1721cy6zaq086nrwh9x4d7k1jiaygg1wkvyx486i9bj9z53lc3wd"; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libraw/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libraw/default.nix index b190d36acb52..f59f63c38ac7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libraw/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libraw/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchurl, lcms2, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkgconfig }: stdenv.mkDerivation rec { pname = "libraw"; - version = "0.20.0"; + version = "0.20.2"; - src = fetchurl { - url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz"; + src = fetchFromGitHub { + owner = "LibRaw"; + repo = "LibRaw"; + rev = version; + sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; }; outputs = [ "out" "lib" "dev" "doc" ]; propagatedBuildInputs = [ lcms2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix index b4141d4ff079..4645b5ea0d83 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix @@ -1,13 +1,22 @@ { stdenv, fetchurl, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "raptor2-2.0.15"; + pname = "raptor2"; + version = "2.0.15"; src = fetchurl { - url = "http://download.librdf.org/source/${name}.tar.gz"; + url = "http://download.librdf.org/source/${pname}-${version}.tar.gz"; sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; }; + patches = [ + (fetchurl { + name = "CVE-2017-18926.patch"; + url = "https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch"; + sha256 = "1qlpb5rm3j2yi0x6zgdi5apymg5zlvwq3g1zl417gkjrlvxmndgp"; + }) + ]; + buildInputs = [ libxml2 libxslt ]; postInstall = "rm -rvf $out/share/gtk-doc"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 55171cd3de4e..2ceb2125dbc9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.38.0"; + version = "2.40.0"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "12rs0gklgzn8bplqjmaxixk04pr870i333mmcp9i5bhkn8x86zbx"; + sha256 = "KZNriNDxRKR14KFJrAbzZLfSQ3iiZ8PKC80fVh0AQls="; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/librsvg/default.nix index fb61b50346d1..ecf518d04dae 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -4,14 +4,14 @@ let pname = "librsvg"; - version = "2.48.8"; + version = "2.50.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "14i6xzghcidv64cyd3g0wdjbl82rph737yxn9s3x29nzpcjs707l"; + sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv"; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libseccomp/default.nix index 6ea0e6be465b..ab1df8d2bc12 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libseccomp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libseccomp/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, getopt, utillinux, gperf }: +{ stdenv, fetchurl, getopt, util-linux, gperf }: stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz"; + sha256 = "0m8dlg1v7kflcxvajs4p76p275qwsm2abbf5mfapkakp7hw7wc7f"; }; - outputs = [ "out" "lib" "dev" "man" ]; + outputs = [ "out" "lib" "dev" "man" "pythonsrc" ]; nativeBuildInputs = [ gperf ]; buildInputs = [ getopt ]; @@ -18,12 +18,19 @@ stdenv.mkDerivation rec { patchShebangs . ''; - checkInputs = [ utillinux ]; + checkInputs = [ util-linux ]; doCheck = false; # dependency cycle # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. preFixup = "rm -rfv src"; + # Copy the python module code into a tarball that we can export and use as the + # src input for buildPythonPackage calls + postInstall = '' + cp -R ./src/python/ tmp-pythonsrc/ + tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ + ''; + meta = with stdenv.lib; { description = "High level library for the Linux Kernel seccomp filter"; homepage = "https://github.com/seccomp/libseccomp"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 010a74eab3ca..d614ab01297e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.20.3"; + version = "0.20.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg"; + sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libshout/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libshout/default.nix index 23ab4d0b3385..075855fada46 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libshout/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libshout/default.nix @@ -4,11 +4,11 @@ # need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { - name = "libshout-2.4.3"; + name = "libshout-2.4.4"; src = fetchurl { url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; - sha256 = "1zhdshas539cs8fsz8022ljxnnncr5lafhfd1dqr1gs125fzb2hd"; + sha256 = "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index 95f7beff88ad..5845916239c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "mirror://sourceforge/sidplay-residfp/${pname}/${majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "0d866czmnmhnhb2j37rlrdphjdi2b75kak9barm9xqwg2z0nmmhz"; + sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0"; }; nativeBuildInputs = [ pkgconfig ] diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libslirp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libslirp/default.nix index 0413d8a8abc4..af6d26bc22b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libslirp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libslirp/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "0pzgjj2x2vrjshrzrl2x39xp5lgwg4b4y9vs8xvadh1ycl10v3fv"; + sha256 = "0abh337jvij664w65zszjql42n720zzfap0ab0amr4qcvkzw7bjx"; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/slirp/libslirp"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsndfile/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsndfile/default.nix index 7b20120290d4..739bc7d73323 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsndfile/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsndfile/default.nix @@ -1,50 +1,20 @@ -{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkgconfig, python3 , Carbon, AudioToolbox }: stdenv.mkDerivation rec { - name = "libsndfile-1.0.28"; - - src = fetchurl { - url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz"; - sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz"; + pname = "libsndfile"; + version = "1.0.30"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1rh79y4s4m2wcm2kahmzs2kijpdpayif2gyca6m71f3k7jbhgcwa"; }; - patches = [ - (fetchurl { - name = "CVE-2017-12562.patch"; - url = "https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8.patch"; - sha256 = "1jg3wq30wdn9nv52mcyv6jyi4d80h4r1h9p96czcria7l91yh4sy"; - }) - (fetchurl { - name = "CVE-2017-6892.patch"; - url = "https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748.patch"; - sha256 = "05xkmz2ihc1zcj73sbmj1ikrv9qlcym2bkp1v6ak7w53ky619mwq"; - }) - (fetchurl { - name = "CVE-2017-8361+CVE-2017-8363+CVE-2017-8365.patch"; - url = "https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3.patch"; - sha256 = "0ccndnvjzx5fw18zvy03vnb29rr81h5vsh1m16msqbxk8ibndln2"; - }) - (fetchurl { - name = "CVE-2017-8362.patch"; - url = "https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808.patch"; - sha256 = "1xyv30ga71cpy4wx5f76sc4dma91la2lcc6s9f3pk9rndyi7gj9x"; - }) - (fetchurl { - name = "CVE-2017-14634.patch"; - url = "https://github.com/erikd/libsndfile/commit/85c877d5072866aadbe8ed0c3e0590fbb5e16788.patch"; - sha256 = "0kc7vp22qsxidhvmlc6nfamw7k92n0hcfpmwhb3gaksjamwhb2df"; - }) - (fetchurl { - name = "CVE-2018-13139.patch"; - url = "https://github.com/erikd/libsndfile/commit/aaea680337267bfb6d2544da878890ee7f1c5077.patch"; - sha256 = "01q3m7pa3xqkh05ijmfgv064v8flkg4p24bgy9wxnc6wfcdifggx"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ flac libogg libvorbis ] + nativeBuildInputs = [ autoreconfHook autogen pkgconfig python3 ]; + buildInputs = [ flac libogg libopus libvorbis ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; @@ -63,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for reading and writing files containing sampled sound"; - homepage = "http://www.mega-nerd.com/libsndfile/"; + homepage = "https://libsndfile.github.io/libsndfile/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsolv/default.nix index d559efd3aab5..65ab87a0cf65 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.14"; + version = "0.7.16"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "10klbgknl2njbjl4k0l50ii7afwqrl1691ar4ry3snmc8chb1z7g"; + sha256 = "1arw7p83s5yq36pw94b76zfiqsh90fjjnayni54a5wgm0zvbkki8"; }; cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsoup/default.nix index a497661725b1..88c6a359ba8d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3 +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala -, libpsl, python3, brotli }: +, libpsl, python3, brotli +}: stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.70.0"; + version = "2.72.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l"; + sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"; }; postPatch = '' @@ -17,16 +18,28 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ python3 sqlite libpsl brotli ]; + buildInputs = [ + python3 + sqlite + libpsl + glib.out + brotli + ] ++ lib.optionals stdenv.isLinux [ + libsysprof-capture + ]; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ]; propagatedBuildInputs = [ glib libxml2 ]; + NIX_CFLAGS_COMPILE = [ "-lpthread" ]; + mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" "-Dvapi=enabled" - "-Dgnome=${if gnomeSupport then "true" else "false"}" + "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsysprof=disabled" ]; doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) @@ -41,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; homepage = "https://wiki.gnome.org/Projects/libsoup"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libstroke/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libstroke/default.nix index 534ad7afc716..e97b96d71d09 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libstroke/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libstroke/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Libstroke, a library for simple gesture recognition"; + description = "A library for simple gesture recognition"; homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/"; license = stdenv.lib.licenses.gpl2; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libthai/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libthai/default.nix new file mode 100644 index 000000000000..6179ad0f6bda --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libthai/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }: + +stdenv.mkDerivation rec { + pname = "libthai"; + version = "0.1.28"; + + src = fetchurl { + url = "https://github.com/tlwg/libthai/releases/download/v${version}/libthai-${version}.tar.xz"; + sha256 = "04g93bgxrcnay9fglpq2lj9nr7x1xh06i60m7haip8as9dxs3q7z"; + }; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + buildInputs = [ libdatrie ]; + + postInstall = '' + installManPage man/man3/*.3 + ''; + + meta = with stdenv.lib; { + homepage = "https://linux.thai.net/projects/libthai/"; + description = "Set of Thai language support routines"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libthreadar/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libthreadar/default.nix index ed19fab6d994..587ef2e208a3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libthreadar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libthreadar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z"; + sha256 = "0x1kkccy81rcqbhlw88sw7lykp7398vmrvp6f9yy42k9bl4yxn2q"; }; outputs = [ "out" "dev" ]; @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://libthreadar.sourceforge.net/"; - description = '' + description = "A C++ library that provides several classes to manipulate threads"; + longDescription = '' Libthreadar is a C++ library providing a small set of C++ classes to manipulate threads in a very simple and efficient way from your C++ code. ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libtins/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libtins/default.nix index 60bb092c6fa4..bde1cbf44e1f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libtins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libtins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtins"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "mfontanini"; repo = pname; rev = "v${version}"; - sha256 = "0gv661gdf018zk1sr6fnvcmd5akqjihs4h6zzxv6881v6yhhglrz"; + sha256 = "09ah1a7ska7xiki7625mn1d8i96il3hxbkc39ba8fn1a5383kmqa"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/liburing/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/liburing/default.nix index 1839c0ec187c..938846ace54f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { ) ''; + # Doesn't recognize platform flags + configurePlatforms = []; + outputs = [ "out" "bin" "dev" "man" ]; postInstall = diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libusb1/default.nix index a3323c8e026b..8499e16c2910 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -2,14 +2,14 @@ , fetchFromGitHub , autoreconfHook , pkgconfig -, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl -, systemd ? null +, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl +, udev ? null , libobjc , IOKit , withStatic ? false }: -assert enableSystemd -> systemd != null; +assert enableUdev -> udev != null; stdenv.mkDerivation rec { pname = "libusb"; @@ -26,15 +26,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; propagatedBuildInputs = - stdenv.lib.optional enableSystemd systemd ++ + stdenv.lib.optional enableUdev udev ++ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; dontDisableStatic = withStatic; - configureFlags = stdenv.lib.optional (!enableSystemd) "--disable-udev"; + configureFlags = stdenv.lib.optional (!enableUdev) "--disable-udev"; - preFixup = stdenv.lib.optionalString enableSystemd '' - sed 's,-ludev,-L${stdenv.lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la + preFixup = stdenv.lib.optionalString enableUdev '' + sed 's,-ludev,-L${stdenv.lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix index f4c4dbfcf710..9d81c5d0fbeb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "A client library to multiplex connections from and to iOS devices"; homepage = "https://github.com/libimobiledevice/libusbmuxd"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libva/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libva/default.nix index d3578283737a..f6c8c9d0bb8c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.9.0"; # Also update the hash for libva-utils! + version = "2.9.1"; # Also update the hash for libva-utils! src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "17m8k8fn41vzi1lzh9idf2mn4x73bwlkw60kl5zj396kpw4n1z1r"; + sha256 = "1c9rwrz30q2p47spzb9gsakwci9c5mw6i309z7p7hr2d8233ay4x"; }; outputs = [ "dev" "out" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libva/utils.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libva/utils.nix index 71a1d085d121..675d85508b53 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libva/utils.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1xylc940ffhqay9lyy48872cfw61ziky8dw21vm69psngfz3zs9n"; + sha256 = "1viqxq9r424hvbfgjlw4zb1idsq24fqr5cz6rk47j37rcnqclj2k"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix index 722c4a53b8fa..b880d3642745 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchgit , pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr -, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext +, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc @@ -36,12 +36,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib libtirpc + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 utillinux systemd libnl numad zfs - libapparmor libcap_ng numactl attr parted + libpciaccess lvm2 util-linux systemd libnl numad zfs + libapparmor libcap_ng numactl attr parted libtirpc ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen ] ++ optionals enableIscsi [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 642baba43767..224168888c02 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchgit , pkgconfig, makeWrapper, autoreconfHook, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils -, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext +, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 util-linux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted libtirpc ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvmi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvmi/default.nix index e49ab9b38a04..1603d32ba797 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvmi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvmi/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ gpl3 lgpl3 ]; platforms = platforms.linux; - maintainers = with maintainers; [ lschuermann ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch deleted file mode 100644 index 552c4e08d5f9..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch +++ /dev/null @@ -1,211 +0,0 @@ -Backports of - -From 46e17f0cb4a80b36755c84b8bf15731d3386c08f Mon Sep 17 00:00:00 2001 -From: kyslov <kyslov@google.com> -Date: Fri, 4 Jan 2019 17:04:09 -0800 -Subject: [PATCH] Fix OOB memory access on fuzzed data - -From 0681cff1ad36b3ef8ec242f59b5a6c4234ccfb88 Mon Sep 17 00:00:00 2001 -From: James Zern <jzern@google.com> -Date: Tue, 24 Jul 2018 21:36:50 -0700 -Subject: [PATCH] vp9: fix OOB read in decoder_peek_si_internal - -From f00890eecdf8365ea125ac16769a83aa6b68792d Mon Sep 17 00:00:00 2001 -From: James Zern <jzern@google.com> -Date: Tue, 11 Dec 2018 18:06:20 -0800 -Subject: [PATCH] update libwebm to libwebm-1.0.0.27-352-g6ab9fcf - -From 34d54b04e98dd0bac32e9aab0fbda0bf501bc742 Mon Sep 17 00:00:00 2001 -From: James Zern <jzern@google.com> -Date: Tue, 9 Apr 2019 18:37:44 -0700 -Subject: [PATCH] update libwebm to libwebm-1.0.0.27-358-gdbf1d10 - -From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001 -From: Jerome Jiang <jianj@google.com> -Date: Wed, 23 May 2018 15:43:00 -0700 -Subject: [PATCH] VP8: Fix use-after-free in postproc. - -to address CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433 - ---- libvpx-1.7.0.orig/test/decode_api_test.cc -+++ libvpx-1.7.0/test/decode_api_test.cc -@@ -138,8 +138,30 @@ TEST(DecodeAPI, Vp9InvalidDecode) { - EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); - } - --TEST(DecodeAPI, Vp9PeekSI) { -+void TestPeekInfo(const uint8_t *const data, uint32_t data_sz, -+ uint32_t peek_size) { - const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo; -+ // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get -+ // to decoder_peek_si_internal on frames of size < 8. -+ if (data_sz >= 8) { -+ vpx_codec_ctx_t dec; -+ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0)); -+ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM -+ : VPX_CODEC_CORRUPT_FRAME, -+ vpx_codec_decode(&dec, data, data_sz, NULL, 0)); -+ vpx_codec_iter_t iter = NULL; -+ EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter)); -+ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); -+ } -+ -+ // Verify behavior of vpx_codec_peek_stream_info. -+ vpx_codec_stream_info_t si; -+ si.sz = sizeof(si); -+ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK, -+ vpx_codec_peek_stream_info(codec, data, data_sz, &si)); -+} -+ -+TEST(DecodeAPI, Vp9PeekStreamInfo) { - // The first 9 bytes are valid and the rest of the bytes are made up. Until - // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it - // should return VPX_CODEC_CORRUPT_FRAME. -@@ -150,24 +172,18 @@ TEST(DecodeAPI, Vp9PeekSI) { - }; - - for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) { -- // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get -- // to decoder_peek_si_internal on frames of size < 8. -- if (data_sz >= 8) { -- vpx_codec_ctx_t dec; -- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0)); -- EXPECT_EQ( -- (data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME, -- vpx_codec_decode(&dec, data, data_sz, NULL, 0)); -- vpx_codec_iter_t iter = NULL; -- EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter)); -- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); -- } -- -- // Verify behavior of vpx_codec_peek_stream_info. -- vpx_codec_stream_info_t si; -- si.sz = sizeof(si); -- EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK, -- vpx_codec_peek_stream_info(codec, data, data_sz, &si)); -+ TestPeekInfo(data, data_sz, 10); -+ } -+} -+ -+TEST(DecodeAPI, Vp9PeekStreamInfoTruncated) { -+ // This profile 1 header requires 10.25 bytes, ensure -+ // vpx_codec_peek_stream_info doesn't over read. -+ const uint8_t profile1_data[10] = { 0xa4, 0xe9, 0x30, 0x68, 0x53, -+ 0xe9, 0x30, 0x68, 0x53, 0x04 }; -+ -+ for (uint32_t data_sz = 1; data_sz <= 10; ++data_sz) { -+ TestPeekInfo(profile1_data, data_sz, 11); - } - } - #endif // CONFIG_VP9_DECODER ---- libvpx-1.7.0.orig/third_party/libwebm/mkvparser/mkvparser.cc -+++ libvpx-1.7.0/third_party/libwebm/mkvparser/mkvparser.cc -@@ -5307,8 +5307,8 @@ long VideoTrack::Parse(Segment* pSegment - - const long long stop = pos + s.size; - -- Colour* colour = NULL; -- Projection* projection = NULL; -+ std::unique_ptr<Colour> colour_ptr; -+ std::unique_ptr<Projection> projection_ptr; - - while (pos < stop) { - long long id, size; -@@ -5357,11 +5357,19 @@ long VideoTrack::Parse(Segment* pSegment - if (rate <= 0) - return E_FILE_FORMAT_INVALID; - } else if (id == libwebm::kMkvColour) { -- if (!Colour::Parse(pReader, pos, size, &colour)) -+ Colour* colour = NULL; -+ if (!Colour::Parse(pReader, pos, size, &colour)) { - return E_FILE_FORMAT_INVALID; -+ } else { -+ colour_ptr.reset(colour); -+ } - } else if (id == libwebm::kMkvProjection) { -- if (!Projection::Parse(pReader, pos, size, &projection)) -+ Projection* projection = NULL; -+ if (!Projection::Parse(pReader, pos, size, &projection)) { - return E_FILE_FORMAT_INVALID; -+ } else { -+ projection_ptr.reset(projection); -+ } - } - - pos += size; // consume payload -@@ -5392,8 +5400,8 @@ long VideoTrack::Parse(Segment* pSegment - pTrack->m_display_unit = display_unit; - pTrack->m_stereo_mode = stereo_mode; - pTrack->m_rate = rate; -- pTrack->m_colour = colour; -- pTrack->m_projection = projection; -+ pTrack->m_colour = colour_ptr.release(); -+ pTrack->m_projection = projection_ptr.release(); - - pResult = pTrack; - return 0; // success ---- libvpx-1.7.0.orig/vp8/common/postproc.c -+++ libvpx-1.7.0/vp8/common/postproc.c -@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BU - double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; - int ppl = (int)(level + .5); - -- const MODE_INFO *mode_info_context = cm->show_frame_mi; -+ const MODE_INFO *mode_info_context = cm->mi; - int mbr, mbc; - - /* The pixel thresholds are adjusted according to if or not the macroblock ---- libvpx-1.7.0.orig/vp8/decoder/dboolhuff.h -+++ libvpx-1.7.0/vp8/decoder/dboolhuff.h -@@ -76,7 +76,7 @@ static int vp8dx_decode_bool(BOOL_DECODE - } - - { -- register int shift = vp8_norm[range]; -+ const unsigned char shift = vp8_norm[(unsigned char)range]; - range <<= shift; - value <<= shift; - count -= shift; ---- libvpx-1.7.0.orig/vp9/vp9_dx_iface.c -+++ libvpx-1.7.0/vp9/vp9_dx_iface.c -@@ -97,7 +97,7 @@ static vpx_codec_err_t decoder_peek_si_i - const uint8_t *data, unsigned int data_sz, vpx_codec_stream_info_t *si, - int *is_intra_only, vpx_decrypt_cb decrypt_cb, void *decrypt_state) { - int intra_only_flag = 0; -- uint8_t clear_buffer[10]; -+ uint8_t clear_buffer[11]; - - if (data + data_sz <= data) return VPX_CODEC_INVALID_PARAM; - -@@ -158,6 +158,9 @@ static vpx_codec_err_t decoder_peek_si_i - if (profile > PROFILE_0) { - if (!parse_bitdepth_colorspace_sampling(profile, &rb)) - return VPX_CODEC_UNSUP_BITSTREAM; -+ // The colorspace info may cause vp9_read_frame_size() to need 11 -+ // bytes. -+ if (data_sz < 11) return VPX_CODEC_UNSUP_BITSTREAM; - } - rb.bit_offset += REF_FRAMES; // refresh_frame_flags - vp9_read_frame_size(&rb, (int *)&si->w, (int *)&si->h); ---- libvpx-1.7.0.orig/vpx_dsp/bitreader.h -+++ libvpx-1.7.0/vpx_dsp/bitreader.h -@@ -94,7 +94,7 @@ static INLINE int vpx_read(vpx_reader *r - } - - { -- register int shift = vpx_norm[range]; -+ const unsigned char shift = vpx_norm[(unsigned char)range]; - range <<= shift; - value <<= shift; - count -= shift; ---- libvpx-1.7.0.orig/vpx_dsp/bitreader_buffer.c -+++ libvpx-1.7.0/vpx_dsp/bitreader_buffer.c -@@ -23,7 +23,7 @@ int vpx_rb_read_bit(struct vpx_read_bit_ - rb->bit_offset = off + 1; - return bit; - } else { -- rb->error_handler(rb->error_handler_data); -+ if (rb->error_handler != NULL) rb->error_handler(rb->error_handler_data); - return 0; - } - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvpx/default.nix index 007df403ff73..83e60466c146 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvpx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvpx/default.nix @@ -56,20 +56,16 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.7.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "webmproject"; - repo = "libvpx"; + repo = pname; rev = "v${version}"; - sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6"; + sha256 = "16xv6ambc82g14h1y0q1vyy57wp6j9fbp0nk0wd5csnrw407rhry"; }; - patches = [ - ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch - ]; - - postPatch = ''patchShebangs .''; + postPatch = "patchShebangs ."; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -135,6 +131,12 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + #"--extra-cflags=" + #"--extra-cxxflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 @@ -159,6 +161,10 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optionals unitTestsSupport [ coreutils curl ]; + NIX_LDFLAGS = [ + "-lpthread" # fixes linker errors + ]; + enableParallelBuilding = true; postInstall = ''moveToOutput bin "$bin" ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwacom/default.nix index 7c71dc4388b8..6ae116356f8a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.5"; + version = "1.6"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "1a3qkzpkag1vqd2xl7b7f2b8kbg1y1g6gg5ydzb1ppyqw3zdjf9x"; + sha256 = "10wphlk5v591mlvcyr6bjqp60zmhbpqg3lmsq9dza738v97ws8ci"; }; nativeBuildInputs = [ pkgconfig meson ninja doxygen ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix index d2a98c4a8476..6d24ba7f2ed2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub, autoreconfHook, libtool , threadingSupport ? true # multi-threading , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format @@ -27,13 +27,17 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.0.3"; + version = "1.1.0"; - src = fetchurl { - url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz"; - sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2"; + src = fetchFromGitHub { + owner = "webmproject"; + repo = pname; + rev = version; + sha256 = "1kl6qqa29ygqb2fpv140y59v539gdqx4vcf3mlaxhca2bks98qgm"; }; + prePatch = "patchShebangs ."; + configureFlags = [ (mkFlag threadingSupport "threading") (mkFlag openglSupport "gl") @@ -50,6 +54,7 @@ stdenv.mkDerivation rec { (mkFlag libwebpdecoderSupport "libwebpdecoder") ]; + nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] ++ optionals openglSupport [ freeglut libGL libGLU ] ++ optional pngSupport libpng diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxls/default.nix index 192e732b5c0c..00300899589a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxls/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxls"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; - sha256 = "1m3acryv0l4zkj0w3h8vf23rfklschqcbaf484qms2lrx8gakvws"; + sha256 = "1y7wk55blk16hmvf9dz5ci84hlhv6pw6mnr1mfnibfw3gsxmzhyv"; }; nativeBuildInputs = [ unzip ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxml2/default.nix index 5e290b25832d..594928876888 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -28,14 +28,26 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/72342 ./utf8-xmlErrorFuncHandler.patch (fetchpatch { + name = "CVE-2019-20388.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch"; + sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl"; + }) + (fetchpatch { name = "CVE-2020-7595.patch"; url = "https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch"; sha256 = "0klvaxkzakkpyq0m44l9xrpn5kwaii194sqsivfm6zhnb9hhl15l"; }) (fetchpatch { - name = "CVE-2019-20388.patch"; - url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch"; - sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl"; + name = "CVE-2020-24977.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/commit/50f06b3efb638efb0abd95dc62dca05ae67882c2.patch"; + sha256 = "093f1ic5qfiq8nk9mc6b8p1qcs8m9hir3ardr6r5il4zi2dnjrj4"; + }) + # Fix compatibility with Python 3.9. + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/149 + (fetchpatch { + name = "python39.patch"; + url = "https://gitlab.gnome.org/nwellnhof/libxml2/-/commit/e4fb36841800038c289997432ca547c9bfef9db1.patch"; + sha256 = "0h3vpy9fg3339b14qa64640ypp65z3hrrrmpjl8qm72srkp24ci5"; }) ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxsmm/default.nix index 394347277f6a..30f060405f08 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxsmm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxsmm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, coreutils, gfortran, gnused -, python3, utillinux, which +, python3, util-linux, which , enableStatic ? false }: @@ -22,7 +22,7 @@ in stdenv.mkDerivation { gfortran gnused python3 - utillinux + util-linux which ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/linbox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/linbox/default.nix index 09bd7e120911..7bca0c295c4b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -14,8 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "linbox"; - version = "1.6.3"; - + version = "1.6.3"; # TODO: Check postPatch script on update src = fetchFromGitHub { owner = "linbox-team"; @@ -36,6 +35,20 @@ stdenv.mkDerivation rec { fflas-ffpack ]; + patches = [ + # Remove inappropriate `const &` qualifiers on data members that can be + # modified via member functions. + # See also: https://github.com/linbox-team/linbox/pull/256 + ./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update + ]; + + postPatch = '' + # Remove @LINBOXSAGE_LIBS@ that is actually undefined. + # See also: https://github.com/linbox-team/linbox/pull/249 + # TODO: Remove on 1.7.0 update + find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \; + ''; + configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" @@ -57,12 +70,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { inherit version; description = "C++ library for exact, high-performance linear algebra"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.timokau]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + maintainers = teams.sage.members; + platforms = platforms.unix; homepage = "https://linalg.org/"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch new file mode 100644 index 000000000000..ec8571a7d710 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch @@ -0,0 +1,13 @@ +--- a/linbox/algorithms/det-rational.h ++++ b/linbox/algorithms/det-rational.h +@@ -79,8 +79,8 @@ + struct MyRationalModularDet { + const Blackbox &A; + const MyMethod &M; +- const Integer &mul;//multiplicative prec; +- const Integer ÷ ++ Integer mul;//multiplicative prec; ++ Integer div; + + MyRationalModularDet(const Blackbox& b, const MyMethod& n, + const Integer & p1, const Integer & p2) : diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/marl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/marl/default.nix new file mode 100644 index 000000000000..2bf23962d53e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/marl/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "marl"; + version = "1.0.0"; # Based on marl's CHANGES.md + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + sha256 = "0pnbarbyv82h05ckays2m3vgxzdhpcpg59bnzsddlb5v7rqhw51w"; + rev = "40209e952f5c1f3bc883d2b7f53b274bd454ca53"; + }; + + nativeBuildInputs = [ cmake ]; + + # Turn on the flag to install after building the library. + cmakeFlags = ["-DMARL_INSTALL=ON"]; + + meta = with stdenv.lib; { + homepage = "https://github.com/google/marl"; + description = "A hybrid thread / fiber task scheduler written in C++ 11"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ breakds ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/martyr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/martyr/default.nix index 4254bfe82ea2..51fd6962e704 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/martyr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/martyr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; + description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; homepage = "http://martyr.sourceforge.net/"; license = stdenv.lib.licenses.lgpl21; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/matio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/matio/default.nix index e12280a088bd..bc629dc25064 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/matio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.17"; + name = "matio-1.5.19"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "00644612zhn53j25vj50q73kmjcrsns2lnmy99y2kavhsckmaiay"; + sha256 = "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mdds/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mdds/default.nix index a65e6b2153d7..b69e99de414d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mdds/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mdds/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, boost }: +{ stdenv, fetchurl, boost, llvmPackages }: stdenv.mkDerivation rec { pname = "mdds"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "0zg0v9rfs92ff1gpnb06gzbxbnd9nqdar5fk8dnkmy0jpnf5qn7i"; + sha256 = "1kzy70b18f2dsqarmdmzbj9nc9kf2lvc5xxgkg6wdax3jf12lsm6"; }; postInstall = '' @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; + buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + checkInputs = [ boost ]; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix index 9fda8091ce47..891e11dbadf9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -8,7 +8,7 @@ , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] -, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] +, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , OpenGL, Xplugin , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light , enableGalliumNine ? stdenv.isLinux @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.1.9"; + version = "20.2.3"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "10kk8a8k7f4ip8yaiqdyrx162nbw8pw4h3b4hs4ha8mpd43wlldj"; + sha256 = "0axqrqg1fas91fx30qjwhcp4yasdvk919hjds4lga7ak247286xf"; }; prePatch = "patchShebangs ."; @@ -58,7 +58,6 @@ stdenv.mkDerivation { ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ./opencl-install-dir.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch - ./link-radv-with-ld_args_build_id.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Fix `-Werror=int-conversion` pthread warnings on musl. @@ -129,7 +128,7 @@ stdenv.mkDerivation { "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" "-Dva-libs-path=${placeholder "drivers"}/lib/dri" "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" - "-Dgallium-nine=${if enableGalliumNine then "true" else "false"}" # Direct3D in Wine + "-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine "-Dosmesa=${if enableOSMesa then "gallium" else "none"}" # used by wine ] ++ optionals stdenv.isLinux [ "-Dglvnd=true" @@ -229,7 +228,7 @@ stdenv.mkDerivation { inherit (libglvnd) driverLink; }; - meta = with stdenv.lib; { + meta = { description = "An open source 3D graphics library"; longDescription = '' The Mesa project began as an open-source implementation of the OpenGL diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index acf3d827c562..fa78f4ae730a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,4 +1,4 @@ -From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001 +From 980164fd92f5c2302624cd046d30ff21e6e4ba8a Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key @@ -12,10 +12,10 @@ timestamps in /nix/store are zero. 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index 1a2dd8ebd12..2ac741af5a6 100644 +index 2d39d13b6ad..daf06480a60 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -348,6 +348,12 @@ option( +@@ -368,6 +368,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -26,13 +26,13 @@ index 1a2dd8ebd12..2ac741af5a6 100644 + description : 'Mesa cache key.' +) option( - 'I-love-half-baked-turnips', + 'prefer-iris', type : 'boolean', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index d1f14736725..2ed328f292e 100644 +index a92d621927a..3bd65c6890c 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -401,8 +401,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -43,7 +43,7 @@ index d1f14736725..2ed328f292e 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -423,6 +425,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -52,22 +52,23 @@ index d1f14736725..2ed328f292e 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index 9da29cc7390..5f549bb1d99 100644 +index 0893f64793b..d46ce85a85f 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -170,7 +170,12 @@ _libmesa_util = static_library( - include_directories : inc_common, +@@ -179,7 +179,12 @@ _libmesa_util = static_library( + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : deps_for_libmesa_util, link_with: libmesa_format, -- c_args : [c_msvc_compat_args, c_vis_args], +- c_args : [c_msvc_compat_args], + c_args : [ -+ c_msvc_compat_args, c_vis_args, ++ c_msvc_compat_args, + '-DDISK_CACHE_KEY="@0@"'.format( + get_option('disk-cache-key') + ), + ], + gnu_symbol_visibility : 'hidden', build_by_default : false ) - -- -2.25.1 +2.28.0 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch deleted file mode 100644 index 0a660332392d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001 -From: David McFarland <corngood@gmail.com> -Date: Sun, 26 Jul 2020 17:29:49 -0300 -Subject: [PATCH] link radv with ld_args_build_id - -This is needed for radv_device_get_cache_uuid to work correctly. ---- - src/amd/vulkan/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build -index eec026e8f60..a07a0821938 100644 ---- a/src/amd/vulkan/meson.build -+++ b/src/amd/vulkan/meson.build -@@ -183,7 +183,7 @@ libvulkan_radeon = shared_library( - ], - c_args : [c_vis_args, no_override_init_args, radv_flags], - cpp_args : [cpp_vis_args, radv_flags], -- link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], -+ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], - link_depends : [libvulkan_radeon_link_depends,], - install : true, - ) --- -2.28.0 diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch index 9685a1619a58..72488893c6b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,18 +9,6 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 -+++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 -@@ -23,7 +23,9 @@ - */ - - #if defined(__linux__) -+#include <sys/types.h> - #include <sys/file.h> -+#include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> - #else --- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -28,6 +28,8 @@ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 997fd2ab6346..7382ed57c640 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.6.4"; + version = "1.6.7"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "0b6ymi2a9is2q6n49dvlnjxknikj0rfff5ygbc4n7894h5mllvvr"; + sha256 = "1ymffs3ixc4vkhpr09ph6xhyknm2cx8ij8j5l70cq6119mwilnwa"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/minixml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/minixml/default.nix index ec575aa08fd0..8938ab90fbc1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/minixml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/minixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mxml"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "mxml"; rev = "v${version}"; - sha256 = "1kv36fxxh7bwfydhb90zjgsrvpyzvx1p5d0ayfvd3j8gip2rjhnp"; + sha256 = "0zvib87rgsib0w9xp6bks5slq5ma1qbgyyyvr23cv7zkbgw3xgil"; }; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 3dcbda68135f..7bcbff78767f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -1,11 +1,30 @@ -{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate -, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg -, fftw, vid-stab, opencv3, ladspa-sdk, genericUpdater, common-updater-scripts +{ stdenv +, fetchFromGitHub +, SDL +, ffmpeg +, frei0r +, libjack2 +, libdv +, libsamplerate +, libvorbis +, libxml2 +, movit +, pkgconfig +, sox +, qtbase +, qtsvg +, fftw +, vid-stab +, opencv3 +, ladspa-sdk +, genericUpdater +, common-updater-scripts +, ladspaPlugins +, mkDerivation +, which }: - let inherit (stdenv.lib) getDev; in - -stdenv.mkDerivation rec { +mkDerivation rec { pname = "mlt"; version = "6.22.1"; @@ -17,17 +36,36 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig qtbase qtsvg sox fftw vid-stab opencv3 + SDL + ffmpeg + frei0r + libjack2 + libdv + libsamplerate + libvorbis + libxml2 + movit + pkgconfig + qtbase + qtsvg + sox + fftw + vid-stab + opencv3 ladspa-sdk + ladspaPlugins ]; + nativeBuildInputs = [ which ]; + outputs = [ "out" "dev" ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ - "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" + "--avformat-swscale" + "--enable-gpl" + "--enable-gpl3" "--enable-opengl" ]; @@ -39,9 +77,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' - wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + qtWrapperArgs = [ + "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" + "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" + ]; + postInstall = '' # Remove an unnecessary reference to movit.dev. s=${movit.dev}/include t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) @@ -69,6 +110,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; - broken = versionAtLeast qtbase.version "5.15"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mm-common/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mm-common/default.nix index 3c02e537d2a3..3981e05ef067 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mm-common/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mm-common/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8"; + sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nanoflann/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nanoflann/default.nix index 8480cc868c1f..3bd6bb02a054 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nanoflann/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nanoflann/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.2"; pname = "nanoflann"; - + src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${version}"; - sha256 = "07vi3yn5y9zk9acdbxy954ghdml15wnyqfizzqwsw8zmc9bf30ih"; + sha256 = "0lq1zqwjvk8wv15hd7aw57jsqbvv45cwb8ngdh1d2iyw5rvnbhsn"; }; buildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nanopb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nanopb/default.nix index cafc5c85f21a..e71d1c6a54c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nanopb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nanopb/default.nix @@ -7,20 +7,20 @@ , stdenv }: -let - pythonRuntime = python3.withPackages(ps: [ ps.protobuf ]); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "nanopb"; - version = "0.4.1"; + version = "0.4.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "16zxk42wzn519bpxf4578qn97k0h1cnbkvqqkqvka9sl0n3lz2dp"; + sha256 = "0nqfi1b0szjmm1z8wd3ks64h10jblv9ip01kfggxgz6qjjfwgvq7"; }; - nativeBuildInputs = [ cmake python3 ]; + nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ]; + + pythonPath = with python3.pkgs; [ python3.pkgs.protobuf six ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,} @@ -28,32 +28,16 @@ in stdenv.mkDerivation rec { "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc" ]; - # On a case-insensitive filesystem (such as on Darwin), CMake fails to create - # the build directory because of the existence of the BUILD file. - # TODO: This can be removed once https://github.com/nanopb/nanopb/pull/537 is merged. - preConfigure = "rm BUILD"; - - # install the generator which requires Python3 with the protobuf package. It - # also requires the nanopb module that's generated by CMake to be in a - # relative location to the generator itself so we move it out of the - # python.sitePackages into the shared generator folder. postInstall = '' mkdir -p $out/share/nanopb/generator/proto - cp ../generator/nanopb_generator.py $out/share/nanopb/generator/nanopb_generator.py - cp ../generator/proto/_utils.py $out/share/nanopb/generator/proto/_utils.py cp ../generator/proto/nanopb.proto $out/share/nanopb/generator/proto/nanopb.proto - mv $out/${python3.sitePackages}/nanopb_pb2.py $out/share/nanopb/generator/proto - rm -rf $out/${python3.sitePackages} - - mkdir $out/bin - substitute ${./protoc-gen-nanopb} $out/bin/protoc-gen-nanopb \ - --subst-var-by python ${pythonRuntime}/bin/python \ - --subst-var-by out $out - chmod +x $out/bin/protoc-gen-nanopb - cp ../pb_common.c ../pb_decode.c ../pb_encode.c $out/include/ ''; + postFixup = '' + wrapPythonPrograms + ''; + passthru.tests = { simple-proto2 = callPackage ./test-simple-proto2 {}; simple-proto3 = callPackage ./test-simple-proto3 {}; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nanopb/protoc-gen-nanopb b/infra/libkookie/nixpkgs/pkgs/development/libraries/nanopb/protoc-gen-nanopb deleted file mode 100644 index 764e6614b18a..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nanopb/protoc-gen-nanopb +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec @python@ @out@/share/nanopb/generator/nanopb_generator.py --protoc-plugin diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nco/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nco/default.nix index 0d98142a0758..5f6c85411b18 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.5"; + version = "4.9.6"; pname = "nco"; nativeBuildInputs = [ flex which ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "0xp377rsamn2hwhzaf0ih70wd5274flpz74grys1b7rpbvbyf1bw"; + sha256 = "0f8vf66700dcr48jqd371bbldc61xkrilby13xp8j5l9q4xal808"; }; prePatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix index d461535ecef0..893f82a6d526 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix @@ -1,24 +1,36 @@ -{ stdenv, fetchFromGitHub, openssl, doxygen -, boost, sqlite, pkgconfig, python, pythonPackages, wafHook }: -let - version = "0.6.3"; -in -stdenv.mkDerivation { +{ stdenv +, fetchFromGitHub +, doxygen +, pkg-config +, python3 +, python3Packages +, wafHook +, boost +, openssl +, sqlite +}: + +stdenv.mkDerivation rec { pname = "ndn-cxx"; - inherit version; + version = "0.7.1"; + src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; - rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00"; - sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h"; + rev = "${pname}-${version}"; + sha256 = "1lcaqc79n3d9sip7knddblba17sz18b0w7nlxmj3fz3lb3z9qd51"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx]; + + nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; + + buildInputs = [ boost openssl sqlite ]; + wafConfigureFlags = [ "--with-openssl=${openssl.dev}" "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" ]; + meta = with stdenv.lib; { homepage = "http://named-data.net/"; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; @@ -36,7 +48,7 @@ stdenv.mkDerivation { and consuming less resources overall. ''; license = licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ maintainers.sjmackenzie ]; + platforms = platforms.unix; + maintainers = with maintainers; [ sjmackenzie ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ndpi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ndpi/default.nix index c10b396fe0b1..43da97c2edd8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ndpi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ndpi/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }: +{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap +, pkg-config }: -let version = "2.8"; in +let version = "3.4"; in stdenv.mkDerivation { pname = "ndpi"; @@ -10,13 +11,16 @@ stdenv.mkDerivation { owner = "ntop"; repo = "nDPI"; rev = version; - sha256 = "0lc4vga89pm954vf92g9fa6xwsjkb13jd6wrcc35zy5j04nf9rzf"; + sha256 = "0xjh9gv0mq0213bjfs5ahrh6m7l7g99jjg8104c0pw54hz0p5pq1"; }; configureScript = "./autogen.sh"; nativeBuildInputs = [which autoconf automake libtool]; - buildInputs = [libpcap]; + buildInputs = [ + libpcap + pkg-config + ]; meta = with stdenv.lib; { description = "A library for deep-packet inspection"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/neatvnc/default.nix index 627f003a7516..db7940536f1b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/neatvnc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/neatvnc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "1h9yc3krhjlyapsjaf6y76546rkqk7ygcjfgm0a9bc0cfvmlb5az"; + sha256 = "1wpq1vyjqra877vwc3n4i0c1dyhmabyn993cslf1k142ikyc0a8w"; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/newt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/newt/default.nix index 0dade017d08f..41d9671b204e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/newt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/newt/default.nix @@ -1,5 +1,8 @@ -{ fetchurl, stdenv, slang, popt }: +{ lib, fetchurl, stdenv, slang, popt, python }: +let + pythonIncludePath = "${lib.getDev python}/include/python"; +in stdenv.mkDerivation rec { pname = "newt"; version = "0.52.21"; @@ -11,9 +14,14 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i -e s,/usr/bin/install,install, -e s,-I/usr/include/slang,, Makefile.in po/Makefile + + substituteInPlace configure \ + --replace "/usr/include/python" "${pythonIncludePath}" + substituteInPlace configure.ac \ + --replace "/usr/include/python" "${pythonIncludePath}" ''; - buildInputs = [ slang popt ]; + buildInputs = [ slang popt python ]; NIX_LDFLAGS = "-lncurses"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nlopt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nlopt/default.nix index e9b89e83907f..64eb6d79abd1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nlopt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nlopt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nlopt"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "stevengj"; repo = pname; rev = "v${version}"; - sha256 = "1k6x14lgyfhfqpbs7xx8mrgklp8l6jkkcs39zgi2sj3kg6n0hdc9"; + sha256 = "0xm8y9cg5p2vgxbn8wn8gqfpxkbm0m4qsidp0bq1dqs8gvj9017v"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/3.44.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/3.44.nix index ad58bfccaee6..1c89dd793316 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/3.44.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/3.44.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ zlib sqlite ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ zlib sqlite ]; propagatedBuildInputs = [ nspr ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/3.53.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/3.53.nix new file mode 100644 index 000000000000..dcd9ade629b7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/3.53.nix @@ -0,0 +1,169 @@ +{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +, # allow FIPS mode. Note that this makes the output non-reproducible. + # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 + enableFIPS ? false +}: + +let + nssPEM = fetchurl { + url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; + sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; + }; + version = "3.53.1"; + underscoreVersion = builtins.replaceStrings ["."] ["_"] version; + +in stdenv.mkDerivation rec { + pname = "nss"; + inherit version; + + src = fetchurl { + url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; + sha256 = "05jk65x3zy6q8lx2djj8ik7kg741n88iy4n3bblw89cv0xkxxk1d"; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; + + buildInputs = [ zlib sqlite ]; + + propagatedBuildInputs = [ nspr ]; + + prePatch = '' + # strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_ + xz -d < ${nssPEM} | sed \ + -e 's/-DIRS = builtins $/-DIRS = . builtins/g' \ + -e 's/CKO_NETSCAPE_/CKO_NSS_/g' \ + -e 's/CKT_NETSCAPE_/CKT_NSS_/g' \ + | patch -p1 + + patchShebangs nss + + for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do + substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env" + done + + substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep" + ''; + + patches = + [ + # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch + ./85_security_load.patch + ./ckpem.patch + ./fix-cross-compilation.patch + ]; + + patchFlags = [ "-p0" ]; + + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" + substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" + ''; + + outputs = [ "out" "dev" "tools" ]; + + preConfigure = "cd nss"; + + buildPhase = let + getArch = platform: if platform.isx86_64 then "x64" + else if platform.isx86_32 then "ia32" + else if platform.isAarch32 then "arm" + else if platform.isAarch64 then "arm64" + else if platform.isPower && platform.is64bit then ( + if platform.isLittleEndian then "ppc64le" else "ppc64" + ) + else platform.parsed.cpu.name; + # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on + target = getArch stdenv.hostPlatform; + host = getArch stdenv.buildPlatform; + in '' + runHook preBuild + + sed -i 's|nss_dist_dir="$dist_dir"|nss_dist_dir="'$out'"|;s|nss_dist_obj_dir="$obj_dir"|nss_dist_obj_dir="'$out'"|' build.sh + ./build.sh -v --opt \ + --with-nspr=${nspr.dev}/include:${nspr.out}/lib \ + --system-sqlite \ + --enable-legacy-db \ + --target ${target} \ + -Dhost_arch=${host} \ + -Duse_system_zlib=1 \ + --enable-libpkix \ + ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \ + ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \ + ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} + + runHook postBuild + ''; + + NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\""; + + installPhase = '' + runHook preInstall + + rm -rf $out/private + find $out -name "*.TOC" -delete + mv $out/public $out/include + + ln -s lib $out/lib64 + + # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672 + # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a + NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'` + NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'` + NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'` + PREFIX="$out" + + mkdir -p $out/lib/pkgconfig + sed -e "s,%prefix%,$PREFIX," \ + -e "s,%exec_prefix%,$PREFIX," \ + -e "s,%libdir%,$PREFIX/lib64," \ + -e "s,%includedir%,$dev/include/nss," \ + -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \ + -e "s,%NSPR_VERSION%,4.16,g" \ + pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc + chmod 0644 $out/lib/pkgconfig/nss.pc + + sed -e "s,@prefix@,$PREFIX," \ + -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \ + -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \ + -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \ + pkg/pkg-config/nss-config.in > $out/bin/nss-config + chmod 0755 $out/bin/nss-config + ''; + + postFixup = let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; + nss = if isCross then buildPackages.nss.tools else "$out"; + in + (stdenv.lib.optionalString enableFIPS ('' + for libname in freebl3 nssdbm3 softokn3 + do '' + + (if stdenv.isDarwin + then '' + libfile="$out/lib/lib$libname.dylib" + DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '' else '' + libfile="$out/lib/lib$libname.so" + LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '') + '' + ${nss}/bin/shlibsign -v -i "$libfile" + done + '')) + + '' + moveToOutput bin "$tools" + moveToOutput bin/nss-config "$dev" + moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example + rm -f "$out"/lib/*.a + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://developer.mozilla.org/en-US/docs/NSS"; + description = "A set of libraries for development of security-enabled client and server applications"; + license = licenses.mpl20; + platforms = platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/default.nix index e9ca475802d6..ef1cef84df5f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -1,11 +1,21 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja }: +{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +, # allow FIPS mode. Note that this makes the output non-reproducible. + # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 + enableFIPS ? false +}: let nssPEM = fetchurl { url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.57"; + + # NOTE: Whenever you updated this version check if the `cacert` package also + # needs an update. You can run the regular updater script for cacerts. + # It will rebuild itself using the version of this package (NSS) and if + # an update is required do the required changes to the expression. + # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert + version = "3.59"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,16 +24,15 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382"; + sha256 = "096fs3z21r171q24ca3rq53p1389xmvqz1f2rpm7nlm8r9s82ag6"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; - buildInputs = [ zlib sqlite ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ zlib sqlite ]; propagatedBuildInputs = [ nspr ]; @@ -68,6 +77,9 @@ in stdenv.mkDerivation rec { else if platform.isx86_32 then "ia32" else if platform.isAarch32 then "arm" else if platform.isAarch64 then "arm64" + else if platform.isPower && platform.is64bit then ( + if platform.isLittleEndian then "ppc64le" else "ppc64" + ) else platform.parsed.cpu.name; # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on target = getArch stdenv.hostPlatform; @@ -84,6 +96,7 @@ in stdenv.mkDerivation rec { -Dhost_arch=${host} \ -Duse_system_zlib=1 \ --enable-libpkix \ + ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \ ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \ ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} @@ -129,7 +142,8 @@ in stdenv.mkDerivation rec { postFixup = let isCross = stdenv.hostPlatform != stdenv.buildPlatform; nss = if isCross then buildPackages.nss.tools else "$out"; - in '' + in + (stdenv.lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 do '' + (if stdenv.isDarwin @@ -142,7 +156,8 @@ in stdenv.mkDerivation rec { '') + '' ${nss}/bin/shlibsign -v -i "$libfile" done - + '')) + + '' moveToOutput bin "$tools" moveToOutput bin/nss-config "$dev" moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ntl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ntl/default.nix index 0d9d39f39581..23d82d4ba2fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ntl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ntl/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "http://www.shoup.net/ntl/"; # also locally at "${src}/doc/tour-changes.html"; changelog = "https://www.shoup.net/ntl/doc/tour-changes.html"; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nuraft/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nuraft/default.nix new file mode 100644 index 000000000000..1554e1678156 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nuraft/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }: + +stdenv.mkDerivation rec { + pname = "nuraft"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "eBay"; + repo = "NuRaft"; + rev = "v${version}"; + sha256 = "sha256-l6rG8f+JAWfAJxEZPKRHZo2k8x9WbtSJC3gGCSMHYfs="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost172 asio openssl zlib ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/eBay/NuRaft"; + description = "C++ implementation of Raft core logic as a replication library"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ wheelsandmetal ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nuspell/default.nix index 7de16c7c1199..3fac1421899a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, pandoc }: stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.1.2"; + version = "4.0.1"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "0wbb6dwmzlsyy224y0liis0azgzwbjdvcyzc31pw1aw6vbp36na6"; + sha256 = "1p90a3wv4b8m5fdpbnr9cyd1x3a504q9rc4cghq02xff63h5gclf"; }; - nativeBuildInputs = [ cmake pkgconfig ronn ]; + nativeBuildInputs = [ cmake pkgconfig pandoc ]; buildInputs = [ boost icu ]; outputs = [ "out" "lib" "dev" "man" ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; maintainers = with maintainers; [ fpletz ]; - license = licenses.gpl3; + license = licenses.lgpl3Plus; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/odpic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/odpic/default.nix index 6c3744493d21..7f27f7d1c179 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "1g2wdchlwdihqj0ynx58nwyrpncxanghlnykgir97p0wimg3hnxl"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ oracle-instantclient ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/olm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/olm/default.nix index 66ed41e8eadb..9efe524b12d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "15l6cf029ghfk5bf8ii6nyy86gc90ji8n5hspjhj1xmzmk61xb4j"; + sha256 = "0iacbi9iibhzifh1bk6bi5xin557lvqmbf4ccsb8drj50dbxjiyr"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index ad311daf1db1..6dc4bd704dd0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "1.6.3"; + version = "1.7"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "1cskqpa14jjgw409wbxw03kpm9a1g6lmmc2fs2916if6xd70xdj3"; + sha256 = "15kanz3zflmxr355dhny4rdycq0ni9iz42vvlblzc5lmj39n84fj"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/oniguruma/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/oniguruma/default.nix index 54b725c99555..44420c85cf55 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/oniguruma/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "onig"; - version = "6.9.5_rev1"; + version = "6.9.6"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "1sx683hbb58gbjvla69n5vxdzwqhjqisqbfkf9xi95wr7p9ycjhl"; + sha256 = "0y0dv6axvjjzi9367xc4q2nvvx58919iyzy25d5022lpz9z569kj"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix deleted file mode 100644 index 06d0d194cd59..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, fetchFromGitHub, glibcLocales -, cmake, python3, libpng, zlib -}: - -stdenv.mkDerivation rec { - pname = "onnxruntime"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "onnxruntime"; - rev = "v${version}"; - sha256 = "0rbk1jbfc447x2wybz2hsba6w1ij0fq21996l52cqv39898lvy9d"; - # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. - # submodules increase src size and compile times significantly - # not currently feasible due to how integrated cmake build is with git - fetchSubmodules = true; - # Remove unicode file names which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalisation. - postFetch = '' - rm -rf $out/winml/test/collateral/models/UnicodePath/ - ''; - }; - - # TODO: build server, and move .so's to lib output - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - python3 # for shared-lib or server - ]; - - buildInputs = [ - # technically optional, but highly recommended - libpng - zlib - ]; - - cmakeDir = "../cmake"; - - cmakeFlags = [ - "-Donnxruntime_USE_OPENMP=ON" - "-Donnxruntime_BUILD_SHARED_LIB=ON" - "-Donnxruntime_ENABLE_LTO=ON" - ]; - - # ContribOpTest.StringNormalizerTest sets locale to en_US.UTF-8" - preCheck = stdenv.lib.optionalString stdenv.isLinux '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - ''; - doCheck = true; - - postInstall = '' - rm -r $out/bin # ctest runner - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Cross-platform, high performance scoring engine for ML models"; - longDescription = '' - ONNX Runtime is a performance-focused complete scoring engine - for Open Neural Network Exchange (ONNX) models, with an open - extensible architecture to continually address the latest developments - in AI and Deep Learning. ONNX Runtime stays up to date with the ONNX - standard with complete implementation of all ONNX operators, and - supports all ONNX releases (1.2+) with both future and backwards - compatibility. - ''; - homepage = "https://github.com/microsoft/onnxruntime"; - changelog = "https://github.com/microsoft/onnxruntime/releases"; - # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; - }; - -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix deleted file mode 100644 index 5f8302aff3c1..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, - libGL, libGLU, libXext, libXmu, libXi, darwin }: - -stdenv.mkDerivation rec { - pname = "opencascade-occt"; - version = "7.3.0p3"; - commit = "V${builtins.replaceStrings ["."] ["_"] version}"; - - src = fetchurl { - name = "occt-${commit}.tar.gz"; - url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; - }; - - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - - meta = with stdenv.lib; { - description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = "https://www.opencascade.org/"; - license = licenses.lgpl21; # essentially... - # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt - # are basically about making the license a little less share-alike. - maintainers = with maintainers; [ amiloradovsky ]; - platforms = platforms.all; - }; - -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix index 42ca50ae8f99..ac2b8ba6d1ed 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opencascade-occt"; - version = "7.4.0p1"; + version = "7.5.0"; commit = "V${builtins.replaceStrings ["."] ["_"] version}"; src = fetchurl { name = "occt-${commit}.tar.gz"; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0b9hs3akx1f3hhg4zdip6qdv04ssqqcf9kk12amkidgvsl73z2hs"; + sha256 = "0bpzpaqki3k6i7xmhan0f1c1fr05smpcmgrp4vh572j61lwpq1r3"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index adeab6b44948..a723ded6bb69 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -34,8 +34,6 @@ , AVFoundation, Cocoa, VideoDecodeAcceleration, CoreMedia, MediaToolbox, bzip2 }: -assert blas.implementation == "openblas" && lapack.implementation == "openblas"; - let version = "4.3.0"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencv/default.nix index 0749ec9e7f30..56414cfa3979 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencv/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "opencv"; - version = "2.4.13"; + version = "2.4.13.7"; src = fetchFromGitHub { - owner = "Itseez"; + owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1k29rxlvrhgc5hadg2nc50wa3d2ls9ndp373257p756a0aividxh"; + sha256 = "062js7zhh4ixi2wk61wyi23qp9zsk5vw24iz2i5fab2hp97y5zq3"; }; patches = @@ -87,6 +87,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ ]; platforms = platforms.linux; - broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/opendht/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/opendht/default.nix index f9b2e07fb423..e160bfb7d367 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.1.4"; + version = "2.1.6"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal"; + sha256 = "0sjb2a3yqnabwgmmn8gapc1dq9m8vp9z8w85zhsj654i5h3gp6zv"; }; nativeBuildInputs = diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/openldap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/openldap/default.nix index 7f9c2dbf3ee9..fdf3298a6fad 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { - name = "openldap-2.4.51"; + pname = "openldap"; + version = "2.4.56"; src = fetchurl { - url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "0qmy2jkk6v9iqwrsdsn8s7lwzaplr01a2mgf21r6nl66lig7g47l"; + url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; + sha256 = "1q0m26kbab96r73y0dll0c36411kvfillal0i75kngy9cc1hwli5"; }; # TODO: separate "out" and "bin" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix index 4ded4770fc81..e2a52a933333 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, + AGL, Carbon, Cocoa, Foundation, jpegSupport ? true, libjpeg, exrSupport ? false, openexr, gifSupport ? true, giflib, @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { ++ lib.optional sdlSupport SDL2 ++ lib.optionals restSupport [ asio boost ] ++ lib.optionals withExamples [ fltk wxGTK ] + ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] ; cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; @@ -68,7 +70,7 @@ stdenv.mkDerivation rec { description = "A 3D graphics toolkit"; homepage = "http://www.openscenegraph.org/"; maintainers = with maintainers; [ aanderse raskin ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; license = "OpenSceneGraph Public License - free LGPL-based license"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/openssl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/openssl/default.nix index 1fc38dd8aaa8..c4a9a4a01808 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -160,8 +160,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1g"; - sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x"; + version = "1.1.1h"; + sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index e03752872f9a..f0c4c47db03b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.11"; + version = "1.0.13"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0f3x5h0hdjiqgjf5mzzlprbhrbyabxllrjmlzgc9fv5rgqyyphj5"; + sha256 = "0znhv7x81bvqijk5xhc5w760d5yy6vr5c2y271wpk9lkmxbbcpl1"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/osip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/osip/default.nix index 24db4c6609b7..8b2dce1d950f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/osip/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/osip/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "0kgnxgzf968kbl6rx3hjsfb3jsg4ydgrsf35gzj319i1f8qjifv1"; + sha256 = "0xdk3cszkzb8nb757gl47slrr13mf6xz43ab4k343fv8llp8pd2g"; }; pname = "libosip2"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index 46f520e41e4a..31a7e7e90867 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Tests run in fakeroot for non-root users + preCheck = '' + if [ "$(id -u)" != "0" ]; then + export FAKED_MODE=1 + fi + ''; + doCheck = !stdenv.isDarwin; installFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pango/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pango/default.nix index e3bdba9b3b1b..b3dd2062ca0b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz -, libintl, gobject-introspection, darwin, fribidi, gnome3 +, libintl, libthai, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib , x11Support? !stdenv.isDarwin, libXft @@ -9,26 +9,15 @@ with stdenv.lib; let pname = "pango"; - version = "1.45.3"; + version = "1.47.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zg6gvzk227q997jf1c9p7j5ra87nm008hlgq6q8na9xmgmw2x8z"; + sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk"; }; - patches = [ - # Fix issue with Pango loading unsupported formats that - # breaks mixed x11/opentype font packages. - # See https://gitlab.gnome.org/GNOME/pango/issues/457 - # Remove on next release. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pango/commit/fe1ee773310bac83d8e5d3c062b13a51fb5fb4ad.patch"; - sha256 = "1px66g31l2jx4baaqi4md59wlmvw0ywgspn6zr919fxl4h1kkh0h"; - }) - ]; - # FIXME: docs fail on darwin outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc"; @@ -39,6 +28,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ fribidi + libthai ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon @@ -50,6 +40,8 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-Dxft=disabled" # only works with x11 ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix index 952987447b22..12def747361b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rhdunn"; repo = "pcaudiolib"; - rev = "${version}"; + rev = version; sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pdal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pdal/default.nix index 4fbf5df07746..4405d3812b76 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pdal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pdal/default.nix @@ -3,7 +3,7 @@ , fetchpatch , cmake , pkg-config -# , openscenegraph +, openscenegraph , curl , gdal , hdf5-cpp @@ -20,34 +20,22 @@ stdenv.mkDerivation rec { pname = "pdal"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = version; - sha256 = "0zb3zjqgmjjryb648c1hmwh1nfa7893bjzbqpmr6shjxvzgnj9p6"; + sha256 = "1i7nbfvv60jjlf3iq7a7xci4dycmg2wrd35dqvjwl6hpfynpb6wz"; }; - patches = [ - # Fix duplicate paths like - # /nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0//nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0/lib - # similar to https://github.com/NixOS/nixpkgs/pull/82654. - # TODO Remove on release > 2.1.0 - (fetchpatch { - name = "pdal-Fixup-install-config.patch"; - url = "https://github.com/PDAL/PDAL/commit/2f887ef624db50c6e20f091f34bb5d3e65b5c5c8.patch"; - sha256 = "0pdw9v5ypq7w9i7qzgal110hjb9nqi386jvy3x2h4vf1dyalzid8"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - # openscenegraph + openscenegraph curl gdal hdf5-cpp @@ -68,11 +56,6 @@ stdenv.mkDerivation rec { "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" "-DBUILD_PLUGIN_TILEDB=ON" - # Plugins that can probably be made working relatively easily: - # As of writing, seems to be incompatible (build error): - # error: no matching function for call to 'osg::TriangleFunctor<pdal::CollectTriangles>::operator()(const Vec3&, const Vec3&, const Vec3&)' - "-DBUILD_PLUGIN_OPENSCENEGRAPH=OFF" # requires OpenGL - # Plugins can probably not be made work easily: "-DBUILD_PLUGIN_CPD=OFF" "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/default.nix index bb43604db0c5..85ba37a9d8a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "4.11.1"; meta = { - homepage = "https://phonon.kde.org/"; + homepage = "https://community.kde.org/Phonon"; description = "Multimedia API for Qt"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 2bc5b12dfb77..68e07e7b42dd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.042"; + version = "1.045"; src = fetchurl { url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "0cc8dn6g7adj2pgs8hvczg68i3xhlk6978m4gxamgibilf9jw1av"; + sha256 = "1y45jx7i30ik2pjv33y16fi5i5jpmi0zp1jh32pwywd3diaiazv6"; }; buildInputs = [ fastjet ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 97822d769dd5..dc809d589321 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -38,6 +38,9 @@ # For enablePython , boost , python3 + +# For tests +, callPackage }: let @@ -45,12 +48,12 @@ let in stdenv.mkDerivation rec { - version = "10.6.2"; + version = "10.6.3"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p02.tar.gz"; - sha256 = "0vznm3pjlbihjy1wsxc4gj229k0dzc283wvil2xghyl08vwdpnpc"; + url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p03.tar.gz"; + sha256 = "1wzv5xky1pfm7wdfdkvqcaaqlcnsrz35dc7zcrxh8l3j5rki6pqb"; }; boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; @@ -108,6 +111,8 @@ stdenv.mkDerivation rec { inherit stdenv fetchurl; geant_version = version; }; + + tests = callPackage ./tests.nix {}; }; # Set the myriad of envars required by Geant4 if we use a nix-shell. diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/tests.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/tests.nix new file mode 100644 index 000000000000..83afee6089d4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/tests.nix @@ -0,0 +1,31 @@ +{ stdenv, cmake, geant4 }: + +{ + example_B1 = stdenv.mkDerivation { + name = "${geant4.name}-test-example_B1"; + + inherit (geant4) src; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ geant4 ]; + checkInputs = with geant4.data; [ + G4EMLOW + G4ENSDFSTATE + G4PARTICLEXS + G4PhotonEvaporation + ]; + + prePatch = '' + cd examples/basic/B1 + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + + ./exampleB1 ../run2.mac + + runHook postCheck + ''; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix index c12526223938..1c17b318c9dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "QCDNUM is a very fast QCD evolution program written in FORTRAN77"; + description = "A very fast QCD evolution program written in FORTRAN77"; license = stdenv.lib.licenses.gpl3; homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html"; platforms = stdenv.lib.platforms.unix; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index 1a8d5a6fd390..273566adc03f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "12msmjiajvy2xj2m64n2fxblai5xg06a829wi7scsc7nw2jhxpfr"; + sha256 = "03hm7hax0n5irqi0kzjag6fyr9zws9jqz95hr8afpikwkcfa894x"; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix index 1dbfe0647f47..eaedc2c0ac3e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, alsaLib, ffmpeg_3, libjack2, udev, libva, xorg +, glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsaLib ffmpeg_3 libjack2 udev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch new file mode 100644 index 000000000000..c657d12f7d0c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index ffee41b4..f3e4ec74 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,7 +53,7 @@ endif + + spa_plugindir = join_paths(pipewire_libdir, spa_name) + +-alsadatadir = join_paths(pipewire_datadir, 'alsa-card-profile', 'mixer') ++alsadatadir = join_paths(pipewire_libdir, '..', 'share', 'alsa-card-profile', 'mixer') + + pipewire_headers_dir = join_paths(pipewire_name, 'pipewire') + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/default.nix index cb5073f50c15..d07c77f4e2eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -1,89 +1,141 @@ { stdenv +, lib , fetchFromGitLab , fetchpatch +, removeReferencesTo , meson , ninja +, systemd , pkgconfig , doxygen , graphviz , valgrind , glib , dbus -, gst_all_1 , alsaLib -, ffmpeg_3 , libjack2 , udev , libva -, xorg -, sbc -, SDL2 , libsndfile -, bluez , vulkan-headers , vulkan-loader -, libpulseaudio , makeFontsConf +, callPackage +, nixosTests +, gstreamerSupport ? true, gst_all_1 ? null +, ffmpegSupport ? true, ffmpeg ? null +, bluezSupport ? true, bluez ? null, sbc ? null +, nativeHspSupport ? true +, ofonoSupport ? true +, hsphfpdSupport ? true }: let fontsConf = makeFontsConf { fontDirectories = []; }; + + mesonBool = b: if b then "true" else "false"; in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.7"; + version = "0.3.17"; - outputs = [ "out" "lib" "dev" "doc" ]; + outputs = [ + "out" + "lib" + "pulse" + "jack" + "dev" + "doc" + "installedTests" + ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "04l66p0wj553gp2zf3vwwh6jbr1vkf6wrq4za9zlm9dn144am4j2"; + sha256 = "1gzdahji23fsgjycc08h7zzv8filmzdrkyvpkljc881l4cb5l58n"; }; + patches = [ + # Break up a dependency cycle between outputs. + ./alsa-profiles-use-libdir.patch + # Move installed tests into their own output. + ./installed-tests-path.patch + # Change the path of the pipewire-pulse binary in the service definition. + ./pipewire-pulse-path.patch + # Add flag to specify configuration directory (different from the installation directory). + ./pipewire-config-dir.patch + ]; + nativeBuildInputs = [ doxygen graphviz meson ninja pkgconfig - valgrind ]; buildInputs = [ - SDL2 alsaLib - bluez dbus - ffmpeg_3 glib - gst_all_1.gst-plugins-base - gst_all_1.gstreamer libjack2 - libpulseaudio libsndfile - libva - sbc udev vulkan-headers vulkan-loader - xorg.libX11 - ]; + valgrind + systemd + ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optionals bluezSupport [ bluez sbc ]; mesonFlags = [ "-Ddocs=true" "-Dman=false" # we don't have xmltoman - "-Dgstreamer=true" + "-Dexamples=true" # only needed for `pipewire-media-session` + "-Dudevrulesdir=lib/udev/rules.d" + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dpipewire_pulse_prefix=${placeholder "pulse"}" + "-Dlibjack-path=${placeholder "jack"}/lib" + "-Dgstreamer=${mesonBool gstreamerSupport}" + "-Dffmpeg=${mesonBool ffmpegSupport}" + "-Dbluez5=${mesonBool bluezSupport}" + "-Dbluez5-backend-native=${mesonBool nativeHspSupport}" + "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" + "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" + "-Dpipewire_config_dir=/etc/pipewire" ]; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file doCheck = true; + postInstall = '' + moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" + moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" + moveToOutput "bin/pipewire-pulse" "$pulse" + ''; + + passthru.tests = { + installedTests = nixosTests.installed-tests.pipewire; + + # This ensures that all the paths used by the NixOS module are found. + test-paths = callPackage ./test-paths.nix { + paths-out = [ + "share/alsa/alsa.conf.d/50-pipewire.conf" + ]; + paths-lib = [ + "lib/alsa-lib/libasound_module_pcm_pipewire.so" + "share/alsa-card-profile/mixer" + ]; + }; + }; + meta = with stdenv.lib; { description = "Server and user space API to deal with multimedia pipelines"; homepage = "https://pipewire.org/"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch new file mode 100644 index 000000000000..2a92711626bf --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch @@ -0,0 +1,29 @@ +diff --git a/meson.build b/meson.build +index ffee41b4..bab6f019 100644 +--- a/meson.build ++++ b/meson.build +@@ -318,8 +318,8 @@ alsa_dep = (get_option('pipewire-alsa') + ? dependency('alsa', version : '>=1.1.7') + : dependency('', required: false)) + +-installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name) +-installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name) ++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', pipewire_name) ++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', pipewire_name) + installed_tests_enabled = get_option('installed_tests') + installed_tests_template = files('template.test.in') + +diff --git a/meson_options.txt b/meson_options.txt +index f03033c3..32df6c53 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,6 +18,9 @@ option('installed_tests', + description: 'Install manual and automated test executables', + type: 'boolean', + value: false) ++option('installed_test_prefix', ++ description: 'Prefix for installed tests', ++ type: 'string') + option('gstreamer', + description: 'Build GStreamer plugins', + type: 'boolean', diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-config-dir.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-config-dir.patch new file mode 100644 index 000000000000..ad1ae93684b1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-config-dir.patch @@ -0,0 +1,30 @@ +diff --git a/meson.build b/meson.build +index 0073eb13..0ffc6863 100644 +--- a/meson.build ++++ b/meson.build +@@ -34,7 +34,10 @@ pipewire_libexecdir = join_paths(prefix, get_option('libexecdir')) + pipewire_localedir = join_paths(prefix, get_option('localedir')) + pipewire_sysconfdir = join_paths(prefix, get_option('sysconfdir')) + +-pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire') ++pipewire_configdir = get_option('pipewire_config_dir') ++if pipewire_configdir == '' ++ pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire') ++endif + modules_install_dir = join_paths(pipewire_libdir, pipewire_name) + + if host_machine.system() == 'linux' +diff --git a/meson_options.txt b/meson_options.txt +index 4b9e46b8..8c301459 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -56,6 +56,9 @@ option('pipewire-pulseaudio', + option('libpulse-path', + description: 'Where to install the libpulse.so library', + type: 'string') ++option('pipewire_config_dir', ++ type : 'string', ++ description : 'Directory for pipewire configuration (defaults to /etc/pipewire)') + option('spa-plugins', + description: 'Enable spa plugins integration', + type: 'boolean', diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch new file mode 100644 index 000000000000..6ac86b111eef --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch @@ -0,0 +1,24 @@ +diff --git a/meson_options.txt b/meson_options.txt +index 4b9e46b8..9d73ed06 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -147,3 +147,6 @@ option('pw-cat', + option('udevrulesdir', + type : 'string', + description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') ++option('pipewire_pulse_prefix', ++ type : 'string', ++ description : 'Install directory for the pipewire-pulse daemon') +diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build +index 29fc93d4..f78946f2 100644 +--- a/src/daemon/systemd/user/meson.build ++++ b/src/daemon/systemd/user/meson.build +@@ -6,7 +6,7 @@ install_data( + + systemd_config = configuration_data() + systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire')) +-systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse')) ++systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse')) + + configure_file(input : 'pipewire.service.in', + output : 'pipewire.service', diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix new file mode 100644 index 000000000000..0ae693741946 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix @@ -0,0 +1,23 @@ +{ lib, runCommand, pipewire, paths-out, paths-lib }: + +let + check-path = output: path: '' + if [[ ! -f "${output}/${path}" && ! -d "${output}/${path}" ]]; then + printf "Missing: %s\n" "${output}/${path}" | tee -a $out + error=error + else + printf "Found: %s\n" "${output}/${path}" | tee -a $out + fi + ''; + + check-output = output: lib.concatMapStringsSep "\n" (check-path output); +in runCommand "pipewire-test-paths" { } '' + touch $out + + ${check-output pipewire.lib paths-lib} + ${check-output pipewire paths-out} + + if [[ -n "$error" ]]; then + exit 1 + fi +'' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix index 8366c37e5054..cb8e05b6a76e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.26"; + version = "1.27"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "15n3vy1v5gian0gh5y7vq5a6n3fngfwb41sbvrlwbjw0yh23sb1b"; + sha256 = "1idrqip59bqzcgddpnk2inin5n5yn4y0dmcyaggfpdishraiqgd5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pmix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pmix/default.nix index c8d8be4e8cbf..60215c9531c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, perl, autoconf, automake -, libtool, flex, libevent, hwloc, munge, zlib +, libtool, flex, libevent, hwloc, munge, zlib, pandoc } : let - version = "3.1.5"; + version = "3.2.1"; in stdenv.mkDerivation { pname = "pmix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "0fvfsig20amcigyn4v3gcdxc0jif44vqg37b8zzh0s8jqqj7jz5w"; + sha256 = "0c9q9a18kdilj6ddqlsvalyv4js79qvslnccn79xl2gl3wm3lyzh"; }; postPatch = '' @@ -21,7 +21,7 @@ in stdenv.mkDerivation { patchShebangs ./config ''; - nativeBuildInputs = [ perl autoconf automake libtool flex ]; + nativeBuildInputs = [ pandoc perl autoconf automake libtool flex ]; buildInputs = [ libevent hwloc munge zlib ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit/default.nix index 43dc2550b12b..6aea70530143 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, expat, pam, perl, fetchpatch -, intltool, spidermonkey_60 , gobject-introspection, libxslt, docbook_xsl, dbus +, intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind , withIntrospection ? true @@ -19,11 +19,11 @@ in stdenv.mkDerivation rec { pname = "polkit"; - version = "0.116"; + version = "0.118"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz"; - sha256 = "1c9lbpndh5zis22f154vjrhnqw65z8s85nrgl42v738yf6g0q5w8"; + sha256 = "0swmg37jsxsxfsd2b3qm0l3zxr9ldvhpjw8lsgq3j8q7wy2fjm3d"; }; patches = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { [ glib gtk-doc pkgconfig intltool perl ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = - [ expat pam spidermonkey_60 ] + [ expat pam spidermonkey_78 ] # On Linux, fall back to elogind when systemd support is off. ++ stdenv.lib.optional stdenv.isLinux (if useSystemd then systemd else elogind) ++ stdenv.lib.optional withIntrospection gobject-introspection; @@ -102,6 +102,10 @@ stdenv.mkDerivation rec { inherit doCheck; checkInputs = [ dbus ]; checkPhase = '' + # unfortunately this test needs python-dbusmock, but python-dbusmock needs polkit, + # leading to a circular dependency + substituteInPlace test/Makefile --replace polkitbackend "" + # tests need access to the system bus dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check' ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/precice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/precice/default.nix index d8501428079b..e8ae15ed31f4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "1268dz39sx3gygnm7vpg59k1wdhy6rhf72i8i0kz4jckll0s9102"; + sha256 = "180db4nlir2409wzdnsc1bkyrllnki8d551qbm1rg82zkz3vdmqg"; }; cmakeFlags = [ "-DPRECICE_PETScMapping=OFF" "-DBUILD_SHARED_LIBS=ON" "-DPYTHON_LIBRARIES=${python3.libPrefix}" - "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m" + "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" ]; NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix index 550d0b1bace2..9d7bb38cf3c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/2.5.nix @@ -7,4 +7,4 @@ callPackage ./generic.nix (args // rec { url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; }; -})
\ No newline at end of file +}) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix index 3e3740a7c501..8499ac069e84 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.13.0"; - sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd"; + version = "3.13.0.1"; + sha256 = "1r3hvbvjjww6pdk0mlg1lym7avxn8851xm8dg98bf4zq4vyrcw12"; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/3.14.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/3.14.nix new file mode 100644 index 000000000000..82896b0dadee --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/protobuf/3.14.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.14.0"; + sha256 = "1k4kkb78kdbz732wsph07v3zy3cz7l1msk2byrfvp0nb02sfl3a4"; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix index fdc35f149a33..43da67d3d9b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-iodbc=${libiodbc}" ]; meta = with stdenv.lib; { - homepage = "http://psqlodbc.projects.postgresql.org/"; + homepage = "https://odbc.postgresql.org/"; description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pugixml/default.nix index 8bd861540688..7436641a2fe6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -1,34 +1,41 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: +{ stdenv, lib, fetchFromGitHub, cmake, check, validatePkgConfig, shared ? false }: stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.9"; + version = "1.11"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv"; + sha256 = "0q620bfd9lnph68jhqn7iv9bqmks7qk90riq6f6nr4kqc4xnravd"; }; - patches = [ - # To be removed after a version newer than 1.9 is released - (fetchpatch { - url = "https://github.com/zeux/pugixml/pull/193.patch"; - sha256 = "0s4anqlr2ppfibxyl29nrqbcprrg89k7il6303dm91s6620ydmka"; - }) + outputs = if shared then [ "out" "dev" ] else [ "out" ]; + + nativeBuildInputs = [ cmake validatePkgConfig ]; + + cmakeFlags = [ + "-DBUILD_TESTS=ON" + "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; - nativeBuildInputs = [ cmake ]; + checkInputs = [ check ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; + # Hack to be able to run the test, broken because we use + # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install + preCheck = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + '' else '' + export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + ''; preConfigure = '' # Enable long long support (required for filezilla) sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; homepage = "https://pugixml.org"; license = licenses.mit; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pupnp/default.nix index 192ed56d4562..4930b222d03c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pupnp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pupnp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; meta = { - description = "libupnp, an open source UPnP development kit for Linux"; + description = "An open source UPnP development kit for Linux"; longDescription = '' The Linux SDK for UPnP Devices (libupnp) provides developers diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 9405e18edabd..a427bd5d0518 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "10.0.1"; + version = "10.0.4"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "release-qpdf-${version}"; - sha256 = "0g3rqf4wd1n9cms7ra1jnszsgw5bygv37jq2l20d8z5fajckhyyi"; + sha256 = "1jqijnni2pmbbdk2g3pi14178j7mls8dj2bcwf1lds5ar0ghsagc"; }; nativeBuildInputs = [ perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qrencode/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qrencode/default.nix index 83d2db6a26b9..2c60c4c10d07 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qrencode/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qrencode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qrencode"; - version = "4.0.2"; + version = "4.1.1"; outputs = [ "bin" "out" "man" "dev" ]; src = fetchurl { url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; - sha256 = "079v3a15ydpr67zdi3xbgvic8n2kxvi0m32dyz8jaik10yffgayv"; + sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4="; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qrupdate/default.nix index 424502dce0d4..90d4cb45ce2a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qrupdate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qrupdate/default.nix @@ -3,25 +3,35 @@ , gfortran , blas , lapack +, which }: -stdenv.mkDerivation { - name = "qrupdate-1.1.2"; + +stdenv.mkDerivation rec { + pname = "qrupdate"; + version = "1.1.2"; src = fetchurl { - url = "mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz"; + url = "mirror://sourceforge/qrupdate/${pname}-${version}.tar.gz"; sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; }; - configurePhase = - '' - export PREFIX=$out - sed -i -e 's,^BLAS=.*,BLAS=-L${blas}/lib -lblas,' \ - -e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \ - Makeconf - '' - + stdenv.lib.optionalString blas.isILP64 - '' - sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/' - ''; + preBuild = + # Check that blas and lapack are compatible + assert (blas.isILP64 == lapack.isILP64); + # We don't have structuredAttrs yet implemented, and we need to use space + # seprated values in makeFlags, so only this works. + '' + makeFlagsArray+=( + "LAPACK=-L${lapack}/lib -llapack" + "BLAS=-L${blas}/lib -lblas" + "PREFIX=${placeholder "out"}" + ${stdenv.lib.optionalString blas.isILP64 + # Use their FFLAGS along with `-fdefault-integer-8`. If another + # application intends to use arpack, it should add this to it's FFLAGS as + # well. Otherwise (e.g): https://savannah.gnu.org/bugs/?50339 + "FFLAGS=-fimplicit-none -O3 -funroll-loops -fdefault-integer-8" + } + ) + ''; doCheck = true; @@ -31,12 +41,15 @@ stdenv.mkDerivation { installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; - buildInputs = [ gfortran blas lapack ]; + buildInputs = [ gfortran ]; + + nativeBuildInputs = [ which ]; meta = with stdenv.lib; { description = "Library for fast updating of qr and cholesky decompositions"; homepage = "https://sourceforge.net/projects/qrupdate/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ doronbehar ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index fcceb6d6cf2b..04cb0ea9a119 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -55,6 +55,10 @@ let ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch ./qtbase.patch.d/0002-qtbase-mac.patch ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch + + # Patch framework detection to support X.framework/X.tbd, + # extending the current support for X.framework/X. + ./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch ] ++ [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch @@ -97,6 +101,15 @@ let url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) + + # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 + (fetchpatch { + name = "qtwebengine-bison-3.7-build.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; + sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) ] ++ optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-darwin-fix-failed-static-assertion.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch new file mode 100644 index 000000000000..8a5939978a6b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch @@ -0,0 +1,15 @@ +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 84dbbfebd4..615bfed124 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) + if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") + set(Qt5Gui_${_cmake_lib_name}_LIBRARY) + endif() ++ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") ++ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") ++ set(Qt5Gui_${_cmake_lib_name}_LIBRARY) ++ endif() + !!ENDIF + if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) + # The above find_library call doesn\'t work for finding diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index 469157a5f727..b4486bf025d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix @@ -54,7 +54,14 @@ let qtbase = optionals stdenv.isDarwin [ ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - ./qtbase.patch.d/0002-qtbase-mac.patch + + # Downgrade minimal required SDK to 10.12 + ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch + ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch + + # Patch framework detection to support X.framework/X.tbd, + # extending the current support for X.framework/X. + ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch ] ++ [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch @@ -70,7 +77,16 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ ] + qtwebengine = [ + # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 + (fetchpatch { + name = "qtwebengine-bison-3.7-build.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; + sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ (fetchpatch { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch index 0951b6646ab7..0f38ce0d7f61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -309,10 +309,8 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -deleted file mode 100644 -index c40f58c987..0000000000 --- a/mkspecs/features/mac/sdk.mk -+++ /dev/null ++++ b/mkspecs/features/mac/sdk.mk @@ -1,25 +0,0 @@ - -ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch deleted file mode 100644 index 2e28466c5032..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch +++ /dev/null @@ -1,116 +0,0 @@ -From ccaa916eab33093704293bc911eedd85fbe5f160 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> -Date: Fri, 3 Apr 2020 21:15:27 +0200 -Subject: [PATCH 02/10] qtbase-mac - ---- - src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- - src/testlib/qappletestlogger.cpp | 2 +- - src/testlib/qappletestlogger_p.h | 2 +- - src/testlib/qtestcase.cpp | 2 +- - src/testlib/qtestlog.cpp | 2 +- - src/testlib/qtestlog_p.h | 2 +- - 6 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h -index 535d3579b2..3d70bf39c1 100644 ---- a/src/corelib/kernel/qcore_mac_p.h -+++ b/src/corelib/kernel/qcore_mac_p.h -@@ -225,7 +225,7 @@ private: - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include <os/activity.h> -@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp -index dfeadebdef..2a74330c1d 100644 ---- a/src/testlib/qappletestlogger.cpp -+++ b/src/testlib/qappletestlogger.cpp -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h -index 62c6d95c5a..f8e0a3b767 100644 ---- a/src/testlib/qappletestlogger_p.h -+++ b/src/testlib/qappletestlogger_p.h -@@ -57,7 +57,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - class QAppleTestLogger : public QAbstractTestLogger - { - public: -diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp -index 70733a692a..8bcda17858 100644 ---- a/src/testlib/qtestcase.cpp -+++ b/src/testlib/qtestcase.cpp -@@ -852,7 +852,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool - - bool addFallbackLogger = !explicitLoggerRequested; - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - // Any explicitly requested loggers will be added by now, so we can check if they use stdout - const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); - if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { -diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp -index f3ebf343c5..9b4f526b2e 100644 ---- a/src/testlib/qtestlog.cpp -+++ b/src/testlib/qtestlog.cpp -@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) - case QTestLog::TAP: - logger = new QTapTestLogger(filename); - break; --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - case QTestLog::Apple: - logger = new QAppleTestLogger; - break; -diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h -index fff36f290d..f737ccf064 100644 ---- a/src/testlib/qtestlog_p.h -+++ b/src/testlib/qtestlog_p.h -@@ -72,7 +72,7 @@ public: - - enum LogMode { - Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - , Apple - #endif - #if defined(HAVE_XCTEST) --- -2.25.1 - diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch new file mode 100644 index 000000000000..8a5939978a6b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch @@ -0,0 +1,15 @@ +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 84dbbfebd4..615bfed124 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) + if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") + set(Qt5Gui_${_cmake_lib_name}_LIBRARY) + endif() ++ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") ++ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") ++ set(Qt5Gui_${_cmake_lib_name}_LIBRARY) ++ endif() + !!ENDIF + if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) + # The above find_library call doesn\'t work for finding diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch new file mode 100644 index 000000000000..a43a46d8a69b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch @@ -0,0 +1,16 @@ +diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm +index a367487e..c3aeca1d 100644 +--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm ++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm +@@ -49,6 +49,11 @@ + // but was only added in the 10.14 SDK, so declare it just in case. + extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space); + ++// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html ++#if !defined(kIOSurfaceSuccess) ++#define kIOSurfaceSuccess KERN_SUCCESS ++#endif ++ + QT_BEGIN_NAMESPACE + + Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface"); diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch new file mode 100644 index 000000000000..b2dff5aba8f6 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch @@ -0,0 +1,77 @@ +diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf +--- a/mkspecs/common/macx.conf ++++ b/mkspecs/common/macx.conf +@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64 + + # Should be 10.15, but as long as the CI builds with + # older SDKs we have to keep this. +-QT_MAC_SDK_VERSION_MIN = 10.14 ++QT_MAC_SDK_VERSION_MIN = 10.12 + + QT_MAC_SDK_VERSION_MAX = 10.15 + +diff --git a/src/corelib/kernel/qcore_mac_objc.mm b/src/corelib/kernel/qcore_mac_objc.mm +--- a/src/corelib/kernel/qcore_mac_objc.mm ++++ b/src/corelib/kernel/qcore_mac_objc.mm +@@ -142,16 +142,10 @@ QMacAutoReleasePool::QMacAutoReleasePool() + + #ifdef QT_DEBUG + void *poolFrame = nullptr; +- if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) { +- void *frame; +- if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1)) +- poolFrame = frame; +- } else { + static const int maxFrames = 3; + void *callstack[maxFrames]; + if (backtrace(callstack, maxFrames) == maxFrames) + poolFrame = callstack[maxFrames - 1]; +- } + + if (poolFrame) { + Dl_info info; +diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp +--- a/src/gui/rhi/qrhi.cpp ++++ b/src/gui/rhi/qrhi.cpp +@@ -4050,7 +4050,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh + #endif + case Metal: + //#ifdef Q_OS_DARWIN +-#ifdef Q_OS_MACOS ++#if 0 + r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params), + static_cast<QRhiMetalNativeHandles *>(importDevice)); + break; +diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri +--- a/src/gui/rhi/rhi.pri ++++ b/src/gui/rhi/rhi.pri +@@ -44,7 +44,7 @@ win32 { + } + + # darwin { +-macos { ++false { + HEADERS += \ + rhi/qrhimetal_p.h \ + rhi/qrhimetal_p_p.h +diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm +--- a/src/plugins/platforms/cocoa/qcocoadrag.mm ++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm +@@ -134,7 +134,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) + NSImage *nsimage = qt_mac_create_nsimage(pm); + [nsimage setSize:NSSizeFromCGSize(pmDeviceIndependentSize.toCGSize())]; + +- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); ++ QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND); + m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); + dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); + +@@ -145,7 +145,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) + CGFloat flippedY = pmDeviceIndependentSize.height() - hotSpot.y(); + event_location.y -= flippedY; + NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0); +- NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; ++ NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; + + [theWindow dragImage:nsimage + at:event_location diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 1a90c610a5b5..b4e3d681c749 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -54,7 +54,14 @@ let qtbase = optionals stdenv.isDarwin [ ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - ./qtbase.patch.d/0002-qtbase-mac.patch + + # Downgrade minimal required SDK to 10.12 + ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch + ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch + + # Patch framework detection to support X.framework/X.tbd, + # extending the current support for X.framework/X. + ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch ] ++ [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch @@ -70,7 +77,16 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ ] + qtwebengine = [ + # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 + (fetchpatch { + name = "qtwebengine-bison-3.7-build.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; + sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] ++ optionals stdenv.isDarwin [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch index ba4c54b228c8..3a2900abdd6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -309,10 +309,8 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -deleted file mode 100644 -index c40f58c987..0000000000 --- a/mkspecs/features/mac/sdk.mk -+++ /dev/null ++++ b/mkspecs/features/mac/sdk.mk @@ -1,25 +0,0 @@ - -ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch deleted file mode 100644 index 4271b64679d7..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch +++ /dev/null @@ -1,118 +0,0 @@ -From a9ba67d3db7390d9ddc46751346e70b0a522711a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> -Date: Fri, 3 Apr 2020 21:15:27 +0200 -Subject: [PATCH 02/11] qtbase-mac - ---- - src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- - src/testlib/qappletestlogger.cpp | 2 +- - src/testlib/qappletestlogger_p.h | 2 +- - src/testlib/qtestcase.cpp | 2 +- - src/testlib/qtestlog.cpp | 2 +- - src/testlib/qtestlog_p.h | 4 ++-- - 6 files changed, 20 insertions(+), 8 deletions(-) - -diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h -index 535d3579b2..3d70bf39c1 100644 ---- a/src/corelib/kernel/qcore_mac_p.h -+++ b/src/corelib/kernel/qcore_mac_p.h -@@ -225,7 +225,7 @@ private: - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include <os/activity.h> -@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp -index dfeadebdef..2a74330c1d 100644 ---- a/src/testlib/qappletestlogger.cpp -+++ b/src/testlib/qappletestlogger.cpp -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h -index 62c6d95c5a..f8e0a3b767 100644 ---- a/src/testlib/qappletestlogger_p.h -+++ b/src/testlib/qappletestlogger_p.h -@@ -57,7 +57,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - class QAppleTestLogger : public QAbstractTestLogger - { - public: -diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp -index f45999c7fa..d5b525dc12 100644 ---- a/src/testlib/qtestcase.cpp -+++ b/src/testlib/qtestcase.cpp -@@ -849,7 +849,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool - - bool addFallbackLogger = !explicitLoggerRequested; - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - // Any explicitly requested loggers will be added by now, so we can check if they use stdout - const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); - if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { -diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp -index a388780532..63ab965101 100644 ---- a/src/testlib/qtestlog.cpp -+++ b/src/testlib/qtestlog.cpp -@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) - case QTestLog::TAP: - logger = new QTapTestLogger(filename); - break; --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - case QTestLog::Apple: - logger = new QAppleTestLogger; - break; -diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h -index ddaf14ed9b..0c49c93a88 100644 ---- a/src/testlib/qtestlog_p.h -+++ b/src/testlib/qtestlog_p.h -@@ -74,8 +74,8 @@ public: - Q_DISABLE_COPY_MOVE(QTestLog) - - enum LogMode { -- Plain = 0, XML, LightXML, JUnitXML, CSV, TeamCity, TAP --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+ Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - , Apple - #endif - #if defined(HAVE_XCTEST) --- -2.25.4 - diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch new file mode 100644 index 000000000000..8a5939978a6b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch @@ -0,0 +1,15 @@ +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 84dbbfebd4..615bfed124 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) + if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") + set(Qt5Gui_${_cmake_lib_name}_LIBRARY) + endif() ++ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") ++ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") ++ set(Qt5Gui_${_cmake_lib_name}_LIBRARY) ++ endif() + !!ENDIF + if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) + # The above find_library call doesn\'t work for finding diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch new file mode 100644 index 000000000000..a43a46d8a69b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch @@ -0,0 +1,16 @@ +diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm +index a367487e..c3aeca1d 100644 +--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm ++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm +@@ -49,6 +49,11 @@ + // but was only added in the 10.14 SDK, so declare it just in case. + extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space); + ++// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html ++#if !defined(kIOSurfaceSuccess) ++#define kIOSurfaceSuccess KERN_SUCCESS ++#endif ++ + QT_BEGIN_NAMESPACE + + Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface"); diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch new file mode 100644 index 000000000000..3638268de7af --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch @@ -0,0 +1,77 @@ +diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf +--- a/mkspecs/common/macx.conf ++++ b/mkspecs/common/macx.conf +@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64 + + # Should be 10.15, but as long as the CI builds with + # older SDKs we have to keep this. +-QT_MAC_SDK_VERSION_MIN = 10.14 ++QT_MAC_SDK_VERSION_MIN = 10.12 + + QT_MAC_SDK_VERSION_MAX = 10.15 + +diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm +--- a/src/corelib/kernel/qcore_mac.mm ++++ b/src/corelib/kernel/qcore_mac.mm +@@ -261,16 +261,10 @@ QMacAutoReleasePool::QMacAutoReleasePool() + + #ifdef QT_DEBUG + void *poolFrame = nullptr; +- if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) { +- void *frame; +- if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1)) +- poolFrame = frame; +- } else { + static const int maxFrames = 3; + void *callstack[maxFrames]; + if (backtrace(callstack, maxFrames) == maxFrames) + poolFrame = callstack[maxFrames - 1]; +- } + + if (poolFrame) { + Dl_info info; +diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp +--- a/src/gui/rhi/qrhi.cpp ++++ b/src/gui/rhi/qrhi.cpp +@@ -4251,7 +4251,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh + break; + #endif + case Metal: +-#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) ++#if 0 + r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params), + static_cast<QRhiMetalNativeHandles *>(importDevice)); + break; +diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri +--- a/src/gui/rhi/rhi.pri ++++ b/src/gui/rhi/rhi.pri +@@ -43,7 +43,7 @@ win32 { + LIBS += -ld3d11 -ldxgi -ldxguid + } + +-macos|ios { ++false { + HEADERS += \ + rhi/qrhimetal_p.h \ + rhi/qrhimetal_p_p.h +diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm +--- a/src/plugins/platforms/cocoa/qcocoadrag.mm ++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm +@@ -133,7 +133,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) + NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()]; + Q_ASSERT(dragImage); + +- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); ++ QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND); + m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); + dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); + +@@ -144,7 +144,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) + CGFloat flippedY = dragImage.size.height - hotSpot.y(); + event_location.y -= flippedY; + NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0); +- NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; ++ NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; + + [theWindow dragImage:dragImage + at:event_location diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 049b0349a4f8..b98b711c0f5d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,5 +1,5 @@ -{ qtModule, qtCompatVersion, - qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel +{ qtModule +, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel , bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which @@ -38,30 +38,11 @@ qtModule { # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; - patches = [ - # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 - (fetchpatch { - name = "qtwebengine-bison-3.7-build.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; - sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - }) - ]; - postPatch = # Patch Chromium build tools '' ( cd src/3rdparty/chromium; patchShebangs . ) '' - # Patch Chromium build files - + optionalString (lib.versionOlder qtCompatVersion "5.12") '' - substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - '' # Prevent Chromium build script from making the path to `clang` relative to # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` # from `src/core/config/mac_osx.pri`. @@ -91,10 +72,10 @@ qtModule { '' # Following is required to prevent a build error: # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it - + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") '' + + '' substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ --replace '$sysroot/usr' "${darwin.xnu}" - '') + '' + '' # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 388665f5aabd..916e381ab4da 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.0.6"; + version = "6.3.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0g3f18530w5f8dlzrh45k868hspga5p3m8qpz7pcg3nsdjda8cwz"; + sha256 = "sha256-vHx2JMPqioY8jUpBOIFdhhN1mIUV3LS8ayQOo3g7bY0="; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index 308fadbdfd8e..7b3d5b3db16f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.4.4"; + version = "1.5.2"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "0y4m29wyvhhxb7fap9z07zwgcqlr4ifwynf8a7yp5ldjpzfzxpix"; + sha256 = "0qm9rvvkqypqh0vpgkrlqgaxkqdvs3finpr5niwxc6ypblc3ir1g"; }; nativeBuildInputs = [ pkgconfig ]; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ boothead ]; + maintainers = with maintainers; [ commandodev ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/redkite/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/redkite/default.nix index be6bf0d7fa0a..af8a1a914e4b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/redkite/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/redkite/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "redkite"; - version = "1.0.3"; + version = "1.2.0"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "1m2db7c791fi33snkjwnvlxapmf879g5r8azlkx7sr6vp2s0jq2k"; + sha256 = "0c5k0a6ydb8szdgniqsva8l9j2sishlhsww13b3a9grvr7hb2bpq"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ cairo ]; - meta = { + meta = with stdenv.lib; { homepage = "https://gitlab.com/iurie-sw/redkite"; description = "A small GUI toolkit"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.magnetophon ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/relibc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/relibc/default.nix index 43e02fc87586..cedffcaaef9f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/relibc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/relibc/default.nix @@ -7,10 +7,10 @@ let ]; bootstrapCrossRust = stdenvNoCC.mkDerivation { name = "binary-redox-rust"; - - src = fetchTarball { - name = "redox-rust-toolchain-bin.tar.gz"; - url = "https://www.dropbox.com/s/33r92en0t47l1ei/redox-rust-toolchain-bin.tar.gz?dl=1"; + + src = buildPackages.fetchzip { + name = "redox-rust-toolchain.tar.gz"; + url = "https://www.dropbox.com/s/qt7as0j7cwnin8z/redox-rust-toolchain.tar.gz?dl=1"; sha256 = "1g17qp2q6b88p04yclkw6amm374pqlakrmw9kd86vw8z4g70jkxm"; }; @@ -63,7 +63,8 @@ redoxRustPlatform.buildRustPackage rec { DESTDIR=$out make install ''; - TARGET = buildPackages.rust.toRustTarget stdenvNoCC.targetPlatform; + # TODO: should be hostPlatform + TARGET = buildPackages.rust.toRustTargetSpec stdenvNoCC.targetPlatform; cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix index efc8857e235e..9ec9eabebebb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rnnoise-plugin"; - version = "0.9"; + version = "0.91"; src = fetchFromGitHub { owner = "werman"; repo = "noise-suppression-for-voice"; rev = "v${version}"; - sha256 = "18bq5b50xw3d4r1ildinafpg3isb9y216430h4mm9wr3ir7h76a7"; + sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc"; }; buildInputs = [ cmake ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/werman/noise-suppression-for-voice"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ panaeon ]; + maintainers = with maintainers; [ panaeon henrikolsson ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocclr/default.nix index 2034b658dc7f..55b2f0ff1868 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocclr/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - sha256 = "05vh70qh6jb7038b1rcmz24bg4an0nw98bv2vn3jcyygj4dr3fmf"; + hash = "sha256-P36JKFgXSZagWzHB6WB2WlDu7jkVvfYVo1BaV0b8iEk="; }; nativeBuildInputs = [ cmake rocm-cmake ]; @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { ]; preFixup = '' + # Work around broken cmake files ln -s $out/include/compiler/lib/include/* $out/include + ln -s $out/include/elf/elfio $out/include/elfio + substituteInPlace $out/lib/cmake/rocclr/ROCclrConfig.cmake \ --replace "/build/source/build" "$out" ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 9bc3770f21e0..f17a114216bd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -8,39 +8,33 @@ , snappy , zlib , zstd +, enableJemalloc ? false, jemalloc , enableLite ? false +, enableShared ? true }: stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.10.2"; + version = "6.14.6"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1"; + sha256 = "0cp0jgzwkwamykgnmsg0zvzakq58f1ihs7lslnn4nh4p9gm75rq5"; }; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ bzip2 lz4 snappy zlib zstd ]; + propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ]; - patches = [ - # Without this change private dependencies are exported. - # Can be removed after the next release. - # https://github.com/facebook/rocksdb/pull/6790 - (fetchpatch { - url = "https://github.com/facebook/rocksdb/commit/07204837ce8d66e1e6e4893178f3fd040f9c1044.patch"; - sha256 = "17097ybkhy0i089zzkpvcj65c7g5skvjvdzi1k09x4i1d719wm39"; - }) - ]; + buildInputs = stdenv.lib.optional enableJemalloc jemalloc; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; cmakeFlags = [ "-DPORTABLE=1" - "-DWITH_JEMALLOC=0" + "-DWITH_JEMALLOC=${if enableJemalloc then "1" else "0"}" "-DWITH_JNI=0" "-DWITH_BENCHMARK_TOOLS=0" "-DWITH_TESTS=1" @@ -58,7 +52,7 @@ stdenv.mkDerivation rec { "-DFORCE_SSE42=1") (stdenv.lib.optional enableLite "-DROCKSDB_LITE=1") "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}" - ]; + ] ++ stdenv.lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = stdenv.lib.optional stdenv.hostPlatform.isWindows "format"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix index 916af5434996..e6546e0d3361 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - sha256 = "05gs282kqnz7lf3b8r1908zk05dbzdx02ar2ns2900fas1l27qc1"; + hash = "sha256-JMzXg1Hw0iWcTnKu/NgW7rD8iagp724F01GaJbrJj9M="; }; sourceRoot = "source/lib/comgr"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix index bf302ff227c5..54c7cb9a10b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - sha256 = "0kgsp22rbg09q09n36j1vfs9v8x0liap3ycnqyn1g7dxy38kqmi4"; + hash = "sha256-IAE8T/gmotXO/ADH3bxTjrpxWd2lRoj3o/rrSaEFNNo="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 6504ae100434..4681267da18a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - sha256 = "07zc6ww92nsq1z0gcp1sfhqsk0jkrjnv9cnw5akh471f7n7jiznm"; + hash = "sha256-kW5jTDlQtXQ0i4ADJEnmESxjcLCt4QZCYJ1ouIsk4YE="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix index 57635a3470cb..4df954f4b258 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - sha256 = "1lm4cbx1d727zll85vjc1kykc72mk82nfhyyhjljv82gd4mnz00c"; + hash = "sha256-8hNb0Yo9ApedOG7xrUr5rwiA/YsqDTcyr6dBRg8lXro="; }; sourceRoot = "source/src"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ clang-unwrapped elfutils llvm ]; cmakeFlags = [ - "-DBITCODE_DIR=${rocm-device-libs}/lib" + "-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode" "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix index ba780ae4bd6b..bf0a05fe73e8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - sha256 = "00xrwxndah2frdggqniz1j4s46ha3dav8qlnxm3gk9m4b80m774k"; + hash = "sha256-FLH+GHXA0zepbR1wPPSez/hx1hiG2kkCTneDKhJJRjU="; }; preConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index 7ee63e9bb413..9da6595e7a43 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.10.2"; + version = "1.11"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0f8rglbvf4aaw41i2sxlpq7pvhly93sjqiz0l4q3hwki5zg47dg3"; + sha256 = "1mrq4mihzx37yqhj3sfz6da6mw49niia808bzsw2gkkgmadxvyng"; }; # perl is only used during the check phase. diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix new file mode 100644 index 000000000000..7e73354363ea --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -0,0 +1,49 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, csxcad +, tinyxml +, vtkWithQt5 +, qtbase +}: + +mkDerivation { + pname = "qcsxcad"; + version = "unstable-2020-01-04"; + + src = fetchFromGitHub { + owner = "thliebig"; + repo = "QCSXCAD"; + rev = "0dabbaf2bc1190adec300871cf309791af842c8e"; + sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DCSXCAD_ROOT_DIR=${csxcad}" + "-DENABLE_RPATH=OFF" + ]; + + buildInputs = [ + csxcad + tinyxml + vtkWithQt5 + qtbase + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Qt library for CSXCAD"; + homepage = "https://github.com/thliebig/QCSXCAD"; + license = licenses.gpl3; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix index 42ba4f25204e..3943c4dbbcaa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix @@ -17,13 +17,13 @@ let blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "blis"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "flame"; repo = "blis"; rev = version; - sha256 = "13g9kg7x8j9icg4frdq3wpl2cmp0jnh93mw48daa7ym399w17423"; + sha256 = "0fp0nskydan3i7sj7qkabwc9sjh7mw73pjpgzh50qchkkcv0s3n1"; }; inherit blas64; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix index 90d7357cc07e..175de67ad7ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.8"; + version = "1.2.10"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y"; + sha256 = "1qg6ssp87rb8p37kahxmm88fbxqg6r540cky5v7wq7l19n2b1bss"; }; # FIXME package boost-test and enable checks @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BRiAl/BRiAl"; description = "Legacy version of PolyBoRi maintained by sagemath developers"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix index e56952abcb28..7fe80c323f68 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { easy to use. ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix index 9495366eaaa8..d99149c0e965 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix @@ -79,7 +79,7 @@ in rec { sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0"; }; - cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1; + cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2; cudnn_cudatoolkit_11_0 = generic rec { version = "8.0.2"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix index 327fea3955d2..32fb70978cf9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sagemath/FlintQS"; description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix index 3f00547efcec..6f80e1fd23e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"; description = "A program for calculating with L-functions"; license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix index 2c6bc4c8711e..36d4ad54c3df 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { A library to compute several properties of braids, including centralizer and conjugacy check. ''; license = licenses.gpl3; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix index d9b50a0fb2d1..788f534cc779 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/miguelmarco/libhomfly/"; description = "Library to compute the homfly polynomial of knots and links"; license = licenses.unlicense; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 3ae462705868..7c78f61af694 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -12,9 +12,9 @@ }: let - version = "1.6.0"; + version = "1.7.0"; device = if cudaSupport then "cuda" else "cpu"; - srcs = import ./binary-hashes.nix; + srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; in stdenv.mkDerivation { inherit version; @@ -45,6 +45,14 @@ in stdenv.mkDerivation { # We do not care about Java support... rm -f $out/lib/lib*jni* 2> /dev/null || true + + # Fix up library paths for split outputs + substituteInPlace $dev/share/cmake/Torch/TorchConfig.cmake \ + --replace \''${TORCH_INSTALL_PREFIX}/lib "$out/lib" \ + + substituteInPlace \ + $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \ + --replace \''${_IMPORT_PREFIX}/lib "$out/lib" \ ''; postFixup = let @@ -100,7 +108,7 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - passthru.tests = callPackage ./test { }; + passthru.tests.cmake = callPackage ./test { }; meta = with stdenv.lib; { description = "C++ API of the PyTorch machine learning framework"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 92a2e05e0ba3..6048fe8676b7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,14 +1,14 @@ -{ +version: { x86_64-darwin-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.6.0.zip"; - sha256 = "0d4n7la31qzl4s9pwvm07la7q6lhcwiww0yjpfz3kw6nvx84p22r"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip"; + sha256 = "1912lklil0i7i10j1fm4qzcq96cc8c281l9fn5gfbwa2wwry0r59"; }; x86_64-linux-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.6.0%2Bcpu.zip"; - sha256 = "1975b4zvyihzh89vnwspw0vf9qr05sxj8939vcrlmv3gzvdspcxz"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip"; + sha256 = "0jdd7bjcy20xz2gfv8f61zdrbzxz5425bnqaaqgrwpzvd45ay8px"; }; x86_64-linux-cuda = { - url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip"; - sha256 = "127qnfyi1faqbm40sbnsyqxjhrqj82bzwqyz7c1hs2bm0zgrrpya"; + url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip"; + sha256 = "1ag6lvf3a400ivqq4g9cxpmxzlfrga0y5ssjy0rfpw6i1xljibn6"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt index b302449ef772..4e96704a4c17 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.0) find_package(Torch REQUIRED) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}") add_executable(test test.cpp) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix index d661ec28db98..e69807871f46 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -6,16 +6,12 @@ stdenv.mkDerivation { src = ./.; - postPatch = '' - cat CMakeLists.txt - ''; - - makeFlags = [ "VERBOSE=1" ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ libtorch-bin ]; + doCheck = true; + installPhase = '' touch $out ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp index 5537724ce5f6..ca238fba521d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp @@ -1,7 +1,20 @@ -#include <torch/torch.h> +#undef NDEBUG +#include <cassert> + #include <iostream> +#include <torch/torch.h> + int main() { torch::Tensor tensor = torch::eye(3); - std::cout << tensor << std::endl; + + float checkData[] = { + 1, 0, 0, + 0, 1, 0, + 0, 0, 1 + }; + + torch::Tensor check = torch::from_blob(checkData, {3, 3}); + + assert(tensor.allclose(check)); } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix index d8b4cbbffb48..f50c15abbdf1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://malb.bitbucket.io/m4ri/"; description = "Library to do fast arithmetic with dense matrices over F_2"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix index e1f86b346d7f..532285991a3c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { It uses the M4RI library, implementing the same operations over the finite field F2. ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix index 2079ace021b6..b4ac119ce6cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "2.5.3"; +let version = "2.5.4"; in stdenv.mkDerivation { pname = "magma"; inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; - sha256 = "1xjy3irdx0w1zyhvn4x47zni5fwsh6z97xd4yqldz8zrm5lx40n6"; + sha256 = "0rrvd21hczxlm8awc9z54fj7iqpjmsb518fy32s6ghz0g90znd3p"; name = "magma-${version}.tar.gz"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 2be3baed4497..1887d53e3066 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,5 @@ -{ stdenvNoCC +{ callPackage +, stdenvNoCC , fetchurl , rpmextract , undmg @@ -19,12 +20,11 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 year = if stdenvNoCC.isDarwin then "2019" else "2020"; - spot = if stdenvNoCC.isDarwin then "3" else "3"; - rel = if stdenvNoCC.isDarwin then "199" else "279"; + spot = if stdenvNoCC.isDarwin then "3" else "4"; + rel = if stdenvNoCC.isDarwin then "199" else "304"; - # Replace `openmpSpot` by `spot` after 2020.3. Release 2020.03 - # adresses performance regressions and does not update OpenMP. - openmpSpot = if stdenvNoCC.isDarwin then spot else "2"; + # Replace `openmpSpot` by `spot` after 2020. + openmpSpot = if stdenvNoCC.isDarwin then spot else "3"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; @@ -46,8 +46,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_${version}.tgz"; - sha256 = "013shn3c823bjfssq4jyl3na5lbzj99s09ds608ljqllri7473ib"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/l_mkl_${version}.tgz"; + hash = "sha256-IxTUZTaXTb0I8qTk+emhVdx+eeJ5jHTn3fqtAKWRfqU="; }); nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin @@ -90,7 +90,8 @@ in stdenvNoCC.mkDerivation { substituteInPlace $f \ --replace "prefix=<INSTALLDIR>/mkl" "prefix=$out" \ --replace $\{MKLROOT} "$out" \ - --replace "lib/intel64_lin" "lib" + --replace "lib/intel64_lin" "lib" \ + --replace "lib/intel64" "lib" done for f in $(find opt/intel -name 'mkl*iomp.pc') ; do @@ -156,6 +157,8 @@ in stdenvNoCC.mkDerivation { dontStrip = true; dontPatchELF = true; + passthru.tests.pkg-config = callPackage ./test { }; + meta = with stdenvNoCC.lib; { description = "Intel Math Kernel Library"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix new file mode 100644 index 000000000000..688c0ec7c399 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkg-config, mkl }: + +stdenv.mkDerivation { + pname = "mkl-test"; + version = mkl.version; + + src = ./.; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ mkl ]; + + doCheck = true; + + buildPhase = '' + # Check regular Nix build. + gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + + # Clear flags to ensure that we are purely relying on options + # provided by pkg-config. + NIX_CFLAGS_COMPILE="" \ + NIX_LDFLAGS="" \ + gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + ''; + + installPhase = '' + touch $out + ''; + + checkPhase = '' + ./test + ''; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/test/test.c b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/test/test.c new file mode 100644 index 000000000000..9413ac0c68e9 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/mkl/test/test.c @@ -0,0 +1,12 @@ +#include <assert.h> + +#include <mkl_cblas.h> + +int main() { + float u[] = {1., 2., 3.}; + float v[] = {4., 5., 6.}; + + float dp = cblas_sdot(3, u, 1, v, 1); + + assert(dp == 32.); +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch deleted file mode 100644 index 1da1f3fb3190..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6cb9aa7c69c20a677ca9fb1bc5fa1580e3236fbd Mon Sep 17 00:00:00 2001 -From: Tom Hall <tahall256@protonmail.ch> -Date: Sat, 14 Mar 2020 11:55:45 +0000 -Subject: [PATCH] Disable optimised aarch64 dgemm_beta pending fix - -Identified as source of https://github.com/xianyi/OpenBLAS/issues/2496, -but not yet fixed. ---- - kernel/arm64/KERNEL.ARMV8 | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kernel/arm64/KERNEL.ARMV8 b/kernel/arm64/KERNEL.ARMV8 -index fe32d313..33d12f94 100644 ---- a/kernel/arm64/KERNEL.ARMV8 -+++ b/kernel/arm64/KERNEL.ARMV8 -@@ -102,7 +102,6 @@ CDOTKERNEL = zdot.S - ZDOTKERNEL = zdot.S - DSDOTKERNEL = dot.S - --DGEMM_BETA = dgemm_beta.S - SGEMM_BETA = sgemm_beta.S - - SGEMMKERNEL = sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N).S --- -2.24.1 - diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index b03e2b3a8ca8..d670a40f321d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -106,7 +106,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.10"; + version = "0.3.12"; outputs = [ "out" "dev" ]; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b"; + sha256 = "0mk1kjkr96bvvcq2zigzjrs0cnhwsf6gfi0855mp9yifn8lvp20y"; }; inherit blas64; @@ -144,12 +144,6 @@ stdenv.mkDerivation rec { buildPackages.stdenv.cc ]; - # Disable an optimisation which seems to cause issues, pending an - # upstream fix: https://github.com/xianyi/OpenBLAS/issues/2496 - patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ - ./0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch - ]; - makeFlags = mkMakeFlagsFromConfig (config // { FC = "${stdenv.cc.targetPrefix}gfortran"; CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 560f39e4e99a..17197823d6ef 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.1"; + version = "0.7.3"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "0yg8sfibr38hpb4s5ri7i0ivp96c7khdwhlxngjiymvl3jvm5cnl"; + sha256 = "0m3khv7qidhfly634bf5w0ci5qnvndmihc4a836a0cy047pw9g6k"; }; makeFlags = [ "prefix=$(out)" ]; meta = { description = "High quality system independent, portable, open source libm implementation"; - homepage = "https://www.openlibm.org/"; + homepage = "https://openlibm.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.lib.platforms.all; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix index 97023d07c7f3..8f24356c7336 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices"; + description = "An MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"; platforms = platforms.all; license = licenses.unfree; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index 82a0d063570d..608064353ca7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.13.4"; + version = "3.14.1"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1n2paqw5c0ja392s1qhp7q2ypwav8s5drxxz2w5m2cn31vbspy1c"; + sha256 = "1y3fhg0l69qp9qn6vjyqdhqhhbvsa7jp8g7zcm0pwzm7gkcldqnx"; }; nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix index 7767e23934cf..b1d6a072e130 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite"; description = "A library for implementing graph algorithms"; license = licenses.bsd3; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix index ded7b7dc90ac..53f4313a2069 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Calculates rank-width and rank-decompositions"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix index 6eeaddba0418..44f8150386e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { gpl2 # Michael Reid's and Eric Dietz software mit # Dik T. Winter's software ]; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix index 953f5a70b8aa..c55a1b8002e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { ./spooles.patch ]; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace makefile --replace '-Wl,-soname' '-Wl,-install_name' + ''; + buildPhase = '' make lib ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch index c0c93c9365c9..71fb4a7f44e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch @@ -166,7 +166,7 @@ index f014c7d..7c8042a 100755 #cd MPI ; make lib -#cd MT ; make lib + cd MT ; make lib -+ gcc -shared */*/*.lo -Wl,-soname,libspooles.so.2.2 -o libspooles.so.2.2 -lpthread -lm ++ $(CC) -shared */*/*.lo -Wl,-soname,libspooles.so.2.2 -o libspooles.so.2.2 -lpthread -lm + ln -s libspooles.so.2.2 libspooles.so global : diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index d50e065efc61..2e76050aa989 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -4,14 +4,15 @@ , blas, lapack , metis , fixDarwinDylibNames -, gnum4 +, gmp +, mpfr , enableCuda ? false , cudatoolkit }: stdenv.mkDerivation rec { pname = "suitesparse"; - version = "5.7.2"; + version = "5.8.1"; outputs = [ "out" "dev" "doc" ]; @@ -19,17 +20,19 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${version}"; - sha256 = "1imndff7yygjrbbrcscsmirdi8w0lkwj5dbhydxmf7lklwn4j3q6"; + sha256 = "0qjlyfxs8s48rs63c2fzspisgq1kk4bwkgnhmh125hgkdhrq2w1c"; }; nativeBuildInputs = [ - gnum4 ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ + # Use compatible indexing for lapack and blas used + buildInputs = assert (blas.isILP64 == lapack.isILP64); [ blas lapack metis gfortran.cc.lib + gmp + mpfr ] ++ stdenv.lib.optional enableCuda cudatoolkit; preConfigure = '' @@ -41,8 +44,6 @@ stdenv.mkDerivation rec { "INSTALL=${placeholder "out"}" "INSTALL_INCLUDE=${placeholder "dev"}/include" "JOBS=$(NIX_BUILD_CORES)" - "BLAS=-lblas" - "LAPACK=-llapack" "MY_METIS_LIB=-lmetis" ] ++ stdenv.lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" @@ -50,7 +51,13 @@ stdenv.mkDerivation rec { "CUDA_PATH=${cudatoolkit}" "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so" "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: + # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.8.1/SuiteSparse_config/SuiteSparse_config.mk#L368 + "BLAS=-lblas" + "LAPACK=-llapack" + ] + ; buildFlags = [ # Build individual shared libraries, not demos diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix index ae7a7c778de0..a83e2c835461 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { fullName = "Custom, BSD-like. See COPYING file."; free = true; }; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix index a94a52936e8f..0d1a331798cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/"; description = "Polynomial arithmetic over Z/nZ"; license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix index 73be2a8ca6c2..b611a2baf8e2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -26,7 +26,7 @@ # All modules can be enabled by choosing 'all_modules'. # we include here the DCE mandatory ones -, modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"] +, modules ? [ "core" "network" "internet" "point-to-point" "point-to-point-layout" "fd-net-device" "netanim" ] , lib }: @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "ns-3"; - version = "30"; + version = "32"; src = fetchFromGitLab { owner = "nsnam"; repo = "ns-3-dev"; rev = "ns-3.${version}"; - sha256 = "0smdi3gglmafpc7a20hj2lbmwks3d5fpsicpn39lmm3svazw0bvp"; + sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k"; }; nativeBuildInputs = [ wafHook ]; @@ -60,6 +60,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs doc/ns3_html_theme/get_version.sh + # FIX/Remove when https://github.com/NixOS/nixpkgs/pull/69310 gets merged + sed -i 's/program.ns3_module_dependencies.copy()/program.ns3_module_dependencies[:]/g' wscript ''; wafConfigureFlags = with stdenv.lib; [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix index 9b699035bf9f..e918a3b3d1d2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.93"; + version = "0.1.94"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0h9c1xs0sab23labh8m3ar6kvzfldv2id2f17icja61ihyw06nrd"; + sha256 = "sha256:11cqw4hx33gw2jmrg11jyp7fj9pwzwjwzqcn24jfsbgh6n8gks5x"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/simpleitk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/simpleitk/default.nix index 319f955b9584..e6b013aa1370 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/simpleitk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/simpleitk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simpleitk"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "1nf3cl3ywqg04446xhkb97kcashrgibsihxn2sqrs81i9d0rw5kn"; + sha256 = "1q51jmd6skrr31avxlrxx433lawc838ilzrj5vvv38a9f4gl45v8"; }; nativeBuildInputs = [ cmake swig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/skalibs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/skalibs/default.nix index 1628120ca583..a691107f9a1d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/skalibs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.9.2.1"; - sha256 = "0ff551181vv9d1z5sv7yg6n4b88ajcdircs4p4nif4yl7nsrj2r5"; + version = "2.9.3.0"; + sha256 = "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph"; description = "A set of general-purpose C programming libraries"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix index e6095ca82c53..188405365cd3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.2.4"; + name = "socket_wrapper-1.2.5"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "07m0g5sxjl15h8h95ppf42mkilp9h1xc9camryg8l9bw8b2v8m4a"; + sha256 = "1wb3gq0rj5h92mhq6f1hb2qy4ypkxvn8y87ag88c7gc71nkpa1fx"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix index 6758bf7a459f..f8b1c1028520 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, glib, openssl, pkgconfig }: +{ stdenv, fetchFromGitHub, glib, openssl, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { - name = "sofia-sip-1.12.11"; + pname = "sofia-sip"; + version = "1.13.2"; - src = fetchurl { - url = "mirror://sourceforge/sofia-sip/${name}.tar.gz"; - sha256 = "10bwsdfijpbk9ahlfpk94kzdapxiahl9mljpgwghvq1630pbq09b"; + src = fetchFromGitHub { + owner = "freeswitch"; + repo = pname; + rev = "v${version}"; + sha256 = "01xj30hhm1ji76igkqkn63rw42vvzq3azkr9qz6fy83iwqaybgyn"; }; buildInputs = [ glib openssl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; meta = with stdenv.lib; { description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; - homepage = "http://sofia-sip.sourceforge.net/"; + homepage = "https://github.com/freeswitch/sofia-sip"; platforms = platforms.linux; license = licenses.lgpl2; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/soil/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/soil/default.nix index cf0896170c17..dcec1c897b3b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/soil/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/soil/default.nix @@ -1,28 +1,45 @@ -{ stdenv, fetchurl, unzip, mesa, libX11, libGL }: +{ stdenv, lib +, Carbon +, fetchzip +, libGL +, libX11 +}: stdenv.mkDerivation { name = "soil"; - src = fetchurl { - url = "http://www.lonesock.net/files/soil.zip"; - sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52"; + src = fetchzip { + url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip"; + sha256 = "1c05nwbnfdgwaz8ywn7kg2xrcvrcbpdyhcfkkiiwk69zvil0pbgd"; }; - buildInputs = [ unzip mesa libGL libX11 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ + Carbon + ] else [ + libGL + libX11 + ]; - sourceRoot = "Simple OpenGL Image Library/projects/makefile"; - preBuild = "mkdir obj"; - preInstall = "mkdir -p $out/lib $out/include"; - makeFlags = [ "LOCAL=$(out)" ]; + buildPhase = '' + cd src + $CC $NIX_CFLAGS_COMPILE -c *.c + $AR rcs libSOIL.a *.o + ''; + installPhase = '' + mkdir -p $out/lib $out/include/SOIL + cp libSOIL.a $out/lib/ + cp SOIL.h $out/include/SOIL/ + ''; - meta = { - description = "Simple OpenGL Image Library"; + meta = with lib; { + description = "Simple OpenGL Image Library"; longDescription = '' SOIL is a tiny C library used primarily for uploading textures into OpenGL. ''; - homepage = "https://www.lonesock.net/soil.html"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.linux; + homepage = "https://www.lonesock.net/soil.html"; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/sope/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/sope/default.nix index 59205a949e48..b24b0b9bcd4b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -41,7 +41,7 @@ gnustep.stdenv.mkDerivation rec { ''; meta = { - description = "SOPE is an extensive set of frameworks which form a complete Web application server environment"; + description = "An extensive set of frameworks which form a complete Web application server environment"; license = licenses.publicDomain; homepage = "https://github.com/inverse-inc/sope"; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/soundtouch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/soundtouch/default.nix index 71c7915c2ede..b29095f7e199 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/soundtouch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/soundtouch/default.nix @@ -2,23 +2,26 @@ stdenv.mkDerivation rec { pname = "soundtouch"; - version = "2.1.2"; + version = "2.2"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "174wgm3s0inmbnkrlnspxjwm2014qhjhkbdqa5r8rbfi0nzqxzsz"; + sha256 = "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p"; }; nativeBuildInputs = [ autoconf automake libtool ]; preConfigure = "./bootstrap"; + enableParallelBuilding = true; + meta = with lib; { description = "A program and library for changing the tempo, pitch and playback rate of audio"; - homepage = "http://www.surina.net/soundtouch/"; - license = licenses.lgpl21; + homepage = "https://www.surina.net/soundtouch/"; + license = licenses.lgpl21Plus; platforms = platforms.all; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/spandsp/3.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/spandsp/3.nix new file mode 100644 index 000000000000..ac587f0492b0 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/spandsp/3.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }: +stdenv.mkDerivation rec { + version = "3.0.0"; + pname = "spandsp"; + src = fetchFromGitHub { + owner = "freeswitch"; + repo = pname; + rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags + sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook ]; + propagatedBuildInputs = [ audiofile libtiff ]; + + meta = { + description = "A portable and modular SIP User-Agent with audio and video support"; + homepage = "https://github.com/freeswitch/spandsp"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ ajs124 ]; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/spdlog/default.nix index 22266bfd4b01..2022ec7caaa5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -15,7 +15,12 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" ]; + cmakeFlags = [ + "-DSPDLOG_BUILD_SHARED=ON" + "-DSPDLOG_BUILD_EXAMPLE=OFF" + "-DSPDLOG_BUILD_BENCH=OFF" + "-DSPDLOG_BUILD_TESTS=ON" + ]; outputs = [ "out" "doc" ]; @@ -24,6 +29,9 @@ let cp -rv ../example $out/share/doc/spdlog ''; + doCheck = true; + preCheck = "export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH"; + meta = with stdenv.lib; { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; @@ -35,8 +43,8 @@ let in { spdlog_1 = generic { - version = "1.7.0"; - sha256 = "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j"; + version = "1.8.1"; + sha256 = "sha256-EyZhYgcdtZC+vsOUKShheY57L0tpXltduHWwaoy6G9k="; }; spdlog_0 = generic { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/speechd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/speechd/default.nix index fbf399cb246e..483b8eeb2065 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/speechd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/speechd/default.nix @@ -7,7 +7,7 @@ , itstool , libtool , texinfo -, utillinux +, util-linux , autoreconfHook , glib , dotconf @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit utillinux; + utillinux = util-linux; }) ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix deleted file mode 100644 index d0100edd345b..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, unzip, sqlite, tcl }: - -let - archiveVersion = import ./archive-version.nix stdenv.lib; -in - -stdenv.mkDerivation rec { - pname = "sqlite-analyzer"; - version = "3.33.0"; - - src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ]; - - makeFlags = [ "sqlite3_analyzer" ]; - - installPhase = "install -Dt $out/bin sqlite3_analyzer"; - - meta = with stdenv.lib; { - description = "A tool that shows statistics about SQLite databases"; - downloadPage = "http://sqlite.org/download.html"; - homepage = "https://www.sqlite.org"; - license = licenses.publicDomain; - maintainers = with maintainers; [ pesterhazy ]; - platforms = platforms.unix; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/srt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/srt/default.nix index 32c3135cd4f8..6947c674a914 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/srt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "01xaq44j95kbgqfl41pnybvqy0yq6wd4wdw88ckylzf0nzp977xz"; + sha256 = "01nx3a35hzq2x0dvp2n2b86phpdy1z83kdraag7aq3hmc7f8iagg"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/sundials/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/sundials/default.nix index e1b4d375282e..2e1fd527e9a7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -7,9 +7,8 @@ , gfortran , suitesparse , lapackSupport ? true -, kluSupport ? true }: - -assert (!blas.isILP64) && (!lapack.isILP64); +, kluSupport ? true +}: stdenv.mkDerivation rec { pname = "sundials"; @@ -17,11 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ python - ] ++ stdenv.lib.optionals (lapackSupport) [ - gfortran - blas - lapack ] + ++ stdenv.lib.optionals (lapackSupport) + # Check that the same index size is used for both libraries + (assert (blas.isILP64 == lapack.isILP64); [ + gfortran + blas + lapack + ]) # KLU support is based on Suitesparse. # It is tested upstream according to the section 1.1.4 of # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) @@ -47,17 +49,22 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" ] ++ stdenv.lib.optionals (lapackSupport) [ - "-DSUNDIALS_INDEX_TYPE=int32_t" "-DLAPACK_ENABLE=ON" "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ stdenv.lib.optionals (kluSupport) [ "-DKLU_ENABLE=ON" "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include" "-DKLU_LIBRARY_DIR=${suitesparse}/lib" - ]; + ] ++ stdenv.lib.optionals (lapackSupport && !lapack.isILP64) [ + # Use the correct index type according to lapack which is supposed to be + # the same index type compatible with blas, thanks to the assertion of + # buildInputs + "-DSUNDIALS_INDEX_TYPE=int32_t" + ] + ; doCheck = true; - checkPhase = "make test"; + checkTarget = "test"; meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/swiftshader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/swiftshader/default.nix index 3965f46bd8d8..3631b8b4fe7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/swiftshader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/swiftshader/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext }: +{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }: stdenv.mkDerivation rec { pname = "swiftshader"; - version = "2020-06-17"; + version = "2020-11-06"; src = fetchgit { url = "https://swiftshader.googlesource.com/SwiftShader"; - rev = "763957e6b4fc1aa360ab19c4109b8b26686783e8"; - sha256 = "0sdh48swx0qyq2nfkv1nggs14am0qc7z239qrxb69p2ddqm76g1s"; + rev = "4ed9d3498dcffa987acba1a8007ff8dec336f263"; + sha256 = "1gz2zflfacxf34s78djddf93brn9kyxj4byc4p2ip1pin43lh2lg"; }; nativeBuildInputs = [ cmake python3 jq ]; - buildInputs = [ libX11 libXext ]; + buildInputs = [ libX11 libXext zlib ]; # Make sure we include the drivers and icd files in the output as the cmake # generated install command only puts in the spirv-tools stuff. diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/symengine/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/symengine/default.nix index 524958e51a2c..cc3abd80d6f6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "1zgfhqv43qcfkfdyf1p82bcfv05n6iix6yw6qx1y5bnb7dv74irw"; + sha256 = "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1"; }; nativeBuildInputs = [ cmake ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "SymEngine is a fast symbolic manipulation library"; + description = "A fast symbolic manipulation library"; homepage = "https://github.com/symengine/symengine"; platforms = platforms.unix ++ platforms.windows; license = licenses.bsd3; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/talloc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/talloc/default.nix index f464364e8a0a..fa920d037a92 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/talloc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/talloc/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, python +, python3 , pkg-config , readline , libxslt @@ -10,7 +10,7 @@ , wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "talloc"; version = "2.3.1"; @@ -22,13 +22,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config fixDarwinDylibNames - python + python3 wafHook docbook-xsl-nons docbook_xml_dtd_42 ]; buildInputs = [ + python3 readline libxslt ]; @@ -56,4 +57,9 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.all; }; -} +} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly when cross-compiling. + PYTHON_CONFIG = "/invalid"; +}) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tdlib/default.nix index 4bf49e297e33..1a36a68a33bd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -1,14 +1,16 @@ { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }: stdenv.mkDerivation rec { - version = "1.6.0"; + version = "1.7.0"; pname = "tdlib"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; + rev = "v${version}"; - sha256 = "0zlzpl6fgszg18kwycyyyrnkm255dvc6fkq0b0y32m5wvwwl36cv"; + + sha256 = "sha256-sZzp9k7KDnqftcSGSgXkIy0siCksGPBmRckySU/J0TU="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tepl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tepl/default.nix index 008f0f5b424e..77cf9fd0247d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tepl/default.nix @@ -1,28 +1,41 @@ -{ stdenv, fetchurl -, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }: -let - version = "4.4.0"; +{ stdenv +, fetchurl +, meson +, ninja +, amtk +, gnome3 +, gobject-introspection +, gtk3 +, gtksourceview4 +, icu +, pkg-config +}: + +stdenv.mkDerivation rec { pname = "tepl"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "5.0.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mm2z849hnni7597an05mrv0dckrxjngpf2xfa0g5s17i8x6gxp6"; + sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6"; }; nativeBuildInputs = [ - pkgconfig + meson + ninja + gobject-introspection + pkg-config ]; buildInputs = [ - libxml2 + icu ]; propagatedBuildInputs = [ amtk gtksourceview4 - libuchardet gtk3 ]; @@ -38,8 +51,8 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; description = "Text editor product line"; - maintainers = [ maintainers.manveru ]; - license = licenses.lgpl21Plus; + maintainers = teams.gnome.members ++ [ maintainers.manveru ]; + license = licenses.lgpl3Plus; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 2726ed7f237b..eb65d07b2837 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.0.7"; + version = "2.1.3"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "00g8ibsbnl4wjfx3qg4qy6s7z6dsj898j0yqfhw1gjr1pb5dsapb"; + sha256 = "1ia00bk6dc1176arf84lx08x4c7c74q7ycn7dqjnmyxkg3kmr21g"; }; # (bundled) blosc headers have a warning on some archs that it will be using @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cmake python doxygen - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; checkInputs = [ gtest @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { openssl boost libpqxx - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ]; # emulate the process of pulling catch down postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix new file mode 100644 index 000000000000..92eb5b3d8f4b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tinyobjloader"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "tinyobjloader"; + repo = "tinyobjloader"; + rev = "v${version}"; + sha256 = "162168995f4xch7hm3iy6m57r8iqkpzi5x9qh1gsghlxwdxxqbis"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/tinyobjloader/tinyobjloader"; + description = "Tiny but powerful single file wavefront obj loader"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 2421d3f88990..fa506733c16e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "2.4.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "09x5czaj4a8cyf8cxavcasx3yy1kik1s45a90c7zvxb7y1kfp9zs"; + sha256 = "106yhsjwjadxsl9dqxywg287mdwsksman02hdalhav18vcnvnlpj"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index f93721bdfc17..0670fdcdbd15 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -1,7 +1,10 @@ { stdenv , fetchurl , substituteAll -, intltool +, asciidoc +, docbook-xsl-nons +, docbook_xml_dtd_45 +, gettext , itstool , libxslt , gexiv2 @@ -15,7 +18,6 @@ , dbus , evolution-data-server , exempi -, flac , giflib , glib , gnome3 @@ -35,9 +37,10 @@ , libsoup , libtiff , libuuid -, libvorbis , libxml2 +, networkmanager , poppler +, systemd , taglib , upower , totem-pl-parser @@ -45,15 +48,18 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "2.3.3"; + version = "3.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl"; + sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6"; }; nativeBuildInputs = [ - intltool + asciidoc + docbook-xsl-nons + docbook_xml_dtd_45 + gettext itstool libxslt meson @@ -69,7 +75,6 @@ stdenv.mkDerivation rec { dbus evolution-data-server exempi - flac giflib glib gexiv2 @@ -92,9 +97,10 @@ stdenv.mkDerivation rec { libsoup libtiff libuuid - libvorbis libxml2 + networkmanager poppler + systemd taglib upower ]; @@ -102,19 +108,12 @@ stdenv.mkDerivation rec { mesonFlags = [ # TODO: tests do not like our sandbox "-Dfunctional_tests=false" - "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" ]; patches = [ (substituteAll { src = ./fix-paths.patch; - inherit tracker; - }) - # https://bugzilla.gnome.org/show_bug.cgi?id=795576 - (fetchurl { - url = "https://bugzilla.gnome.org/attachment.cgi?id=371427"; - sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf"; + inherit asciidoc; }) ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker-miners/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker-miners/fix-paths.patch index ce44416055c4..8661648eacdf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker-miners/fix-paths.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker-miners/fix-paths.patch @@ -1,11 +1,13 @@ ---- a/src/libtracker-miners-common/tracker-domain-ontology.c -+++ b/src/libtracker-miners-common/tracker-domain-ontology.c -@@ -323,7 +323,7 @@ - goto end; - } - } else { -- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies", -+ path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies", - DEFAULT_RULE, NULL); - - if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { +diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build +index 0b8a64863..a09db59f0 100644 +--- a/docs/manpages/meson.build ++++ b/docs/manpages/meson.build +@@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_manpages + command: [xsltproc, + '--output', '@OUTPUT@', + '--stringparam', 'man.authors.section.enabled', '0', +- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], ++ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], + input: xml, + output: manpage, + install: true, diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker/default.nix index fb111829c7e1..ee50d6547957 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -4,16 +4,15 @@ , meson , ninja , pkgconfig +, asciidoc , gobject-introspection , python3 , gtk-doc -, docbook_xsl -, docbook_xml_dtd_412 -, docbook_xml_dtd_43 +, docbook-xsl-nons , docbook_xml_dtd_45 , libxml2 , glib -, wrapGAppsHook +, wrapGAppsNoGuiHook , vala , sqlite , libxslt @@ -21,7 +20,6 @@ , gnome3 , icu , libuuid -, networkmanager , libsoup , json-glib , systemd @@ -31,19 +29,19 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "2.3.4"; + version = "3.0.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap"; + sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr"; }; patches = [ (substituteAll { src = ./fix-paths.patch; - gdbus = "${glib.bin}/bin/gdbus"; + inherit asciidoc; }) ]; @@ -52,14 +50,13 @@ stdenv.mkDerivation rec { ninja vala pkgconfig + asciidoc gettext libxslt - wrapGAppsHook + wrapGAppsNoGuiHook gobject-introspection gtk-doc - docbook_xsl - docbook_xml_dtd_412 - docbook_xml_dtd_43 + docbook-xsl-nons docbook_xml_dtd_45 python3 # for data-generators systemd # used for checks to install systemd user service @@ -71,7 +68,6 @@ stdenv.mkDerivation rec { libxml2 sqlite icu - networkmanager libsoup libuuid json-glib @@ -83,8 +79,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - # "-Dfunctional_tests=true" "-Ddocs=true" ]; @@ -106,9 +100,17 @@ stdenv.mkDerivation rec { # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that will be overridden during installation. mkdir -p $out/lib - ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0 - ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0 - ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so + ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0.so $out/lib/libtracker-sparql-3.0.so.0 + ''; + + checkPhase = '' + runHook preCheck + + dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + + runHook postCheck ''; postCheck = '' @@ -116,10 +118,6 @@ stdenv.mkDerivation rec { rm -r $out/lib ''; - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch index f5c13c3fcdaf..5e4d8657f7bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch @@ -1,12 +1,13 @@ ---- a/src/tracker-store/tracker-store.desktop.in -+++ b/src/tracker-store/tracker-store.desktop.in -@@ -1,8 +1,8 @@ - [Desktop Entry] - Name=Tracker Store - Comment=Metadata database store and lookup manager --Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 -+Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 - Terminal=false - Type=Application - Categories=Utility; - X-GNOME-Autostart-enabled=true +diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build +index f90c757cf..40d9c939d 100644 +--- a/docs/manpages/meson.build ++++ b/docs/manpages/meson.build +@@ -32,7 +32,7 @@ foreach m : manpages + command: [xsltproc, + '--output', '@OUTPUT@', + '--stringparam', 'man.authors.section.enabled', '0', +- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], ++ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], + input: xml, + output: manpage, + install: true, diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix index 625b16cc99a0..929627f3e1bf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "38"; + version = "39"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "068q4xx09vwjs7i89w47qzymdb4l6jqi27gx2jmd3yb6fp2k7nsb"; + sha256 = "1053iw4isi7qsy94fqmh570wki999sg9n70jhqy8kfy1bniczh0l"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ucx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ucx/default.nix index 1961e8aef680..a4120b7ba43b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.8.1"; + version = "1.9.0"; in stdenv.mkDerivation { name = "ucx-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "0yfnx4shgydkp447kipavjzgl6z58jan6l7znhdi8ry4zbgk568a"; + sha256 = "0i0ji5ivzxjqh3ys1m517ghw3am7cw1hvf40ma7hsq3wznsyx5s1"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/unicorn-emu/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/unicorn-emu/default.nix deleted file mode 100644 index 3e10f492eb98..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/unicorn-emu/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, cmocka, hexdump, writeScriptBin, binutils-unwrapped }: - -stdenv.mkDerivation rec { - pname = "unicorn-emulator"; - version = "1.0.2-rc4"; - - src = fetchurl { - url = "https://github.com/unicorn-engine/unicorn/archive/${version}.tar.gz"; - sha256 = "05w43jq3r97l3c8ggc745ai8m5l93p1b6q6cfp1zwzz6hl5kifiv"; - }; - - PREFIX = placeholder "out"; - MACOS_UNIVERSAL = stdenv.lib.optionalString stdenv.isDarwin "no"; - NIX_CFLAGS_COMPILE = "-Wno-error"; - - doCheck = !stdenv.isDarwin; - - checkInputs = [ - cmocka - hexdump - python.pkgs.setuptools - ]; - - nativeBuildInputs = [ pkgconfig python ]; - enableParallelBuilding = true; - - meta = { - description = "Lightweight multi-platform CPU emulator library"; - homepage = "http://www.unicorn-engine.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/unicorn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/unicorn/default.nix new file mode 100644 index 000000000000..cea35519ad87 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/unicorn/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +}: + +stdenv.mkDerivation rec { + pname = "unicorn"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "unicorn-engine"; + repo = pname; + rev = version; + sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + meta = with stdenv.lib; { + description = "Lightweight multi-platform CPU emulator library"; + homepage = "http://www.unicorn-engine.org"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice luc65r ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/utf8proc/default.nix index e08aea2e1ee5..05b23e25aff9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/utf8proc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq"; + sha256 = "0czk8xw1jra0fjf6w4bcaridyz3wz2br3v7ik1g7z0j5grx9n8r1"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/v8/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/v8/default.nix index 60e856e61dfe..e6696626cb5d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { gnFlags = [ "use_custom_libcxx=false" - "is_clang=${if stdenv.cc.isClang then "true" else "false"}" + "is_clang=${lib.boolToString stdenv.cc.isClang}" "use_sysroot=false" # "use_system_icu=true" "is_component_build=false" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/volume-key/default.nix index 7ac5a4370107..084b42c9a2dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/volume-key/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/volume-key/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 -, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme +, ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme , autoconf, automake, libtool , buildPackages }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ]; - buildInputs = [ autoreconfHook glib cryptsetup nss utillinux gpgme ncurses ]; + buildInputs = [ autoreconfHook glib cryptsetup nss util-linux gpgme ncurses ]; configureFlags = [ "--with-gpgme-prefix=${gpgme.dev}" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/vte/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/vte/default.nix index 811921df3e7c..014b2615d5bf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.60.2"; + version = "0.62.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m"; + sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3"; }; passthru = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/waffle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/waffle/default.nix new file mode 100644 index 000000000000..66a1b7ab1450 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/waffle/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchFromGitLab +, lib +, cmake +, libGL +, libglvnd +, makeWrapper +, pkg-config +, wayland +, libxcb +, libX11 +}: + +stdenv.mkDerivation rec { + pname = "waffle"; + version = "1.6.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mesa"; + repo = "waffle"; + rev = "v${version}"; + sha256 = "0s8gislmhccfa04zsj1yqk97lscbbnmxirr2zm4q3p8ybmpfhpqr"; + }; + + buildInputs = [ + libGL + libglvnd + libX11 + libxcb + wayland + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + ]; + + cmakeFlags = [ "-Dplatforms=x11,wayland" ]; + + postInstall = '' + wrapProgram $out/bin/wflinfo \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} + ''; + + meta = with lib; { + description = "A cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime"; + homepage = "http://www.waffle-gl.org/"; + license = licenses.bsd2; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch new file mode 100644 index 000000000000..f6745e6f9433 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch @@ -0,0 +1,25 @@ +From 378623b0e39b12bb04d3a3a1e08e64b31bd7d99d Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Fri, 27 Nov 2020 10:22:20 +0100 +Subject: [PATCH] add placeholder for @nm@ + +--- + egl/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/egl/meson.build b/egl/meson.build +index dee9b1d..e477546 100644 +--- a/egl/meson.build ++++ b/egl/meson.build +@@ -11,7 +11,7 @@ wayland_egl = library( + + executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c') + +-nm_path = find_program('nm').path() ++nm_path = find_program('@nm@').path() + + test( + 'wayland-egl symbols check', +-- +2.29.2 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/default.nix index 1821d7a72374..2b18bc31a452 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -1,17 +1,32 @@ -{ lib, stdenv, fetchurl, meson, pkgconfig, ninja -, libffi, libxml2, wayland +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, pkgconfig +, substituteAll +, ninja +, libffi +, libxml2 +, wayland , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) , withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform -, graphviz-nox, doxygen, libxslt, xmlto, python3 -, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42 +, graphviz-nox +, doxygen +, libxslt +, xmlto +, python3 +, docbook_xsl +, docbook_xml_dtd_45 +, docbook_xml_dtd_42 }: # Require the optional to be enabled until upstream fixes or removes the configure flag assert expat != null; - let isCross = stdenv.buildPlatform != stdenv.hostPlatform; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "wayland"; version = "1.18.0"; @@ -20,6 +35,18 @@ in stdenv.mkDerivation rec { sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"; }; + patches = [ + # Fix documentation to be reproducible. + (fetchpatch { + url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/e53e0edf0f892670f3e8c5dd527b3bb22335d32d.patch"; + sha256 = "15sbhi86m9k72lsj56p7zr20ph2b0y4svl639snsbafn2ir1zdb2"; + }) + (substituteAll { + src = ./0001-add-placeholder-for-nm.patch; + nm = "${stdenv.cc.targetPrefix}nm"; + }) + ]; + outputs = [ "out" ] ++ lib.optionals withDocumentation [ "doc" "man" ]; separateDebugInfo = true; @@ -27,9 +54,6 @@ in stdenv.mkDerivation rec { postPatch = lib.optionalString withDocumentation '' patchShebangs doc/doxygen/gen-doxygen.py - substituteInPlace egl/meson.build --replace \ - "find_program('nm').path()" \ - "find_program('${stdenv.cc.targetPrefix}nm').path()" ''; depsBuildBuild = [ @@ -37,17 +61,28 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson pkgconfig ninja + meson + pkgconfig + ninja ] ++ lib.optionals isCross [ wayland # For wayland-scanner during the build ] ++ lib.optionals withDocumentation [ (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion - doxygen libxslt xmlto python3 docbook_xml_dtd_45 + doxygen + libxslt + xmlto + python3 + docbook_xml_dtd_45 ]; - buildInputs = [ libffi expat libxml2 + buildInputs = [ + libffi + expat + libxml2 ] ++ lib.optionals withDocumentation [ - docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 + docbook_xsl + docbook_xml_dtd_45 + docbook_xml_dtd_42 ]; meta = { @@ -60,9 +95,9 @@ in stdenv.mkDerivation rec { and other interactions that must go through the compositor (but not rendering). ''; - homepage = "https://wayland.freedesktop.org/"; - license = lib.licenses.mit; # Expat version - platforms = lib.platforms.linux; + homepage = "https://wayland.freedesktop.org/"; + license = lib.licenses.mit; # Expat version + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ primeos codyopel ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index d60e56763a17..ed97e1c8a85b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -41,34 +41,33 @@ , enableGeoLocation ? true , geoclue2 , sqlite -, enableGtk2Plugins ? false -, gtk2 ? null , enableGLES ? true , gst-plugins-base , gst-plugins-bad , woff2 , bubblewrap , libseccomp +, systemd , xdg-dbus-proxy , substituteAll , glib }: assert enableGeoLocation -> geoclue2 != null; -assert enableGtk2Plugins -> gtk2 != null; -assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.28.4"; + version = "2.30.3"; outputs = [ "out" "dev" ]; + separateDebugInfo = stdenv.isLinux; + src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0r4lkk21pny2g4mmsw0ds14m5hhjys1l47gvy59dfgihr7l546c2"; + sha256 = "0zsy3say94d9bhaan0l6mfr59z03a5x4kngyy8b2i20n77q19skd"; }; patches = optionals stdenv.isLinux [ @@ -99,6 +98,7 @@ stdenv.mkDerivation rec { python3 ruby glib # for gdbus-codegen + ] ++ stdenv.lib.optionals stdenv.isLinux [ wayland # for wayland-scanner ]; @@ -140,10 +140,10 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ bubblewrap libseccomp + systemd wayland xdg-dbus-proxy - ] ++ optional enableGeoLocation geoclue2 - ++ optional enableGtk2Plugins gtk2; + ] ++ optional enableGeoLocation geoclue2; propagatedBuildInputs = [ gtk3 @@ -167,8 +167,7 @@ stdenv.mkDerivation rec { "-DENABLE_X11_TARGET=OFF" "-DUSE_ACCELERATE=0" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; postPatch = '' patchShebangs . @@ -178,7 +177,7 @@ stdenv.mkDerivation rec { description = "Web content rendering engine, GTK port"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/wiiuse/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/wiiuse/default.nix index 4dcc8a47105e..738c6a430084 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/wiiuse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/wiiuse/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wiiuse"; repo = "wiiuse"; - rev = "${version}"; + rev = version; sha256 = "05gc3s0wxx7ga4g32yyibyxdh46rm9bbslblrc72ynrjxq98sg13"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 67faad8cd74f..13132c8cc1c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "08d5d52m8wy3imfc6mdxpx8swhh2k4s1gmfaykg02j59z84awc6p"; + sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn"; }; # $out for the library and $examples for the example programs (in examples): @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libpng ffmpeg ]; - mesonFlags = [ "-Dlogind-provider=systemd" ]; + mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; postFixup = '' # Install ALL example programs to $examples: diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix index 9d80e5de4497..7bfc96fbf47c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha256 = "0snsysfrr5h66mybls8r8k781v732dlfn4jdnmk348jgvny275fj"; + sha256 = "0q5glzr49rjnpp6iqrx7zr9bz4n2ca0q0i0phk7y27rmxzrgpxk1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix index 44e6fe49b489..8b0e6811efff 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,13 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkgconfig -, libXinerama, libSM, libXxf86vm -, gtk2, gtk3 -, xorgproto, gst_all_1, setfile +{ stdenv +, fetchFromGitHub +, fetchurl +, pkgconfig +, libXinerama +, libSM +, libXxf86vm +, libXtst +, gtk2 +, GConf ? null +, gtk3 +, xorgproto +, gst_all_1 +, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, withMesa ? libGLSupported, libGLU ? null, libGL ? null -, compat28 ? false, compat30 ? true, unicode ? true +, withMesa ? libGLSupported +, libGLU ? null +, libGL ? null +, compat28 ? false +, compat30 ? true +, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk ? null -, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null +, withWebKit ? false +, webkitgtk ? null +, AGL ? null +, Carbon ? null +, Cocoa ? null +, Kernel ? null +, QTKit ? null }: with stdenv.lib; @@ -18,47 +37,58 @@ assert withWebKit -> webkitgtk != null; assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2."; stdenv.mkDerivation rec { - version = "3.1.3"; + version = "3.1.4"; pname = "wxwidgets"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "022mby78q7n0bhd4mph04hz93c9qamnvzv3h1s26r839k28760f4"; + sha256 = "1fwzrk6w5k0vs8kqdq5lpzdbp5c09hx740wg6mi6vgmc1r67dv67"; + fetchSubmodules = true; }; buildInputs = [ - libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 ] - ++ optional (!withGtk2) gtk3 - ++ optional withMesa libGLU - ++ optional withWebKit webkitgtk - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; + libXinerama + libSM + libXxf86vm + libXtst + xorgproto + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ] ++ optionals withGtk2 [ gtk2 GConf ] + ++ optional (!withGtk2) gtk3 + ++ optional withMesa libGLU + ++ optional withWebKit webkitgtk + ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; patches = [ - (fetchurl { # https://trac.wxwidgets.org/ticket/17942 + (fetchurl { + # https://trac.wxwidgets.org/ticket/17942 url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" - + "fix_assertion_using_hide_in_destroy.diff"; + + "fix_assertion_using_hide_in_destroy.diff"; sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; }) ]; configureFlags = - [ "--disable-precomp-headers" "--enable-mediactrl" + [ + "--disable-precomp-headers" + "--enable-mediactrl" (if compat28 then "--enable-compat28" else "--disable-compat28") - (if compat30 then "--enable-compat30" else "--disable-compat30") ] + (if compat30 then "--enable-compat30" else "--disable-compat30") + ] ++ optional unicode "--enable-unicode" ++ optional withMesa "--with-opengl" ++ optionals stdenv.isDarwin # allow building on 64-bit [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ] ++ optionals withWebKit - ["--enable-webview" "--enable-webviewwebkit"]; + [ "--enable-webview" "--enable-webviewwebkit" ]; SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; @@ -90,8 +120,19 @@ stdenv.mkDerivation rec { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; + description = "A C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; + longDescription = '' + WxWidgets gives you a single, easy-to-use API for + writing GUI applications on multiple platforms that still utilize the + native platform's controls and utilities. Link with the appropriate library + for your platform and compiler, and your application will adopt the look + and feel appropriate to that platform. On top of great GUI functionality, + wxWidgets gives you: online help, network programming, streams, clipboard + and drag and drop, multithreading, image loading and saving in a variety of + popular formats, database support, HTML viewing and printing, and much + more. + ''; badPlatforms = [ "x86_64-darwin" ]; + maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix index ad43ac96d7df..3ad200cfc637 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -30,7 +30,7 @@ let src = fetchFromBitbucket { owner = "multicoreware"; repo = "x265_git"; - rev = "${version}"; + rev = version; sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=OFF" - ] ++ stdenv.lib.optionals is64bit [ + ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" "-DLINKED_10BIT=ON" "-DLINKED_12BIT=ON" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 0d6fd9611c4e..6d310443e70c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool -, openssl, nss, lib, runCommandCC, writeText }: +# nss_3_53 is used instead of the latest due to a number of issues: +# https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss +, openssl, nss_3_53, lib, runCommandCC, writeText }: lib.fix (self: let - version = "1.2.30"; + version = "1.2.31"; in stdenv.mkDerivation { pname = "xmlsec"; @@ -11,12 +13,12 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1j5bf7ni45jghyrbf7a14wx2pvfara557zyry7g7h8840c5kd11d"; + sha256 = "mxC8Uswx5PdhYuOXXlDbJrcatJxXHYELMRymJr5aCyY="; }; patches = [ ./lt_dladdsearchdir.patch - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; postPatch = '' substituteAllInPlace src/dl.c ''; @@ -25,11 +27,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ]; + buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ]; enableParallelBuilding = true; doCheck = true; - checkInputs = [ nss.tools ]; + checkInputs = [ nss_3_53.tools ]; + preCheck = '' + substituteInPlace tests/testrun.sh \ + --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \ + --replace 'TMPFOLDER=/tmp' '$(mktemp -d)' + ''; # enable deprecated soap headers required by lasso # https://dev.entrouvert.org/issues/18771 diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch new file mode 100644 index 000000000000..700fad7e3dd4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch @@ -0,0 +1,12 @@ +--- a/tests/testEnc.sh 2020-04-20 14:30:32.000000000 -0400 ++++ b/tests/testEnc.sh 2020-10-21 22:09:25.000000000 -0400 +@@ -405,9 +405,6 @@ + else + # generate binary file out of base64 + DECODE="-d" +- if [ "`uname`" = "Darwin" ]; then +- DECODE="-D" +- fi + cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3 + execEncTest "$res_success" \ + "" \ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix index 98c94cfeccaa..95f09f595048 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix @@ -11,13 +11,11 @@ , libtool , gettext , dbus -, telepathy-glib , gtk3 , json-glib , librdf_raptor2 -, dbus-glib , pythonSupport ? true -, python2Packages +, python3 }: stdenv.mkDerivation rec { @@ -50,23 +48,21 @@ stdenv.mkDerivation rec { gettext gobject-introspection vala - python2Packages.python + python3 ]; buildInputs = [ glib sqlite dbus - telepathy-glib - dbus-glib gtk3 json-glib librdf_raptor2 - python2Packages.rdflib + python3.pkgs.rdflib ]; configureFlags = [ - "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services" + "--disable-telepathy" ]; enableParallelBuilding = true; @@ -80,14 +76,14 @@ stdenv.mkDerivation rec { ''; postFixup = stdenv.lib.optionalString pythonSupport '' - moveToOutput lib/${python2Packages.python.libPrefix} "$py" + moveToOutput lib/${python3.libPrefix} "$py" ''; meta = with stdenv.lib; { description = "A service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; maintainers = with maintainers; [ lethalman worldofpeace ]; - license = licenses.gpl2; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index 8302ebbd1e80..d5819ff7ee9a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }: +{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium +, enableDrafts ? false }: stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "1q37z05i76ili31j6jlw8988iy6vxadlmd306f99phxfdpqa6bn9"; + sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd"; }; - nativeBuildInputs = [ cmake asciidoc ]; + nativeBuildInputs = [ cmake asciidoc pkg-config ]; + buildInputs = [ libsodium ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix index b957253eebec..0015600f970f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; - maintainers = [ maintainers.boothead ]; + maintainers = [ maintainers.commandodev ]; platforms = platforms.unix; }; } |