From 69f9b44a7aa1672ce373b591a64e60b555e7ccef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 16 Jun 2024 09:22:07 +1000 Subject: [PATCH 01/92] mpdcron: mark broken on darwin Project uses old nokogiri which doesn't compile with new libxml. --- pkgs/tools/audio/mpdcron/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 5578acf27e50..c2e93d592f4c 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -56,6 +56,7 @@ in stdenv.mkDerivation { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 manveru ]; + broken = stdenv.isDarwin; # fails due to old nokogiri https://github.com/sparklemotion/nokogiri/discussions/3152#discussioncomment-8806607 }; } # TODO: autoreconfHook this From 312506638cd985f4567bc5319f304cb0dbdd611d Mon Sep 17 00:00:00 2001 From: Luna Perego Date: Sun, 30 Jun 2024 22:51:10 +0200 Subject: [PATCH 02/92] maintainers: add husky --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 42c7571ea286..feba9cd3857e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8263,6 +8263,13 @@ githubId = 6109326; name = "David Hummel"; }; + husky = { + email = "husky@husky.sh"; + github = "huskyistaken"; + githubId = 20684258; + name = "Luna Perego"; + keys = [ { fingerprint = "09E4 B981 9B93 5B0C 0B91 1274 0578 7332 9217 08FF"; } ]; + }; huyngo = { email = "huyngo@disroot.org"; github = "Huy-Ngo"; From e9bbad73863d22a5610edfef413726f3051e1cc1 Mon Sep 17 00:00:00 2001 From: aviac Date: Mon, 6 May 2024 16:50:30 +0200 Subject: [PATCH 03/92] lib/licenses: add radiance --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index c5d05437efc0..218173de8f25 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1089,6 +1089,11 @@ in mkLicense lset) ({ url = "https://qwt.sourceforge.io/qwtlicense.html"; }; + radiance = { + fullName = "The Radiance Software License, Version 2.0"; + url = "https://github.com/LBNL-ETA/Radiance/blob/master/License.txt"; + }; + ruby = { spdxId = "Ruby"; fullName = "Ruby License"; From 71b28e353ce926683b6b176568afd63373d6c480 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 11 Jul 2024 13:31:37 +0200 Subject: [PATCH 04/92] grass: sync packaging with upstream --- pkgs/applications/gis/grass/default.nix | 44 ++++++++++++++++--------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 41d560a4ebd5..03e2e24b2978 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -5,17 +5,22 @@ , makeWrapper , wrapGAppsHook3 +, withOpenGL ? true + , bison , blas , cairo , ffmpeg , fftw , flex +, freetype , gdal , geos +, lapack +, libGLU , libiconv -, libmysqlclient , libpng +, libsvm , libtiff , libxml2 , netcdf @@ -33,6 +38,7 @@ let pyPackages = python311Packages; + in stdenv.mkDerivation (finalAttrs: { pname = "grass"; @@ -53,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { flex gdal # for `gdal-config` geos # for `geos-config` - libmysqlclient # for `mysql_config` netcdf # for `nc-config` pkg-config ] ++ (with pyPackages; [ python-dateutil numpy wxpython ]); @@ -63,10 +68,12 @@ stdenv.mkDerivation (finalAttrs: { cairo ffmpeg fftw + freetype gdal geos - libmysqlclient + lapack libpng + libsvm libtiff libxml2 netcdf @@ -78,7 +85,8 @@ stdenv.mkDerivation (finalAttrs: { wxGTK32 zlib zstd - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ] ++ lib.optionals withOpenGL [ libGLU ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; strictDeps = true; @@ -87,26 +95,30 @@ stdenv.mkDerivation (finalAttrs: { ./clang-integer-conversion.patch ]; - # Correct mysql_config query - postPatch = '' - substituteInPlace configure --replace "--libmysqld-libs" "--libs" - ''; - configureFlags = [ "--with-blas" + "--with-cairo-ldflags=-lfontconfig" + "--with-cxx" + "--with-fftw" + "--with-freetype" "--with-geos" - # It complains about missing libmysqld but doesn't really seem to need it - "--with-mysql" - "--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql" - "--with-mysql-libs=${libmysqlclient}/lib/mysql" - "--with-netcdf" + "--with-gdal" + "--with-lapack" + "--with-libsvm" + "--with-nls" + "--with-openmp" + "--with-pdal" "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/" "--with-proj-includes=${proj.dev}/include" "--with-proj-libs=${proj}/lib" "--with-proj-share=${proj}/share/proj" - "--with-pthread" - "--with-readline" + "--with-sqlite" + "--with-zstd" + "--without-bzlib" + "--without-mysql" + "--without-odbc" + ] ++ lib.optionals (! withOpenGL) [ "--without-opengl" ] ++ lib.optionals stdenv.isDarwin [ "--without-cairo" From e7c74a75a2ae75a9e6061843fb57ea15868eecf1 Mon Sep 17 00:00:00 2001 From: definfo Date: Wed, 24 Jul 2024 21:10:01 +0800 Subject: [PATCH 05/92] maintainers: add definfo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ad714e25cc6d..a29c6a67128a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4762,6 +4762,12 @@ githubId = 41747605; keys = [ { fingerprint = "6130 3BBA D7D1 BF74 EFA4 4E3B E7FE 2087 E438 0E64"; } ]; }; + definfo = { + name = "Adrien SUN"; + email = "hjsdbb1@gmail.com"; + github = "definfo"; + githubId = 66514911; + }; deifactor = { name = "Ash Zahlen"; email = "ext0l@riseup.net"; From b1d0e56bc4132a2df2ccdecddf04815fbbbbfe0d Mon Sep 17 00:00:00 2001 From: definfo Date: Wed, 24 Jul 2024 23:57:23 +0800 Subject: [PATCH 06/92] coqPackages.high-school-geometry: init at 8.16 --- .../high-school-geometry/default.nix | 27 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/coq-modules/high-school-geometry/default.nix diff --git a/pkgs/development/coq-modules/high-school-geometry/default.nix b/pkgs/development/coq-modules/high-school-geometry/default.nix new file mode 100644 index 000000000000..2f478978bd58 --- /dev/null +++ b/pkgs/development/coq-modules/high-school-geometry/default.nix @@ -0,0 +1,27 @@ +{ lib, mkCoqDerivation, coq, version ? null }: + +mkCoqDerivation { + pname = "high-school-geometry"; + inherit version; + repo = "HighSchoolGeometry"; + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.16" "8.20"; out = "8.16"; } + { case = range "8.12" "8.16"; out = "8.13"; } + { case = "8.12"; out = "8.12"; } + { case = "8.11"; out = "8.11"; } + ] null; + + release = { + "8.16".sha256 = "sha256-HvUrZ6l7wCshuKUZs8rvfMkTEv+oXuogI5LICcD8Bn8="; + "8.13".sha256 = "sha256-5F/6155v0bWi5t7n4qU/GuR6jENngvWIIqJGPURzIeQ="; + "8.12".sha256 = "sha256-OF7sahU+5Ormkcrd8t6p2Kp/B2/Q/6zYTV3/XBvlGHc="; + "8.11".sha256 = "sha256-sVGeBBAJ7a7f+EJU1aSUvIVe9ip9PakY4379XWvvoqw="; + }; + releaseRev = v: "v${v}"; + + meta = with lib; { + description = "Geometry in Coq for French high school"; + maintainers = with maintainers; [ definfo ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5998f4234eb6..711a00d2b1ae 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -68,6 +68,7 @@ let graph-theory = callPackage ../development/coq-modules/graph-theory {}; heq = callPackage ../development/coq-modules/heq {}; hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {}; + high-school-geometry = callPackage ../development/coq-modules/high-school-geometry {}; HoTT = callPackage ../development/coq-modules/HoTT {}; hydra-battles = callPackage ../development/coq-modules/hydra-battles {}; interval = callPackage ../development/coq-modules/interval {}; From df39ab7ae7fe19659fb90d3332988c803e307895 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 05:54:55 +0000 Subject: [PATCH 07/92] rpcs3: 0.0.32-16659-33851d51a -> 0.0.32-16711-501e9260b --- pkgs/by-name/rp/rpcs3/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index a8fa2e5abb33..5014c4c4e0e4 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -33,10 +33,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16659-33851d51a"; - rpcs3Version = "0.0.32-16659-33851d51a"; - rpcs3Revision = "33851d51ab93c3c73be18a6cb5ed7723219ee1e3"; - rpcs3Hash = "sha256-Gv3zkvZdvnRUKvS0JhrvHOOz5OVSqxHBkbbOdYWzRvU="; + rpcs3GitVersion = "16711-501e9260b"; + rpcs3Version = "0.0.32-16711-501e9260b"; + rpcs3Revision = "501e9260b2f2c175c19e3a7e80a0afc7952a3f1e"; + rpcs3Hash = "sha256-qCTaCRx3Q7gUHNvcBlbHtQbeCwDe9pehWAEYiihH+LA="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in From d31361e61abc8a19dfc49fa8d6114c740ccd6acd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jul 2024 06:53:08 +0000 Subject: [PATCH 08/92] supersonic-wayland: 0.12.0 -> 0.13.0 --- pkgs/by-name/su/supersonic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index f789d28f90d8..52c6ad8ca080 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-SbG5jzsR1ggGYbQ3kwrvKeGfkF+LlZwPV6L5/rKT49A="; + hash = "sha256-2TxtrfrwqxPQx7PWiWyJLmHtq/SEb2agAImpdsDeBDk="; }; - vendorHash = "sha256-N2HdXGdb0OEfczPmc40jdx1rxKj2vxcEjbn+6K6vHhU="; + vendorHash = "sha256-bLQLRPu1Kvtx1+Lc8VpPAlOoGzYZo7dzEPwT0iauDWs="; nativeBuildInputs = [ copyDesktopItems From 83a38a5e7bae894e592b7d9cad565c4c2e6d9885 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 24 Jul 2024 19:16:40 +0200 Subject: [PATCH 09/92] lomiri.lomiri-camera-app: init at 4.0.6 --- .../lomiri-camera-app/default.nix | 232 ++++++++++++++++++ pkgs/desktops/lomiri/default.nix | 1 + 2 files changed, 233 insertions(+) create mode 100644 pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix diff --git a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix new file mode 100644 index 000000000000..70672b67095a --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix @@ -0,0 +1,232 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + cmake, + content-hub, + exiv2, + gettext, + gst_all_1, + libusermetrics, + lomiri-action-api, + lomiri-ui-toolkit, + lomiri-thumbnailer, + pkg-config, + qtbase, + qtdeclarative, + qtmultimedia, + qtpositioning, + qtquickcontrols2, + qtsensors, + qzxing, + wrapGAppsHook3, + wrapQtAppsHook, + xvfb-run, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-camera-app"; + version = "4.0.6"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/apps/lomiri-camera-app"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-93skB614T9RcMhYfeCDjV+JLYoJocylk32uzdcQ4I8Q="; + }; + + patches = [ + # Remove when version > 4.0.6 + (fetchpatch { + name = "0001-lomiri-camera-app-Stop using qt5_use_modules.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/567f983e59cc412c9e1951f78f0809c6faebd3a6.patch"; + hash = "sha256-peP3c7XqpjGcdVG5zLKTcZPUPVz9Tu8tVBPaLVc5vWE="; + }) + + # Fix GNUInstallDirs usage + # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/205 merged & in release + (fetchpatch { + name = "0002-lomiri-camera-app-GNUInstallDirs.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/76fbccd627bdbf30e4f3a736d1821e25f1cf45a7.patch"; + hash = "sha256-qz/2Df84e5+T8zQANb2Bl4dwoI10Z3blAlNI9ODavSw="; + }) + + # Call i18n.bindtextdomain with correct locale path + # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/206 merged & in release + (fetchpatch { + name = "0003-lomiri-camera-app-bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/9250b79f85218b561dce07030a2920d5443ac4ba.patch"; + hash = "sha256-vCE64sxpin68Ks/hu1LWuOT5eZWozPPKqYR2GcsriPg="; + }) + + # Fix doubled DESTINATION + # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/207 merged & in release + (fetchpatch { + name = "0004-lomiri-camera-app-bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/4af85daccac0904cbb0cfb08e592d9ab1d745d6d.patch"; + hash = "sha256-PCGwQ6rAyrBeAefTe1ciod+R4tbJk+D76g9fH4PoTlg="; + }) + + # Use pkg-config to find QZXing + # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/208 merged & in release + (fetchpatch { + name = "0005-lomiri-camera-app-QZXing-pkg-config.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/e79a10ca236ef5ed0af328786dbaef281e2c120b.patch"; + hash = "sha256-dC6a6IjpPez+asKdTB885rAEN+mqtP7uYpicz/4hRSM="; + }) + + # Make testing optional + # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/209 merged & in release + (fetchpatch { + name = "0006-lomiri-camera-app-BUILD_TESTING.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/e3ec58327ffc25c565cf8c28d09adc09c4067b23.patch"; + hash = "sha256-U5r3+218Cx4T0iF7nm2Mfhlr+4dn7ptPfgsxZrIUJHQ="; + }) + + # Fix translation of window title + # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/211 merged & in release + (fetchpatch { + name = "0007-lomiri-camera-app-title-translation.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/43f0018158f65fe81f50e7860d8af2e469785434.patch"; + hash = "sha256-7qFqps488B2d1wp79kFyUDR1FzE1Q9QMIOFFa/astHU="; + }) + + # Make barcode reader's icons SVGs and fix icon installations + # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/210 merged & in release + (fetchpatch { + name = "0011-lomiri-camera-app-camera-icon-installation-fix.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/48ebaffc1f589569387127e953b0995451580cc1.patch"; + hash = "sha256-nq5iCTHCUzEj/38hCIaqhzUX7ABVkSAeB5hEzZfIX7A="; + }) + (fetchpatch { + name = "0012-lomiri-camera-app-splash-icon-location-fix.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/6c96eade82d6d812aa605bc45a5ff06ed3a2aeff.patch"; + hash = "sha256-8QusJPyNO8ADx3Ce1y/thQAaXQa8XnnMvPrxyzx8oRk="; + }) + (fetchpatch { + name = "0013-lomiri-camera-app-Vectorise-barcode-icons.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/d5232590a02b535d24d9765d24ce5a066cc57724.patch"; + hash = "sha256-sfSdzFFLof1dN/7KnerZOBoarubGcTxp7h9Ab6rGoV0="; + }) + (fetchpatch { + name = "0014-lomiri-camera-app-barcode-icon-installation-fix.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/a8718d6621a34aaf19aaaaea5dd31f401a652953.patch"; + hash = "sha256-eiBliqk71aDmIMY6cn1J5cxmzlHMTtiYKeQ0cJuCNYA="; + }) + ]; + + # We don't want absolute paths in dekstop files + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'CAMERA_SPLASH ''${CAMERA_APP_DIR}/assets/lomiri-camera-app-splash.svg' 'CAMERA_SPLASH lomiri-app-launch/splash/lomiri-camera-app.svg' \ + --replace-fail 'READER_SPLASH "''${CAMERA_APP_DIR}/assets/lomiri-barcode-reader-app-splash.svg"' 'READER_SPLASH lomiri-app-launch/splash/lomiri-barcode-reader-app.svg' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + pkg-config + wrapGAppsHook3 + wrapQtAppsHook + ]; + + buildInputs = + [ + exiv2 + qtbase + qtdeclarative + qtmultimedia + qtquickcontrols2 + qzxing + + # QML + content-hub + libusermetrics + lomiri-action-api + lomiri-ui-toolkit + lomiri-thumbnailer + qtpositioning + qtsensors + ] + ++ (with gst_all_1; [ + # cannot create camera service, the 'camerabin' plugin is missing for GStreamer + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + nativeCheckInputs = [ xvfb-run ]; + + cmakeFlags = [ + (lib.cmakeBool "INSTALL_TESTS" false) + (lib.cmakeBool "CLICK_MODE" false) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" ( + lib.concatStringsSep ";" [ + # Exclude tests + "-E" + (lib.strings.escapeShellArg "(${ + lib.concatStringsSep "|" [ + # Don't care about linter failures + "^flake8" + ] + })") + ] + )) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = + let + listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix; + in + '' + export QT_PLUGIN_PATH=${listToQtVar qtbase.qtPluginPrefix [ qtbase ]} + export QML2_IMPORT_PATH=${ + listToQtVar qtbase.qtQmlPrefix [ + lomiri-ui-toolkit + content-hub + lomiri-thumbnailer + ] + } + ''; + + postInstall = '' + mkdir -p $out/share/lomiri-app-launch/splash + ln -s $out/share/lomiri-camera-app/assets/lomiri-camera-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-camera-app.svg + ln -s $out/share/lomiri-camera-app/assets/lomiri-barcode-reader-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-barcode-reader-app.svg + + install -Dm644 ../camera-contenthub.json $out/share/content-hub/peers/lomiri-camera-app + ''; + + dontWrapGApps = true; + + preFixup = '' + qtWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + ) + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = { + description = "Camera application for Ubuntu Touch devices"; + homepage = "https://gitlab.com/ubports/development/apps/lomiri-camera-app"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/blob/v${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ + gpl3Only # code + cc-by-sa-30 # extra graphics + ]; + mainProgram = "lomiri-camera-app"; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 98cfe068086b..59cd0d9d2d9c 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -10,6 +10,7 @@ let #### Core Apps lomiri = callPackage ./applications/lomiri { }; lomiri-calculator-app = callPackage ./applications/lomiri-calculator-app { }; + lomiri-camera-app = callPackage ./applications/lomiri-camera-app { }; lomiri-clock-app = callPackage ./applications/lomiri-clock-app { }; lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { }; lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { }; From b45fe2e63c7188c6fd92cebd84c9451b34aadedc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 24 Jul 2024 19:18:05 +0200 Subject: [PATCH 10/92] tests/lomiri-camera-app: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/lomiri-camera-app.nix | 135 ++++++++++++++++++ .../lomiri-camera-app/default.nix | 2 + 3 files changed, 138 insertions(+) create mode 100644 nixos/tests/lomiri-camera-app.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f6392be29437..f52b731ec228 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -538,6 +538,7 @@ in { #logstash = handleTest ./logstash.nix {}; lomiri = handleTest ./lomiri.nix {}; lomiri-calculator-app = runTest ./lomiri-calculator-app.nix; + lomiri-camera-app = runTest ./lomiri-camera-app.nix; lomiri-clock-app = runTest ./lomiri-clock-app.nix; lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; lomiri-system-settings = handleTest ./lomiri-system-settings.nix {}; diff --git a/nixos/tests/lomiri-camera-app.nix b/nixos/tests/lomiri-camera-app.nix new file mode 100644 index 000000000000..ccd53a37135b --- /dev/null +++ b/nixos/tests/lomiri-camera-app.nix @@ -0,0 +1,135 @@ +{ lib, ... }: +{ + name = "lomiri-camera-app-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + systemPackages = + with pkgs; + [ + feh # view photo result + ffmpeg # fake webcam stream + gnome-text-editor # somewhere to paste QR result + (imagemagick.override { ghostscriptSupport = true; }) # add label for OCR + qrtool # generate QR code + xdotool # clicking on QR button + ] + ++ (with pkgs.lomiri; [ + suru-icon-theme + lomiri-camera-app + ]); + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts = { + packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu-classic + ]; + }; + + # Fake camera + boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; + }; + + enableOCR = true; + + testScript = + let + qrLabel = "Image"; + qrContent = "Test"; + in + '' + machine.wait_for_x() + + with subtest("lomiri camera launches"): + machine.succeed("lomiri-camera-app >&2 &") + machine.wait_for_text("Cannot access") + machine.screenshot("lomiri-camera_open") + + machine.succeed("pkill -f lomiri-camera-app") + + # Setup fake v4l2 camera + machine.succeed("modprobe v4l2loopback video_nr=10 card_label=Video-Loopback exclusive_caps=1") + machine.succeed("qrtool encode '${qrContent}' -s 20 -m 10 > qr.png") + # Horizontal flip, add text, flip back. Camera displays image mirrored, so need reversed text for OCR + machine.succeed("magick qr.png -flop -pointsize 70 -fill black -annotate +100+100 '${qrLabel}' -flop output.png") + machine.succeed("ffmpeg -re -loop 1 -i output.png -vf format=yuv420p -f v4l2 /dev/video10 -loglevel fatal >&2 &") + + with subtest("lomiri camera uses camera"): + machine.succeed("lomiri-camera-app >&2 &") + machine.wait_for_text("${qrLabel}") + machine.screenshot("lomiri-camera_feed") + + machine.succeed("xdotool mousemove 320 610 click 1") # take photo + machine.wait_until_succeeds("find /root/Pictures/camera.ubports -name '*.jpg'") + + # Check that the image is correct + machine.send_key("ctrl-alt-right") + machine.succeed("magick /root/Pictures/camera.ubports/IMG_00000001.jpg -flop photo_flip.png") + machine.succeed("feh photo_flip.png >&2 &") + machine.wait_for_text("${qrLabel}") + machine.screenshot("lomiri-camera_photo") + + machine.succeed("pkill -f feh") + machine.send_key("ctrl-alt-left") + machine.succeed("pkill -f lomiri-camera-app") + + with subtest("lomiri barcode scanner uses camera"): + machine.succeed("lomiri-camera-app --mode=barcode-reader >&2 &") + machine.wait_for_text("${qrLabel}") + machine.succeed("xdotool mousemove 320 610 click 1") # open up QR decode result + + # OCR is struggling to recognise the text. Click the clipboard button and paste the result somewhere else + machine.sleep(5) + machine.screenshot("lomiri-barcode_decode") + machine.succeed("xdotool mousemove 350 530 click 1") + machine.sleep(5) + + # Need to make a new window without closing camera app, otherwise clipboard content gets lost? + machine.send_key("ctrl-alt-right") + machine.succeed("gnome-text-editor >&2 &") + machine.wait_for_text("New") + + # Font size up to help with OCR + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + machine.send_key("ctrl-kp_add") + + machine.send_key("ctrl-v") + machine.wait_for_text("${qrContent}") + + machine.succeed("pkill -f gnome-text-editor") + machine.send_key("ctrl-alt-left") + machine.succeed("pkill -f lomiri-camera-app") + + with subtest("lomiri camera localisation works"): + machine.succeed("env LANG=de_DE.UTF-8 lomiri-camera-app >&2 &") + machine.wait_for_text("Kamera") + machine.screenshot("lomiri-camera_localised") + ''; +} diff --git a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix index 70672b67095a..34abc5d808ee 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix @@ -4,6 +4,7 @@ fetchFromGitLab, fetchpatch, gitUpdater, + nixosTests, cmake, content-hub, exiv2, @@ -214,6 +215,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + tests.vm = nixosTests.lomiri-camera-app; updateScript = gitUpdater { rev-prefix = "v"; }; }; From 826486cd2fc5141c7dc171220448c18ca41831c8 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 24 Jul 2024 16:06:46 +0200 Subject: [PATCH 11/92] nixos/lomiri: Add camera app --- nixos/modules/services/desktop-managers/lomiri.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 50080daaf7de..bd43b4c1cfda 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -22,6 +22,7 @@ in { libusermetrics lomiri lomiri-calculator-app + lomiri-camera-app lomiri-clock-app lomiri-download-manager lomiri-filemanager-app From 6e42f74cf95e19fc8426b8b95e42653265f036e3 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 24 Jul 2024 18:55:30 +0200 Subject: [PATCH 12/92] tests/lomiri: Drop OCR for starter content It has started to take 10 minutes to get a match, and we open the starter more than once. Let's just drop this check, ydotool helps alot with getting it open more reliably. --- nixos/tests/lomiri.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 912f4564ef7b..5236a5dafbe5 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -174,9 +174,6 @@ in { # Using the keybind has a chance of instantly closing the menu again? Just click the button mouse_click(20, 30) - # Look for Search box & GUI-less content-hub examples, highest chances of avoiding false positives - machine.wait_for_text(r"(Search|Export|Import|Share)") - start_all() machine.wait_for_unit("multi-user.target") From 3c6b76274a70873c74a4924624c7550f164d9c4b Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 30 Jul 2024 20:42:20 +0800 Subject: [PATCH 13/92] pixmam: test both wlroots_0_17 and wlroots_0_18 wlroots is unstable, should move to aliases.nix, both 0.17 and 0.18 are widely used in nixpkgs --- pkgs/development/libraries/pixman/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index b0791a2400a8..71c0b7d47037 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -12,7 +12,8 @@ , qemu , scribus , tigervnc -, wlroots +, wlroots_0_17 +, wlroots_0_18 , xwayland , gitUpdater @@ -66,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { - inherit cairo qemu scribus tigervnc wlroots xwayland; + inherit cairo qemu scribus tigervnc wlroots_0_17 wlroots_0_18 xwayland; pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; From 9f574a0c85550af138da17d698495a6f6c7a40ab Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 30 Jul 2024 23:37:03 +0800 Subject: [PATCH 14/92] tinywl: pinned on wlroots --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc9e1a55b1ab..fc5268484f27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34382,7 +34382,9 @@ with pkgs; trayer = callPackage ../applications/window-managers/trayer { }; - tinywl = callPackage ../applications/window-managers/tinywl { }; + tinywl = callPackage ../applications/window-managers/tinywl { + wlroots = wlroots_0_18; + }; tree-from-tags = callPackage ../applications/audio/tree-from-tags { }; From fd11fe9e7c098100c3da7fa4e244347546deca79 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 30 Jul 2024 20:48:51 +0800 Subject: [PATCH 15/92] wlroots: move to aliases.nix --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a97ab1c0c949..4ac132727695 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1519,6 +1519,7 @@ mapAliases ({ wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 wlroots_0_15 = throw "'wlroots_0_15' has been removed in favor of newer versions"; # Added 2024-03-28 + wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc5268484f27..aca2e0215f8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31238,8 +31238,7 @@ with pkgs; inherit (callPackages ../development/libraries/wlroots {}) wlroots_0_16 wlroots_0_17 - wlroots_0_18 - wlroots; + wlroots_0_18; sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { }); From cf1df147c5d4befae1240c13a1a7d280000aa0f6 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Tue, 30 Jul 2024 19:02:45 +0300 Subject: [PATCH 16/92] koboldcpp: 1.70.1 -> 1.71.1 Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.71.1 Diff: https://github.com/LostRuins/koboldcpp/compare/v1.70.1...v1.71.1 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 7d49b8dd4588..aecb24f217f3 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -53,13 +53,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.70.1"; + version = "1.71.1"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-wtSkmjx5mzESMvIflqH+QEavH5oeBgKBz8/JjU+CASo="; + hash = "sha256-69iqpXzG9NXrqv08lJ36hlHWXwXUJs6yqcaGr32cHPw="; }; enableParallelBuilding = true; From bb429ba52d3b1a99c20dd0a67af1e5868500cdaf Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 30 Jul 2024 09:16:46 +0200 Subject: [PATCH 17/92] cuda-modules: remove old aliases --- pkgs/development/cuda-modules/aliases.nix | 24 ++++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index 7f28f2c76d47..4e25dc44ca9a 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -1,18 +1,14 @@ -# Packges which have been deprecated or removed from cudaPackages +# Packages which have been deprecated or removed from cudaPackages final: prev: let - mkRenamed = - oldName: newName: newPkg: - final.lib.warn "cudaPackages.${oldName} is deprecated, use ${newName} instead" newPkg; -in -{ + inherit (prev.lib) warn; + inherit (builtins) mapAttrs; - # Deprecated: an alias kept for compatibility. Consider removing after 24.05 - autoFixElfFiles = mkRenamed "autoFixElfFiles" "pkgs.autoFixElfFiles" final.pkgs.autoFixElfFiles; # Added 2024-03-30 - autoAddDriverRunpath = - mkRenamed "autoAddDriverRunpath" "pkgs.autoAddDriverRunpath" - final.pkgs.autoAddDriverRunpath; # Added 2024-03-30 - autoAddOpenGLRunpathHook = - mkRenamed "autoAddOpenGLRunpathHook" "pkgs.autoAddDriverRunpathHook" - final.pkgs.autoAddDriverRunpath; # Added 2024-03-30 + mkRenamed = + oldName: + { path, package }: + warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package; +in +mapAttrs mkRenamed { + # A comment to prevent empty { } from collapsing into a single line } From 2a94466c639f3a5f5413104c177b1bd7697b40e0 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 30 Jul 2024 09:21:29 +0200 Subject: [PATCH 18/92] torch: do not deep-compare cudaPackages --- pkgs/development/python-modules/torch/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index ee7015abd8e6..feef28bbad33 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -202,8 +202,11 @@ let ]); "MPI cudatoolkit does not match cudaPackages.cudatoolkit" = MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit); + # This used to be a deep package set comparison between cudaPackages and + # effectiveMagma.cudaPackages, making torch too strict in cudaPackages. + # In particular, this triggered warnings from cuda's `aliases.nix` "Magma cudaPackages does not match cudaPackages" = - cudaSupport && (effectiveMagma.cudaPackages != cudaPackages); + cudaSupport && (effectiveMagma.cudaPackages.cudaVersion != cudaPackages.cudaVersion); "Rocm support is currently broken because `rocmPackages.hipblaslt` is unpackaged. (2024-06-09)" = rocmSupport; }; in From e2d06ea4f56b88d7b195b012ca6a7d47fcf11f8f Mon Sep 17 00:00:00 2001 From: ghpzin Date: Thu, 25 Jul 2024 21:32:35 +0300 Subject: [PATCH 19/92] python3Packages.wfuzz: fix build on Python 3.12 - add patch from upstream PR fixing imp module uses - disable test depending on imp module - replace distutils with setuptools._distutils --- .../development/python-modules/wfuzz/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index 8c46f47ffdaf..ab11125bb379 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -13,6 +13,7 @@ pythonOlder, setuptools, six, + fetchpatch2, }: buildPythonPackage rec { @@ -29,9 +30,22 @@ buildPythonPackage rec { hash = "sha256-RM6QM/iR00ymg0FBUtaWAtxPHIX4u9U/t5N/UT/T6sc="; }; + patches = [ + # replace use of imp module for Python 3.12 + # https://github.com/xmendez/wfuzz/pull/365 + (fetchpatch2 { + url = "https://github.com/xmendez/wfuzz/commit/f4c028b9ada4c36dabf3bc752f69f6ddc110920f.patch?full_index=1"; + hash = "sha256-t7pUMcdFmwAsGUNBRdZr+Jje/yR0yzeGIgeYNEq4hFE="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "pyparsing>=2.4*" "pyparsing>=2.4" + + # fix distutils use for Python 3.12 + substituteInPlace src/wfuzz/plugin_api/base.py \ + --replace-fail "from distutils import util" "from setuptools._distutils import util" ''; propagatedBuildInputs = [ @@ -56,6 +70,8 @@ buildPythonPackage rec { # The tests are requiring a local web server "tests/test_acceptance.py" "tests/acceptance/test_saved_filter.py" + # depends on imp module removed from Python 3.12 + "tests/test_moduleman.py" ]; pythonImportsCheck = [ "wfuzz" ]; From 670ac5606ce26f56a46f2b63f54a9e59b13f4f6a Mon Sep 17 00:00:00 2001 From: SomeoneSerge Date: Sun, 28 Jul 2024 16:50:30 +0000 Subject: [PATCH 20/92] faiss: mv test.pytest to python3Packages.test, fix eval --- .../libraries/science/math/faiss/default.nix | 4 ++- .../python-modules/faiss/default.nix | 9 +++++++ .../faiss/pytest.nix} | 25 +++++++++++-------- 3 files changed, 26 insertions(+), 12 deletions(-) rename pkgs/development/{libraries/science/math/faiss/tests.nix => python-modules/faiss/pytest.nix} (61%) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 5ef390b2e1ff..9d0dea3ff6a1 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -137,7 +137,9 @@ stdenv.mkDerivation { '' demo_ivfpq_indexing && touch $out ''; - } // lib.optionalAttrs pythonSupport { pytest = pythonPackages.callPackage ./tests.nix { }; }; + pythonFaiss = pythonPackages.faiss; + pytest = pythonPackages.faiss.tests.pytest; + }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/faiss/default.nix b/pkgs/development/python-modules/faiss/default.nix index 06ff4a4563ee..f6eee8cc5e32 100644 --- a/pkgs/development/python-modules/faiss/default.nix +++ b/pkgs/development/python-modules/faiss/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + callPackage, faiss-build, numpy, packaging, @@ -39,6 +40,14 @@ buildPythonPackage { pythonImportsCheck = [ "faiss" ]; + passthru = { + inherit (faiss-build) cudaSupport cudaPackages pythonSupport; + + tests = { + pytest = callPackage ./pytest.nix { inherit faiss-build; }; + }; + }; + meta = lib.pipe (faiss-build.meta or { }) [ (lib.flip builtins.removeAttrs [ "mainProgram" ]) (m: m // { description = "Bindings for faiss, the similarity search library"; }) diff --git a/pkgs/development/libraries/science/math/faiss/tests.nix b/pkgs/development/python-modules/faiss/pytest.nix similarity index 61% rename from pkgs/development/libraries/science/math/faiss/tests.nix rename to pkgs/development/python-modules/faiss/pytest.nix index 858a980bfeaf..b90ee9c244c6 100644 --- a/pkgs/development/libraries/science/math/faiss/tests.nix +++ b/pkgs/development/python-modules/faiss/pytest.nix @@ -1,8 +1,10 @@ -{ lib -, buildPythonPackage -, faiss -, scipy -, pytestCheckHook +{ + lib, + buildPythonPackage, + faiss, + faiss-build, + scipy, + pytestCheckHook, }: assert faiss.pythonSupport; @@ -13,15 +15,13 @@ buildPythonPackage { format = "other"; - src = "${faiss.src}/tests"; + src = "${faiss-build.src}/tests"; dontBuild = true; dontInstall = true; # Tests that need GPUs and would fail in the sandbox - disabledTestPaths = lib.optionals faiss.cudaSupport [ - "test_contrib.py" - ]; + disabledTestPaths = lib.optionals faiss.cudaSupport [ "test_contrib.py" ]; disabledTests = [ # https://github.com/facebookresearch/faiss/issues/2836 @@ -32,6 +32,9 @@ buildPythonPackage { faiss pytestCheckHook scipy - ] ++ - faiss.extra-requires.all; + ]; + + meta = faiss.meta // { + description = "Faiss test suite"; + }; } From 2079eeb882face7366c17486907ed45f25d913a0 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Tue, 30 Jul 2024 17:28:54 -0400 Subject: [PATCH 21/92] nixos/gotify-server: clean up and reformat module --- .../services/web-apps/gotify-server.nix | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/web-apps/gotify-server.nix b/nixos/modules/services/web-apps/gotify-server.nix index b700fd14ee52..ad1e35437fd8 100644 --- a/nixos/modules/services/web-apps/gotify-server.nix +++ b/nixos/modules/services/web-apps/gotify-server.nix @@ -1,33 +1,35 @@ -{ pkgs, lib, config, ... }: - -with lib; +{ + pkgs, + lib, + config, + ... +}: let cfg = config.services.gotify; -in { - options = { - services.gotify = { - enable = mkEnableOption "Gotify webserver"; +in +{ + options.services.gotify = { + enable = lib.mkEnableOption "Gotify webserver"; - port = mkOption { - type = types.port; - description = '' - Port the server listens to. - ''; - }; + port = lib.mkOption { + type = lib.types.port; + description = '' + Port the server listens to. + ''; + }; - stateDirectoryName = mkOption { - type = types.str; - default = "gotify-server"; - description = '' - The name of the directory below {file}`/var/lib` where - gotify stores its runtime data. - ''; - }; + stateDirectoryName = lib.mkOption { + type = lib.types.str; + default = "gotify-server"; + description = '' + The name of the directory below {file}`/var/lib` where + gotify stores its runtime data. + ''; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.gotify-server = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -41,7 +43,7 @@ in { WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; StateDirectory = cfg.stateDirectoryName; Restart = "always"; - DynamicUser = "yes"; + DynamicUser = true; ExecStart = "${pkgs.gotify-server}/bin/server"; }; }; From b5a051f69490d32e55f0ac737cad78bc9fcaeb23 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Tue, 30 Jul 2024 17:29:55 -0400 Subject: [PATCH 22/92] nixos/gotify-server: add maintainer --- nixos/modules/services/web-apps/gotify-server.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/web-apps/gotify-server.nix b/nixos/modules/services/web-apps/gotify-server.nix index ad1e35437fd8..ca64f43c597f 100644 --- a/nixos/modules/services/web-apps/gotify-server.nix +++ b/nixos/modules/services/web-apps/gotify-server.nix @@ -48,4 +48,6 @@ in }; }; }; + + meta.maintainers = with lib.maintainers; [ DCsunset ]; } From e1ced8b12c3be230bf9e23e42e330e0133a4f512 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Tue, 30 Jul 2024 17:32:01 -0400 Subject: [PATCH 23/92] nixos/gotify-server: add package option --- nixos/modules/services/web-apps/gotify-server.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/gotify-server.nix b/nixos/modules/services/web-apps/gotify-server.nix index ca64f43c597f..a310ced5325a 100644 --- a/nixos/modules/services/web-apps/gotify-server.nix +++ b/nixos/modules/services/web-apps/gotify-server.nix @@ -12,6 +12,8 @@ in options.services.gotify = { enable = lib.mkEnableOption "Gotify webserver"; + package = lib.mkPackageOption pkgs "gotify-server" { }; + port = lib.mkOption { type = lib.types.port; description = '' @@ -44,7 +46,7 @@ in StateDirectory = cfg.stateDirectoryName; Restart = "always"; DynamicUser = true; - ExecStart = "${pkgs.gotify-server}/bin/server"; + ExecStart = lib.getExe cfg.package; }; }; }; From 0c2918fc912c25bce8896e70bd2905052d214b47 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Tue, 30 Jul 2024 17:38:00 -0400 Subject: [PATCH 24/92] nixos/gotify-server: add environment and environmentFiles options --- .../services/web-apps/gotify-server.nix | 47 ++++++++++++++++--- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/gotify-server.nix b/nixos/modules/services/web-apps/gotify-server.nix index a310ced5325a..5f5a9f9f86bb 100644 --- a/nixos/modules/services/web-apps/gotify-server.nix +++ b/nixos/modules/services/web-apps/gotify-server.nix @@ -9,15 +9,51 @@ let cfg = config.services.gotify; in { + imports = [ + (lib.mkRenamedOptionModule + [ + "services" + "gotify" + "port" + ] + [ + "services" + "gotify" + "environment" + "GOTIFY_SERVER_PORT" + ] + ) + ]; + options.services.gotify = { enable = lib.mkEnableOption "Gotify webserver"; package = lib.mkPackageOption pkgs "gotify-server" { }; - port = lib.mkOption { - type = lib.types.port; + environment = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.oneOf [ + lib.types.str + lib.types.int + ] + ); + default = { }; + example = { + GOTIFY_SERVER_PORT = 8080; + GOTIFY_DATABASE_DIALECT = "sqlite3"; + }; description = '' - Port the server listens to. + Config environment variables for the gotify-server. + See https://gotify.net/docs/config for more details. + ''; + }; + + environmentFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + Files containing additional config environment variables for gotify-server. + Secrets should be set in environmentFiles instead of environment. ''; }; @@ -37,13 +73,12 @@ in after = [ "network.target" ]; description = "Simple server for sending and receiving messages"; - environment = { - GOTIFY_SERVER_PORT = toString cfg.port; - }; + environment = lib.mapAttrs (_: toString) cfg.environment; serviceConfig = { WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; StateDirectory = cfg.stateDirectoryName; + EnvironmentFile = cfg.environmentFiles; Restart = "always"; DynamicUser = true; ExecStart = lib.getExe cfg.package; From a191e88a1afda4a731181943e1aab1c33a40fb62 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Tue, 30 Jul 2024 17:40:17 -0400 Subject: [PATCH 25/92] nixos/gotify-server: update test --- nixos/tests/gotify-server.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/gotify-server.nix b/nixos/tests/gotify-server.nix index c8d7fa172a7b..495b1c8e3443 100644 --- a/nixos/tests/gotify-server.nix +++ b/nixos/tests/gotify-server.nix @@ -9,7 +9,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.gotify = { enable = true; - port = 3000; + environment = { + GOTIFY_SERVER_PORT = 3000; + }; }; }; From 0bb48f173217968b6640e2e2c5016312e7cbdd10 Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 30 Jul 2024 22:19:39 +0000 Subject: [PATCH 26/92] flyctl: 0.2.94 -> 0.2.101 Change-Id: Ic02269f63c2b43af18e0bd432d31621bcaf0d10e --- pkgs/development/web/flyctl/default.nix | 6 +++--- .../development/web/flyctl/disable-auto-update.patch | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index bc1ca7484287..aeb4ee710079 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.94"; + version = "0.2.101"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-yw8c3afGmriEoewSA8gIcuVDfRUwXqG46fi36GCGQBM="; + hash = "sha256-Ceep71qyQXX+UQzI7VP64WRk5wMF7QADxs3on75cBic="; }; - vendorHash = "sha256-L5tQ45Dujnef31Fs05mK5u+6zaGyJi1HkipOvkmra/0="; + vendorHash = "sha256-l1Pt1eMgj/ZlOhV/yOVnJek9qm86n3iTKIQi3B3Kweo="; subPackages = [ "." ]; diff --git a/pkgs/development/web/flyctl/disable-auto-update.patch b/pkgs/development/web/flyctl/disable-auto-update.patch index d6c59755f881..3fe6048871e4 100644 --- a/pkgs/development/web/flyctl/disable-auto-update.patch +++ b/pkgs/development/web/flyctl/disable-auto-update.patch @@ -1,4 +1,4 @@ -From 9c76dbff982b0fd8beaffae42a6e98bc1e67f089 Mon Sep 17 00:00:00 2001 +From a46bc88829282032ab1d68ef6d67d25421ab8d32 Mon Sep 17 00:00:00 2001 From: Gabriel Simmer Date: Fri, 21 Jul 2023 08:16:52 +0100 Subject: [PATCH] Disable auto update @@ -8,18 +8,18 @@ Subject: [PATCH] Disable auto update 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/config/config.go b/internal/config/config.go -index 1914f8e0..958baf27 100644 +index 04583ca5..1b085b55 100644 --- a/internal/config/config.go +++ b/internal/config/config.go -@@ -141,7 +141,7 @@ func (cfg *Config) ApplyFile(path string) (err error) { - AutoUpdate bool `yaml:"auto_update"` +@@ -173,7 +173,7 @@ func (cfg *Config) applyFile(path string) (err error) { + SyntheticsAgent bool `yaml:"synthetics_agent"` } w.SendMetrics = true - w.AutoUpdate = true + w.AutoUpdate = false + w.SyntheticsAgent = true if err = unmarshal(path, &w); err == nil { - cfg.AccessToken = w.AccessToken -- -2.41.0 +2.45.2 From 0e844071c4cca6e11c08186d2b13c76b7c1b1e2d Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Tue, 30 Jul 2024 22:26:56 -0400 Subject: [PATCH 27/92] python3Packages.uxsim: 1.3.1 -> 1.4.0 --- pkgs/development/python-modules/uxsim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index f75a620ec5a1..17906660c0e4 100644 --- a/pkgs/development/python-modules/uxsim/default.nix +++ b/pkgs/development/python-modules/uxsim/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.3.1"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; rev = "refs/tags/v${version}"; - hash = "sha256-74iNsRtEmpE+i4FeKCXrqczdMP9u4mVt6eyF/4RXZfU="; + hash = "sha256-cWtBmBmrQTruRZ8n8O6i9LGlHMR5UvRhcOICvwP383M="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; From b6ae22c2417f5b62ecea2dc299352d9527e1de2c Mon Sep 17 00:00:00 2001 From: Luna Perego Date: Sun, 30 Jun 2024 22:51:34 +0200 Subject: [PATCH 28/92] gnomeExtensions.guillotine: package manually --- .../gnome/extensions/guillotine/default.nix | 55 +++++++++++++++++++ .../gnome/extensions/manuallyPackaged.nix | 1 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/desktops/gnome/extensions/guillotine/default.nix diff --git a/pkgs/desktops/gnome/extensions/guillotine/default.nix b/pkgs/desktops/gnome/extensions/guillotine/default.nix new file mode 100644 index 000000000000..947317b1fe93 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/guillotine/default.nix @@ -0,0 +1,55 @@ +{ + stdenv, + lib, + fetchFromGitLab, + glib, +}: +# We package this manually because upstream stopped updating the package to +# extensions.gnome.org. See: +# https://gitlab.com/ente76/guillotine/-/issues/17 +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-shell-extension-guillotine"; + version = "24"; + + src = fetchFromGitLab { + owner = "ente76"; + repo = "guillotine"; + rev = "v${finalAttrs.version}"; + hash = "sha256-eNhK3h9luPGXHR3lPkfu/mUN9+ixma64rbCk0cjF4Fc="; + }; + + nativeBuildInputs = [ glib ]; + + passthru = { + extensionUuid = "guillotine@fopdoodle.net"; + extensionPortalSlug = "guillotine"; + }; + + buildPhase = '' + runHook preBuild + rm schemas/gschemas.compiled + glib-compile-schemas schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/guillotine@fopdoodle.net + cp -R schemas "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp default.json $out/share/gnome-shell/extensions/guillotine@fopdoodle.net + cp extension.js "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp guillotine-symbolic.svg "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp LICENSE "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp metadata.json "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp README.md "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + runHook postInstall + ''; + + meta = { + description = "A gnome extension designed for efficiently carrying out executions of commands from a customizable menu"; + homepage = "https://gitlab.com/ente76/guillotine/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ husky ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index fa5d72cb1c49..b1b6e0695b2f 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -6,6 +6,7 @@ "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; + "guillotine@fopdoodle.net" = callPackage ./guillotine { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; From 3beb8cad2e3417c44b6d064f93f9500cd57f2a2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 04:53:24 +0000 Subject: [PATCH 29/92] google-java-format: 1.22.0 -> 1.23.0 --- pkgs/development/tools/google-java-format/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index b5196f01e5a4..cbecd3d59816 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.22.0"; + version = "1.23.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-FrKh7pOGhsix2Iq/GeuD39DWI87p3m/G0JmAIU+BbT8="; + sha256 = "sha256-fGN1rCS0glvmu+YZAOi1ixo+iUShNnqDYyEPntLQhXA="; }; dontUnpack = true; From eeb23d8a44efc7b0293b8c941d554f13f3ebc607 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 30 Jul 2024 15:29:36 +0200 Subject: [PATCH 30/92] python312Packages.h5py: mark as broken on x86_64-darwin --- pkgs/development/python-modules/h5py/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 6a1dd926f07a..80eb055a1d6d 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -14,6 +14,7 @@ pytestCheckHook, pytest-mpi, cached-property, + stdenv, }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -46,9 +47,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace-fail "numpy >=2.0.0rc1" "numpy" ''; - pythonRelaxDeps = [ - "mpi4py" - ]; + pythonRelaxDeps = [ "mpi4py" ]; HDF5_DIR = "${hdf5}"; HDF5_MPI = if mpiSupport then "ON" else "OFF"; @@ -100,5 +99,9 @@ buildPythonPackage rec { homepage = "http://www.h5py.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ doronbehar ]; + # When importing `h5py` during the build, we get: + # + # ValueError: Not a datatype (not a datatype) + broken = stdenv.isDarwin && stdenv.isx86_64; }; } From 5622ff23c9e6aef821249fa053d62e0bb0b3ba1d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 23 Jul 2024 15:50:02 +0200 Subject: [PATCH 31/92] mopsa: init at 1.0 --- .../ocaml-modules/mopsa/default.nix | 80 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/ocaml-packages.nix | 2 + 3 files changed, 84 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mopsa/default.nix diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix new file mode 100644 index 000000000000..8f084ef9618d --- /dev/null +++ b/pkgs/development/ocaml-modules/mopsa/default.nix @@ -0,0 +1,80 @@ +{ + lib, + buildDunePackage, + fetchFromGitLab, + clang, + libclang, + libllvm, + flint, + mpfr, + pplite, + ocaml, + menhir, + apron, + camlidl, + yojson, + zarith, +}: + +buildDunePackage rec { + pname = "mopsa"; + version = "1.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchFromGitLab { + owner = "mopsa"; + repo = "mopsa-analyzer"; + rev = "v${version}"; + hash = "sha256-nGnWwV7g3SYgShbXGUMooyOdFwXFrQHnQvlc8x9TAS4="; + }; + + nativeBuildInputs = [ + clang + libllvm + menhir + ]; + + buildInputs = [ + camlidl + flint + libclang + mpfr + pplite + ]; + + propagatedBuildInputs = [ + apron + yojson + zarith + ]; + + postPatch = '' + patchShebangs bin + ''; + + buildPhase = '' + runHook preBuild + dune build --profile release -p mopsa + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + dune install --profile release --prefix=$bin --libdir=$out/lib/ocaml/${ocaml.version}/site-lib + runHook postInstall + ''; + + outputs = [ + "bin" + "out" + ]; + + meta = { + license = lib.licenses.lgpl3Plus; + homepage = "https://mopsa.lip6.fr/"; + description = "A Modular and Open Platform for Static Analysis using Abstract Interpretation"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46988f82680d..112606260c3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18810,6 +18810,8 @@ with pkgs; moon = callPackage ../development/tools/build-managers/moon/default.nix { }; + mopsa = ocamlPackages.mopsa.bin; + msgpack-tools = callPackage ../development/tools/msgpack-tools { }; msgpuck = callPackage ../development/libraries/msgpuck { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index da8b7108816d..b8072a5ef5ce 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1181,6 +1181,8 @@ let mmap = callPackage ../development/ocaml-modules/mmap { }; + mopsa = callPackage ../development/ocaml-modules/mopsa { }; + morbig = callPackage ../development/ocaml-modules/morbig { }; mparser = callPackage ../development/ocaml-modules/mparser { }; From f51e3fb4db44f1f03343795ae2b31e8c95ee2f9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 06:52:24 +0000 Subject: [PATCH 32/92] gh-markdown-preview: 1.5.0 -> 1.6.0 --- pkgs/tools/misc/gh-markdown-preview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gh-markdown-preview/default.nix b/pkgs/tools/misc/gh-markdown-preview/default.nix index 573cd607be41..a59865239885 100644 --- a/pkgs/tools/misc/gh-markdown-preview/default.nix +++ b/pkgs/tools/misc/gh-markdown-preview/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-markdown-preview"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "yusukebe"; repo = "gh-markdown-preview"; rev = "v${version}"; - hash = "sha256-gi6Wza8v4V8PAHO75UycP0CEzvXEtm22hTEWs/dJ+LQ="; + hash = "sha256-WOdcivT9s1yFOF6oXMaIay4i/zOhlBLxCaID8H3hnJw="; }; vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E="; From 230fcec81e42e17c968eec3c0c5452ea891ed0e0 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 31 Jul 2024 14:56:49 +0800 Subject: [PATCH 33/92] openconnect: fix build on darwin by only including pcsclite on linux. --- pkgs/tools/networking/openconnect/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix index 42a8851d25aa..0dccb0e92fff 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/tools/networking/openconnect/common.nix @@ -21,7 +21,7 @@ , autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openconnect"; inherit version src; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { "--without-openssl-version-check" ]; - buildInputs = [ gmp libxml2 stoken zlib pcsclite (if useOpenSSL then openssl else gnutls) ] + buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optional stdenv.isLinux p11-kit + ++ lib.optionals stdenv.isLinux [ p11-kit pcsclite ] ++ lib.optional useDefaultExternalBrowser xdg-utils; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 2327299ec4766da88a0e530c9d140b03a14cffd7 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 31 Jul 2024 10:01:56 +0300 Subject: [PATCH 34/92] nixpkgs/release-checks: actually log the warnings --- pkgs/top-level/nixpkgs-basic-release-checks.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index 8d746001c5d6..0aa1bc1385af 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -82,9 +82,10 @@ pkgs.runCommand "nixpkgs-release-checks" # Catch any trace calls not caught by NIX_ABORT_ON_WARN (lib.warn) if [ -s eval-warnings.log ]; then echo "Nixpkgs on $platform evaluated with warnings, aborting" + echo "Warnings logged:" + cat eval-warnings.log exit 1 fi - rm eval-warnings.log nix-env -f $src \ --show-trace --argstr system "$platform" \ From bcba08a2864a7f26ab930aa8abebbff0b68e29a1 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 31 Jul 2024 10:02:12 +0300 Subject: [PATCH 35/92] nixpkgs/release-checks: remove debug print --- pkgs/top-level/nixpkgs-basic-release-checks.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index 0aa1bc1385af..3a9f97c45776 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -62,7 +62,6 @@ pkgs.runCommand "nixpkgs-release-checks" fi s1=$(sha1sum packages1 | cut -c1-40) - echo $s1 nix-env -f $src2 \ --show-trace --argstr system "$platform" \ From 832fe14732b313cae870b078f582b77615a25104 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 31 Jul 2024 10:02:18 +0300 Subject: [PATCH 36/92] nixpkgs/release-checks: shut up GC --- pkgs/top-level/nixpkgs-basic-release-checks.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index 3a9f97c45776..3cbb581734af 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -44,6 +44,9 @@ pkgs.runCommand "nixpkgs-release-checks" # Relies on impure eval export NIX_ABORT_ON_WARN=true + # Suppress GC warnings + export GC_LARGE_ALLOC_WARN_INTERVAL=100000 + set +e ( set -x From 2bd7cf6cca82d777f715949b84120a682b82398b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 20:55:34 +0200 Subject: [PATCH 37/92] vpsfree-client: move to by-name --- .../{tools/virtualization => by-name/vp}/vpsfree-client/Gemfile | 0 .../virtualization => by-name/vp}/vpsfree-client/Gemfile.lock | 0 .../virtualization => by-name/vp}/vpsfree-client/gemset.nix | 0 .../default.nix => by-name/vp/vpsfree-client/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/virtualization => by-name/vp}/vpsfree-client/Gemfile (100%) rename pkgs/{tools/virtualization => by-name/vp}/vpsfree-client/Gemfile.lock (100%) rename pkgs/{tools/virtualization => by-name/vp}/vpsfree-client/gemset.nix (100%) rename pkgs/{tools/virtualization/vpsfree-client/default.nix => by-name/vp/vpsfree-client/package.nix} (100%) diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile b/pkgs/by-name/vp/vpsfree-client/Gemfile similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/Gemfile rename to pkgs/by-name/vp/vpsfree-client/Gemfile diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock b/pkgs/by-name/vp/vpsfree-client/Gemfile.lock similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/Gemfile.lock rename to pkgs/by-name/vp/vpsfree-client/Gemfile.lock diff --git a/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/pkgs/by-name/vp/vpsfree-client/gemset.nix similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/gemset.nix rename to pkgs/by-name/vp/vpsfree-client/gemset.nix diff --git a/pkgs/tools/virtualization/vpsfree-client/default.nix b/pkgs/by-name/vp/vpsfree-client/package.nix similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/default.nix rename to pkgs/by-name/vp/vpsfree-client/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 112606260c3d..f211ae64da57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40209,8 +40209,6 @@ with pkgs; ryzenadj = callPackage ../os-specific/linux/ryzenadj { }; - vpsfree-client = callPackage ../tools/virtualization/vpsfree-client { }; - gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; zalgo = callPackage ../tools/misc/zalgo { }; From 8b6aed7ed3df0a720fa58d2ba3287505f9ca048c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 20:57:48 +0200 Subject: [PATCH 38/92] webfs: move to by-name --- pkgs/{servers/http => by-name/we}/webfs/ls.c.patch | 0 .../http/webfs/default.nix => by-name/we/webfs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{servers/http => by-name/we}/webfs/ls.c.patch (100%) rename pkgs/{servers/http/webfs/default.nix => by-name/we/webfs/package.nix} (100%) diff --git a/pkgs/servers/http/webfs/ls.c.patch b/pkgs/by-name/we/webfs/ls.c.patch similarity index 100% rename from pkgs/servers/http/webfs/ls.c.patch rename to pkgs/by-name/we/webfs/ls.c.patch diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/by-name/we/webfs/package.nix similarity index 100% rename from pkgs/servers/http/webfs/default.nix rename to pkgs/by-name/we/webfs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f211ae64da57..ce4831c4b39d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39662,8 +39662,6 @@ with pkgs; wcalc = callPackage ../applications/misc/wcalc { }; - webfs = callPackage ../servers/http/webfs { }; - webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; websocketd = callPackage ../applications/networking/websocketd { }; From 99dc6c2efa30ba13bd24321fb47fb33c19fd0467 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 20:59:13 +0200 Subject: [PATCH 39/92] nixpkgs-fmt: move to by-name --- .../default.nix => by-name/ni/nixpkgs-fmt/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/nix/nixpkgs-fmt/default.nix => by-name/ni/nixpkgs-fmt/package.nix} (100%) diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/by-name/ni/nixpkgs-fmt/package.nix similarity index 100% rename from pkgs/tools/nix/nixpkgs-fmt/default.nix rename to pkgs/by-name/ni/nixpkgs-fmt/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce4831c4b39d..5cac9bed5564 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39085,8 +39085,6 @@ with pkgs; nixfmt-classic = haskellPackages.nixfmt.bin; - nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; - nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { }; nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { }; From 31e5e88a9334a2e180ca0369bf481c8a1709f94e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:00:55 +0200 Subject: [PATCH 40/92] nix-store-gcs-proxy: move to by-name --- .../default.nix => by-name/ni/nix-store-gcs-proxy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/nix/nix-store-gcs-proxy/default.nix => by-name/ni/nix-store-gcs-proxy/package.nix} (100%) diff --git a/pkgs/tools/nix/nix-store-gcs-proxy/default.nix b/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix similarity index 100% rename from pkgs/tools/nix/nix-store-gcs-proxy/default.nix rename to pkgs/by-name/ni/nix-store-gcs-proxy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cac9bed5564..6ccc8e840321 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40141,8 +40141,6 @@ with pkgs; verifpal = callPackage ../tools/security/verifpal { }; - nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy { }; - weasis = callPackage ../by-name/we/weasis/package.nix { jre = jdk21; }; From 7266ad59cea0683d4e336bc9b3e7b9460d664d55 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:01:57 +0200 Subject: [PATCH 41/92] nar-serve: move to by-name --- .../nar-serve/default.nix => by-name/na/nar-serve/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/nix/nar-serve/default.nix => by-name/na/nar-serve/package.nix} (100%) diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/by-name/na/nar-serve/package.nix similarity index 100% rename from pkgs/tools/nix/nar-serve/default.nix rename to pkgs/by-name/na/nar-serve/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ccc8e840321..7f747384b2c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38869,8 +38869,6 @@ with pkgs; narrowlink = callPackage ../tools/networking/narrowlink { }; - nar-serve = callPackage ../tools/nix/nar-serve { }; - neo = callPackage ../applications/misc/neo { }; networkd-dispatcher = callPackage ../tools/networking/networkd-dispatcher { }; From 06e0eef0f743a587aa74ff778729ae230d8198a8 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:04:38 +0200 Subject: [PATCH 42/92] gist: move to by-name --- .../text/gist/default.nix => by-name/gi/gist/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/text/gist/default.nix => by-name/gi/gist/package.nix} (100%) diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/by-name/gi/gist/package.nix similarity index 100% rename from pkgs/tools/text/gist/default.nix rename to pkgs/by-name/gi/gist/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f747384b2c1..d638859738fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5331,8 +5331,6 @@ with pkgs; girsh = callPackage ../tools/networking/girsh { }; - gist = callPackage ../tools/text/gist { }; - gitjacker = callPackage ../tools/security/gitjacker { }; gixy = callPackage ../tools/admin/gixy { }; From ebed8837b50e7ecdf3d009ba1ed9063b713d9233 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:05:17 +0200 Subject: [PATCH 43/92] shab: move to by-name --- .../text/shab/default.nix => by-name/sh/shab/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/text/shab/default.nix => by-name/sh/shab/package.nix} (100%) diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/by-name/sh/shab/package.nix similarity index 100% rename from pkgs/tools/text/shab/default.nix rename to pkgs/by-name/sh/shab/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d638859738fb..81840eb63c67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6086,8 +6086,6 @@ with pkgs; sgp4 = callPackage ../development/libraries/sgp4 { }; - shab = callPackage ../tools/text/shab { }; - sheldon = callPackage ../tools/misc/sheldon { inherit (darwin.apple_sdk.frameworks) Security; }; From 4cfef992fa857e2a5f56b89f574016e981085950 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:06:16 +0200 Subject: [PATCH 44/92] goreman: move to by-name --- .../goreman/default.nix => by-name/go/goreman/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{tools/system/goreman/default.nix => by-name/go/goreman/package.nix} (100%) diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/by-name/go/goreman/package.nix similarity index 100% rename from pkgs/tools/system/goreman/default.nix rename to pkgs/by-name/go/goreman/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81840eb63c67..bee49333e0b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18352,7 +18352,6 @@ with pkgs; fly = callPackage ../development/tools/continuous-integration/fly { }; foreman = callPackage ../tools/system/foreman { }; - goreman = callPackage ../tools/system/goreman { }; fprettify = callPackage ../development/tools/fprettify { }; From 1629c2eac051952a09d87e5a0174dc83d1ed3382 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:06:56 +0200 Subject: [PATCH 45/92] foreman: move to by-name --- pkgs/{tools/system => by-name/fo}/foreman/Gemfile | 0 pkgs/{tools/system => by-name/fo}/foreman/Gemfile.lock | 0 pkgs/{tools/system => by-name/fo}/foreman/gemset.nix | 0 .../foreman/default.nix => by-name/fo/foreman/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/system => by-name/fo}/foreman/Gemfile (100%) rename pkgs/{tools/system => by-name/fo}/foreman/Gemfile.lock (100%) rename pkgs/{tools/system => by-name/fo}/foreman/gemset.nix (100%) rename pkgs/{tools/system/foreman/default.nix => by-name/fo/foreman/package.nix} (100%) diff --git a/pkgs/tools/system/foreman/Gemfile b/pkgs/by-name/fo/foreman/Gemfile similarity index 100% rename from pkgs/tools/system/foreman/Gemfile rename to pkgs/by-name/fo/foreman/Gemfile diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/by-name/fo/foreman/Gemfile.lock similarity index 100% rename from pkgs/tools/system/foreman/Gemfile.lock rename to pkgs/by-name/fo/foreman/Gemfile.lock diff --git a/pkgs/tools/system/foreman/gemset.nix b/pkgs/by-name/fo/foreman/gemset.nix similarity index 100% rename from pkgs/tools/system/foreman/gemset.nix rename to pkgs/by-name/fo/foreman/gemset.nix diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/by-name/fo/foreman/package.nix similarity index 100% rename from pkgs/tools/system/foreman/default.nix rename to pkgs/by-name/fo/foreman/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bee49333e0b8..7bb2f69881c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18351,8 +18351,6 @@ with pkgs; fly = callPackage ../development/tools/continuous-integration/fly { }; - foreman = callPackage ../tools/system/foreman { }; - fprettify = callPackage ../development/tools/fprettify { }; framac = callPackage ../development/tools/analysis/frama-c { }; From feb8a6f0517dab497934ac029475d4191735467e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:07:33 +0200 Subject: [PATCH 46/92] confd: move to by-name --- .../system/confd/default.nix => by-name/co/confd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/system/confd/default.nix => by-name/co/confd/package.nix} (100%) diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/by-name/co/confd/package.nix similarity index 100% rename from pkgs/tools/system/confd/default.nix rename to pkgs/by-name/co/confd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bb2f69881c2..9701cc5e7951 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35594,8 +35594,6 @@ with pkgs; conceal = callPackage ../applications/misc/conceal { }; - confd = callPackage ../tools/system/confd { }; - conmon = callPackage ../applications/virtualization/conmon { }; conmon-rs = callPackage ../applications/virtualization/conmon-rs { }; From dd69ea8ebd5866a71beed304aa34283d4e88c49c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:08:25 +0200 Subject: [PATCH 47/92] gerrit: move to by-name --- .../gerrit/default.nix => by-name/ge/gerrit/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/gerrit/default.nix => by-name/ge/gerrit/package.nix} (100%) diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/by-name/ge/gerrit/package.nix similarity index 100% rename from pkgs/applications/version-management/gerrit/default.nix rename to pkgs/by-name/ge/gerrit/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9701cc5e7951..c14f6c1d706f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8151,8 +8151,6 @@ with pkgs; geonkick = callPackage ../applications/audio/geonkick { }; - gerrit = callPackage ../applications/version-management/gerrit { }; - geteltorito = callPackage ../tools/misc/geteltorito { }; getopt = callPackage ../tools/misc/getopt { }; From 159042ff69e64df4c0e99581e2ff82332d469537 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:09:34 +0200 Subject: [PATCH 48/92] verifpal: move to by-name --- .../verifpal/default.nix => by-name/ve/verifpal/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/verifpal/default.nix => by-name/ve/verifpal/package.nix} (100%) diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/by-name/ve/verifpal/package.nix similarity index 100% rename from pkgs/tools/security/verifpal/default.nix rename to pkgs/by-name/ve/verifpal/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c14f6c1d706f..a668a42d1277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40126,8 +40126,6 @@ with pkgs; pigeon = callPackage ../development/tools/pigeon { }; - verifpal = callPackage ../tools/security/verifpal { }; - weasis = callPackage ../by-name/we/weasis/package.nix { jre = jdk21; }; From 7b8adc065a9c17d1204008df1371c0905ba69bd2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:10:19 +0200 Subject: [PATCH 49/92] su-exec: move to by-name --- .../su-exec/default.nix => by-name/su/su-exec/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/su-exec/default.nix => by-name/su/su-exec/package.nix} (100%) diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/by-name/su/su-exec/package.nix similarity index 100% rename from pkgs/tools/security/su-exec/default.nix rename to pkgs/by-name/su/su-exec/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a668a42d1277..c5aeaf70140e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12997,8 +12997,6 @@ with pkgs; structorizer = callPackage ../applications/graphics/structorizer { }; - su-exec = callPackage ../tools/security/su-exec { }; - subberthehut = callPackage ../tools/misc/subberthehut { }; subedit = callPackage ../tools/text/subedit { }; From 65a6b8edc6a5b62dd0eea5a8c2416e19ca694d62 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:11:37 +0200 Subject: [PATCH 50/92] git-codeowners: move to by-name --- .../default.nix => by-name/gi/git-codeowners/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/git-codeowners/default.nix => by-name/gi/git-codeowners/package.nix} (100%) diff --git a/pkgs/applications/version-management/git-codeowners/default.nix b/pkgs/by-name/gi/git-codeowners/package.nix similarity index 100% rename from pkgs/applications/version-management/git-codeowners/default.nix rename to pkgs/by-name/gi/git-codeowners/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5aeaf70140e..5af21cfed20b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2282,8 +2282,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - git-codeowners = callPackage ../applications/version-management/git-codeowners { }; - git-codereview = callPackage ../applications/version-management/git-codereview { }; git-cola = callPackage ../applications/version-management/git-cola { }; From e6717ef35b7bf4d67865a388c60b28b642a3853b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:15:35 +0200 Subject: [PATCH 51/92] terraform-docs: move to by-name --- .../default.nix => by-name/te/terraform-docs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/terraform-docs/default.nix => by-name/te/terraform-docs/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/by-name/te/terraform-docs/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform-docs/default.nix rename to pkgs/by-name/te/terraform-docs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af21cfed20b..afe943669609 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39464,8 +39464,6 @@ with pkgs; terraform-backend-git = callPackage ../applications/networking/cluster/terraform-backend-git { }; - terraform-docs = callPackage ../applications/networking/cluster/terraform-docs { }; - terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory { }; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { }; From 7724b648cf2c6b4cf379dcaab1fe63f190d9c813 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:17:24 +0200 Subject: [PATCH 52/92] kubectl-doctor: move to by-name --- .../default.nix => by-name/ku/kubectl-doctor/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/kubectl-doctor/default.nix => by-name/ku/kubectl-doctor/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/by-name/ku/kubectl-doctor/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-doctor/default.nix rename to pkgs/by-name/ku/kubectl-doctor/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afe943669609..63a6b335b0a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31727,8 +31727,6 @@ with pkgs; kubectl-cnpg = callPackage ../applications/networking/cluster/kubectl-cnpg { }; - kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; - kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { }; From caa12efaf425a4b5fd083daf96401e002e10869a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:19:35 +0200 Subject: [PATCH 53/92] keycard-cli: move to by-name --- .../default.nix => by-name/ke/keycard-cli/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/keycard-cli/default.nix => by-name/ke/keycard-cli/package.nix} (100%) diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/by-name/ke/keycard-cli/package.nix similarity index 100% rename from pkgs/tools/security/keycard-cli/default.nix rename to pkgs/by-name/ke/keycard-cli/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63a6b335b0a6..21d42b0dff17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40132,8 +40132,6 @@ with pkgs; coz = callPackage ../development/tools/analysis/coz { }; - keycard-cli = callPackage ../tools/security/keycard-cli { }; - sieveshell = with python3.pkgs; toPythonApplication managesieve; gortr = callPackage ../servers/gortr { }; From ec7188d73d959d4cad5342db6114d5ac176b7adc Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:20:23 +0200 Subject: [PATCH 54/92] bundix: move to by-name --- .../bundix/default.nix => by-name/bu/bundix/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{development/ruby-modules/bundix/default.nix => by-name/bu/bundix/package.nix} (100%) diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/by-name/bu/bundix/package.nix similarity index 100% rename from pkgs/development/ruby-modules/bundix/default.nix rename to pkgs/by-name/bu/bundix/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21d42b0dff17..4b3e3d7218db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17244,7 +17244,6 @@ with pkgs; inherit (darwin) DarwinTools autoSignDarwinBinariesHook; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - bundix = callPackage ../development/ruby-modules/bundix { }; bundler = callPackage ../development/ruby-modules/bundler { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; From 840dc890e9a3bba40e5a963c318ea4961c2b97f9 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:21:03 +0200 Subject: [PATCH 55/92] zerotierone: move to by-name --- .../0001-darwin-disable-link-time-optimization.patch | 0 pkgs/{tools/networking => by-name/ze}/zerotierone/Cargo.lock | 0 .../default.nix => by-name/ze/zerotierone/package.nix} | 0 pkgs/{tools/networking => by-name/ze}/zerotierone/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/networking => by-name/ze}/zerotierone/0001-darwin-disable-link-time-optimization.patch (100%) rename pkgs/{tools/networking => by-name/ze}/zerotierone/Cargo.lock (100%) rename pkgs/{tools/networking/zerotierone/default.nix => by-name/ze/zerotierone/package.nix} (100%) rename pkgs/{tools/networking => by-name/ze}/zerotierone/update.sh (100%) diff --git a/pkgs/tools/networking/zerotierone/0001-darwin-disable-link-time-optimization.patch b/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch similarity index 100% rename from pkgs/tools/networking/zerotierone/0001-darwin-disable-link-time-optimization.patch rename to pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch diff --git a/pkgs/tools/networking/zerotierone/Cargo.lock b/pkgs/by-name/ze/zerotierone/Cargo.lock similarity index 100% rename from pkgs/tools/networking/zerotierone/Cargo.lock rename to pkgs/by-name/ze/zerotierone/Cargo.lock diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/by-name/ze/zerotierone/package.nix similarity index 100% rename from pkgs/tools/networking/zerotierone/default.nix rename to pkgs/by-name/ze/zerotierone/package.nix diff --git a/pkgs/tools/networking/zerotierone/update.sh b/pkgs/by-name/ze/zerotierone/update.sh similarity index 100% rename from pkgs/tools/networking/zerotierone/update.sh rename to pkgs/by-name/ze/zerotierone/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b3e3d7218db..87e686496455 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14595,8 +14595,6 @@ with pkgs; nvidiaSupport = true; }; - zerotierone = callPackage ../tools/networking/zerotierone { }; - zerofree = callPackage ../tools/filesystems/zerofree { }; zet = callPackage ../tools/text/zet { }; From 3d2cee1c04d420572c81abe4e32c86e3dcf7e1aa Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:22:56 +0200 Subject: [PATCH 56/92] direnv: move to by-name --- .../misc/direnv/default.nix => by-name/di/direnv/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/direnv/default.nix => by-name/di/direnv/package.nix} (100%) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/by-name/di/direnv/package.nix similarity index 100% rename from pkgs/tools/misc/direnv/default.nix rename to pkgs/by-name/di/direnv/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87e686496455..12e67bb2de6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4867,8 +4867,6 @@ with pkgs; dirb = callPackage ../tools/networking/dirb { }; - direnv = callPackage ../tools/misc/direnv { }; - dirstalk = callPackage ../tools/security/dirstalk { }; h = callPackage ../tools/misc/h { }; From 66194de349468815f3e4f5fcdcdd1f20e9dd4335 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:25:02 +0200 Subject: [PATCH 57/92] gifsicle: move to by-name --- .../gifsicle/default.nix => by-name/gi/gifsicle/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/graphics/gifsicle/default.nix => by-name/gi/gifsicle/package.nix} (100%) diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/by-name/gi/gifsicle/package.nix similarity index 100% rename from pkgs/tools/graphics/gifsicle/default.nix rename to pkgs/by-name/gi/gifsicle/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12e67bb2de6a..5b806424ec9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8179,8 +8179,6 @@ with pkgs; gibo = callPackage ../tools/misc/gibo { }; - gifsicle = callPackage ../tools/graphics/gifsicle { }; - gifski = callPackage ../tools/graphics/gifski { ffmpeg = ffmpeg_6; }; From 43ab2b48b3d1268e049d61d676a16afd8a9ebd17 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:26:09 +0200 Subject: [PATCH 58/92] ovh-ttyrec: move to by-name --- .../default.nix => by-name/ov/ovh-ttyrec/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/ovh-ttyrec/default.nix => by-name/ov/ovh-ttyrec/package.nix} (100%) diff --git a/pkgs/tools/misc/ovh-ttyrec/default.nix b/pkgs/by-name/ov/ovh-ttyrec/package.nix similarity index 100% rename from pkgs/tools/misc/ovh-ttyrec/default.nix rename to pkgs/by-name/ov/ovh-ttyrec/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b806424ec9c..ac1db94acc31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11306,8 +11306,6 @@ with pkgs; oxlint = callPackage ../development/tools/oxlint { }; - ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; - ovito = libsForQt5.callPackage ../applications/graphics/ovito { inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; }; From 1ccc99fe9e1b5b916c2f98600098cb16169730ad Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:26:41 +0200 Subject: [PATCH 59/92] dispad: move to by-name --- .../X11/dispad/default.nix => by-name/di/dispad/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/X11/dispad/default.nix => by-name/di/dispad/package.nix} (100%) diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/by-name/di/dispad/package.nix similarity index 100% rename from pkgs/tools/X11/dispad/default.nix rename to pkgs/by-name/di/dispad/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac1db94acc31..bc868ba3f413 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -915,8 +915,6 @@ with pkgs; dippi = callPackage ../tools/graphics/dippi { }; - dispad = callPackage ../tools/X11/dispad { }; - diswall = callPackage ../applications/networking/diswall { }; dupeguru = callPackage ../applications/misc/dupeguru { From 1efdf8162a7393d05cdc778a8d2ab39551cc20d4 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:27:14 +0200 Subject: [PATCH 60/92] tmux-cssh: move to by-name --- .../tmux-cssh/default.nix => by-name/tm/tmux-cssh/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/tmux-cssh/default.nix => by-name/tm/tmux-cssh/package.nix} (100%) diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/by-name/tm/tmux-cssh/package.nix similarity index 100% rename from pkgs/tools/misc/tmux-cssh/default.nix rename to pkgs/by-name/tm/tmux-cssh/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc868ba3f413..742e1e94c996 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13378,8 +13378,6 @@ with pkgs; tmux = callPackage ../tools/misc/tmux { }; - tmux-cssh = callPackage ../tools/misc/tmux-cssh { }; - tmuxp = callPackage ../tools/misc/tmuxp { }; tmuxinator = callPackage ../tools/misc/tmuxinator { }; From e1681750202da216f47b9dd95a2a605a6d8f2b03 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:27:45 +0200 Subject: [PATCH 61/92] gopls: move to by-name --- .../gopls/default.nix => by-name/go/gopls/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/language-servers/gopls/default.nix => by-name/go/gopls/package.nix} (100%) diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/by-name/go/gopls/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/gopls/default.nix rename to pkgs/by-name/go/gopls/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 742e1e94c996..ae048313aa50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17552,8 +17552,6 @@ with pkgs; glslls = callPackage ../development/tools/language-servers/glslls { }; - gopls = callPackage ../development/tools/language-servers/gopls { }; - helm-ls = callPackage ../development/tools/language-servers/helm-ls { }; javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { }; From 15c4b52a8e5582b9fe8f9ab10808838c1e412ecf Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:28:43 +0200 Subject: [PATCH 62/92] hclfmt: move to by-name --- .../tools/hclfmt/default.nix => by-name/hc/hclfmt/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/hclfmt/default.nix => by-name/hc/hclfmt/package.nix} (100%) diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/by-name/hc/hclfmt/package.nix similarity index 100% rename from pkgs/development/tools/hclfmt/default.nix rename to pkgs/by-name/hc/hclfmt/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae048313aa50..99d8d8250a7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18495,8 +18495,6 @@ with pkgs; hcloud = callPackage ../development/tools/hcloud { }; - hclfmt = callPackage ../development/tools/hclfmt { }; - help2man = callPackage ../development/tools/misc/help2man { }; heroku = callPackage ../development/tools/heroku { }; From 009f33ce925c530ae0d42a9d4dc57cc4e0b0f954 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:29:40 +0200 Subject: [PATCH 63/92] gitlab-runner: move to by-name --- .../gi}/gitlab-runner/fix-shell-path.patch | 0 .../default.nix => by-name/gi/gitlab-runner/package.nix} | 0 .../gi}/gitlab-runner/remove-bash-test.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{development/tools/continuous-integration => by-name/gi}/gitlab-runner/fix-shell-path.patch (100%) rename pkgs/{development/tools/continuous-integration/gitlab-runner/default.nix => by-name/gi/gitlab-runner/package.nix} (100%) rename pkgs/{development/tools/continuous-integration => by-name/gi}/gitlab-runner/remove-bash-test.patch (100%) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/by-name/gi/gitlab-runner/fix-shell-path.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch rename to pkgs/by-name/gi/gitlab-runner/fix-shell-path.patch diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/by-name/gi/gitlab-runner/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/gitlab-runner/default.nix rename to pkgs/by-name/gi/gitlab-runner/package.nix diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch b/pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch rename to pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99d8d8250a7b..a7212c7bbb7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8200,8 +8200,6 @@ with pkgs; gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { }; - gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; From f3edb08a2880a070401df9f9285ec03de6f4f1a7 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:05:04 +0200 Subject: [PATCH 64/92] aws-vault: move to by-name --- .../aws-vault/default.nix => by-name/aw/aws-vault/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/admin/aws-vault/default.nix => by-name/aw/aws-vault/package.nix} (100%) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/by-name/aw/aws-vault/package.nix similarity index 100% rename from pkgs/tools/admin/aws-vault/default.nix rename to pkgs/by-name/aw/aws-vault/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7212c7bbb7e..f4f4d7e61394 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3304,8 +3304,6 @@ with pkgs; aws-sso-creds = callPackage ../tools/admin/aws-sso-creds { }; - aws-vault = callPackage ../tools/admin/aws-vault { }; - iamy = callPackage ../tools/admin/iamy { }; iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { }; From 5d61acb71b48a794caa327c82f4f781352d1134c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:06:48 +0200 Subject: [PATCH 65/92] packer: move to by-name --- .../tools/packer/default.nix => by-name/pa/packer/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/packer/default.nix => by-name/pa/packer/package.nix} (100%) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/by-name/pa/packer/package.nix similarity index 100% rename from pkgs/development/tools/packer/default.nix rename to pkgs/by-name/pa/packer/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4f4d7e61394..7de06696d9a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1015,8 +1015,6 @@ with pkgs; packcc = callPackage ../development/tools/packcc { }; - packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { }; pacup = callPackage ../tools/package-management/pacup { }; From af16288ebb02b9053d9e083343129bd9f61c8006 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:07:32 +0200 Subject: [PATCH 66/92] coz: move to by-name --- .../analysis/coz/default.nix => by-name/co/coz/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/analysis/coz/default.nix => by-name/co/coz/package.nix} (100%) diff --git a/pkgs/development/tools/analysis/coz/default.nix b/pkgs/by-name/co/coz/package.nix similarity index 100% rename from pkgs/development/tools/analysis/coz/default.nix rename to pkgs/by-name/co/coz/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7de06696d9a7..000a2fd498da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40107,8 +40107,6 @@ with pkgs; qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { }; - coz = callPackage ../development/tools/analysis/coz { }; - sieveshell = with python3.pkgs; toPythonApplication managesieve; gortr = callPackage ../servers/gortr { }; From 7d7fd84248b387be5f21e07b3db0548e0d021505 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:08:47 +0200 Subject: [PATCH 67/92] buildkite-agent: move to by-name --- .../default.nix => by-name/bu/buildkite-agent/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/continuous-integration/buildkite-agent/default.nix => by-name/bu/buildkite-agent/package.nix} (100%) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/by-name/bu/buildkite-agent/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/buildkite-agent/default.nix rename to pkgs/by-name/bu/buildkite-agent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 000a2fd498da..14f294ed04f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17901,8 +17901,6 @@ with pkgs; bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; - buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; - buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; From 13cd4d68642dcf85295dbd991f5ce1fb5815abdd Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:09:50 +0200 Subject: [PATCH 68/92] pigeon: move to by-name --- .../tools/pigeon/default.nix => by-name/pi/pigeon/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/pigeon/default.nix => by-name/pi/pigeon/package.nix} (100%) diff --git a/pkgs/development/tools/pigeon/default.nix b/pkgs/by-name/pi/pigeon/package.nix similarity index 100% rename from pkgs/development/tools/pigeon/default.nix rename to pkgs/by-name/pi/pigeon/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14f294ed04f8..b9c935753dfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40091,8 +40091,6 @@ with pkgs; _3proxy = callPackage ../applications/networking/3proxy { }; - pigeon = callPackage ../development/tools/pigeon { }; - weasis = callPackage ../by-name/we/weasis/package.nix { jre = jdk21; }; From 3a7201a0f6fc78276f570dd0ba8c5008b00294b0 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:10:37 +0200 Subject: [PATCH 69/92] ronn: move to by-name --- pkgs/{development/tools => by-name/ro}/ronn/Gemfile | 0 pkgs/{development/tools => by-name/ro}/ronn/Gemfile.lock | 0 pkgs/{development/tools => by-name/ro}/ronn/gemset.nix | 0 .../tools/ronn/default.nix => by-name/ro/ronn/package.nix} | 0 .../tools => by-name/ro}/ronn/test-reproducible-html.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 deletions(-) rename pkgs/{development/tools => by-name/ro}/ronn/Gemfile (100%) rename pkgs/{development/tools => by-name/ro}/ronn/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/ro}/ronn/gemset.nix (100%) rename pkgs/{development/tools/ronn/default.nix => by-name/ro/ronn/package.nix} (100%) rename pkgs/{development/tools => by-name/ro}/ronn/test-reproducible-html.nix (100%) diff --git a/pkgs/development/tools/ronn/Gemfile b/pkgs/by-name/ro/ronn/Gemfile similarity index 100% rename from pkgs/development/tools/ronn/Gemfile rename to pkgs/by-name/ro/ronn/Gemfile diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/by-name/ro/ronn/Gemfile.lock similarity index 100% rename from pkgs/development/tools/ronn/Gemfile.lock rename to pkgs/by-name/ro/ronn/Gemfile.lock diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/by-name/ro/ronn/gemset.nix similarity index 100% rename from pkgs/development/tools/ronn/gemset.nix rename to pkgs/by-name/ro/ronn/gemset.nix diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/by-name/ro/ronn/package.nix similarity index 100% rename from pkgs/development/tools/ronn/default.nix rename to pkgs/by-name/ro/ronn/package.nix diff --git a/pkgs/development/tools/ronn/test-reproducible-html.nix b/pkgs/by-name/ro/ronn/test-reproducible-html.nix similarity index 100% rename from pkgs/development/tools/ronn/test-reproducible-html.nix rename to pkgs/by-name/ro/ronn/test-reproducible-html.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9c935753dfe..85ad47e9d2c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23784,8 +23784,6 @@ with pkgs; round = callPackage ../applications/graphics/round { }; - ronn = callPackage ../development/tools/ronn { }; - router = callPackage ../servers/http/router { }; rover = callPackage ../development/tools/rover { }; From 62ace478a658b4c7c7d53ede4d1d099f5366f0f2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:16:39 +0200 Subject: [PATCH 70/92] bupc: move to by-name --- .../compilers/bupc/default.nix => by-name/bu/bupc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/compilers/bupc/default.nix => by-name/bu/bupc/package.nix} (100%) diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/by-name/bu/bupc/package.nix similarity index 100% rename from pkgs/development/compilers/bupc/default.nix rename to pkgs/by-name/bu/bupc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85ad47e9d2c4..ebbb9b62760d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16586,8 +16586,6 @@ with pkgs; typescript = callPackage ../development/compilers/typescript { }; - bupc = callPackage ../development/compilers/bupc { }; - ubports-click = python3Packages.callPackage ../development/tools/click { }; uasm = callPackage ../development/compilers/uasm { }; From e7d212886b54420a5ea94ce2be88071124838c38 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:17:37 +0200 Subject: [PATCH 71/92] beanstalkd: move to by-name --- .../default.nix => by-name/be/beanstalkd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/beanstalkd/default.nix => by-name/be/beanstalkd/package.nix} (100%) diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/by-name/be/beanstalkd/package.nix similarity index 100% rename from pkgs/servers/beanstalkd/default.nix rename to pkgs/by-name/be/beanstalkd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebbb9b62760d..ed2192dd8e0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6337,8 +6337,6 @@ with pkgs; usePoppler = true; }; - beanstalkd = callPackage ../servers/beanstalkd { }; - beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); inherit (beetsPackages) beets beets-unstable; From 9947f732001f346225ca7fe98532cac21a8439ac Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 31 Jul 2024 09:33:48 +0200 Subject: [PATCH 72/92] hurl: fix build with Rust 1.79 --- pkgs/by-name/hu/hurl/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix index bb40d40896a7..b758e779705f 100644 --- a/pkgs/by-name/hu/hurl/package.nix +++ b/pkgs/by-name/hu/hurl/package.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , pkg-config , installShellFiles , libxml2 @@ -22,6 +23,16 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dY00xcMnOCWhdRzC+3mTHSIqeYEPUDBJeYd/GiLM/38="; + patches = [ + # Fix for rust 1.79, see https://github.com/Orange-OpenSource/hurl/issues/3057 + # We should be able to remove this at the next hurl version bump + (fetchpatch { + name = "hurl-fix-rust-1.79"; + url = "https://github.com/Orange-OpenSource/hurl/commit/d51c275fc63d1ee5bbdc6fc70279ec8dae86a9c1.patch"; + hash = "sha256-peA4Zq5J8ynL7trvydQ3ZqyHpJWrRmJeFeMKH9XT2n4="; + }) + ]; + nativeBuildInputs = [ pkg-config installShellFiles From 89a20c9b6e7b80beb908c845d463b17dd7cf1bbc Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:52:36 +0200 Subject: [PATCH 73/92] vscode-extensions.streetsidesoftware.code-spell-checker: 4.0.4 -> 4.0.5 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index daef61950c65..9b0bb675c65e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4439,8 +4439,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "4.0.4"; - hash = "sha256-WbEhTIuPqH77IuEDgjPUz9chHM/aYjMdpCI9Kf0KS2Q="; + version = "4.0.5"; + hash = "sha256-vrM3a13S1LKQq2Bl/DN/vasVMyClBdYBOt8DiUbh61I="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From ed47bba9adbea3ab361f12d557d45359f2ace64e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 27 Jul 2024 23:15:54 +0200 Subject: [PATCH 74/92] nixos/nar-serve: add package option --- nixos/modules/services/networking/nar-serve.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/nar-serve.nix b/nixos/modules/services/networking/nar-serve.nix index b2082032ad90..d89ec7cbfa3c 100644 --- a/nixos/modules/services/networking/nar-serve.nix +++ b/nixos/modules/services/networking/nar-serve.nix @@ -12,6 +12,8 @@ in services.nar-serve = { enable = mkEnableOption "serving NAR file contents via HTTP"; + package = mkPackageOption pkgs "nar-serve" { }; + port = mkOption { type = types.port; default = 8383; @@ -47,7 +49,7 @@ in serviceConfig = { Restart = "always"; RestartSec = "5s"; - ExecStart = "${pkgs.nar-serve}/bin/nar-serve"; + ExecStart = lib.getExe cfg.package; DynamicUser = true; }; }; From 091f5f6540853eee1190ddce5b16bd6bc1fbf6da Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 31 Jul 2024 09:04:43 +0200 Subject: [PATCH 75/92] nar-serve: 0.6.1 -> 0.7.0 --- pkgs/by-name/na/nar-serve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/na/nar-serve/package.nix b/pkgs/by-name/na/nar-serve/package.nix index 98e480d4fdb9..5f1f55198fdf 100644 --- a/pkgs/by-name/na/nar-serve/package.nix +++ b/pkgs/by-name/na/nar-serve/package.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "nar-serve"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nar-serve"; rev = "v${version}"; - hash = "sha256-cSOYHYJJEGzFtkD4mjTmYBiM9CaWKt64xgV/JeNHpfM="; + hash = "sha256-8QuMS00EutmqzAIPxyJEPxM8EHiWlSKs6E2Htoh3Kes="; }; - vendorHash = "sha256-RpjLs4+9abbbysYAlPDUXBLe1cz4Lp+QmR1yv+LpYwQ="; + vendorHash = "sha256-td9NYHGYJYPlIj2tnf5I/GnJQOOgODc6TakHFwxyvLQ="; doCheck = false; From 5a353f15cc0dce64519ebd88a5134c644507aec6 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 31 Jul 2024 09:06:48 +0200 Subject: [PATCH 76/92] nixos/nar-serve: add domain option --- nixos/modules/services/networking/nar-serve.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/networking/nar-serve.nix b/nixos/modules/services/networking/nar-serve.nix index d89ec7cbfa3c..5a5cefe86d29 100644 --- a/nixos/modules/services/networking/nar-serve.nix +++ b/nixos/modules/services/networking/nar-serve.nix @@ -34,6 +34,17 @@ in - gs:// for binary caches stored in Google Cloud Storage ''; }; + + domain = mkOption { + type = types.str; + default = ""; + description = '' + When set, enables the feature of serving . + on top of /nix/store/-. + + Useful to preview static websites where paths are absolute. + ''; + }; }; }; From 7ce56e26c4f9ab04dfcaf20a733cd3343c58d953 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 01:43:06 +0000 Subject: [PATCH 77/92] grass: 8.3.2 -> 8.4.0 --- pkgs/applications/gis/grass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index c2194dbdc7a6..fd26e49fdbd8 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "grass"; - version = "8.3.2"; + version = "8.4.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = finalAttrs.version; - hash = "sha256-loeg+7h676d2WdYOMcJFyzeEZcxjBynir6Hz0J/GBns="; + hash = "sha256-NKMshd6pr2O62ZjmQ/oPttmeVBYVD0Nqhh3SwQrhZf8="; }; nativeBuildInputs = [ From f4916f0c3a1c06f5f92586af77aa9ae9e34fd783 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Wed, 31 Jul 2024 16:15:07 +0800 Subject: [PATCH 78/92] novelwriter: 2.4.4 -> 2.5.1 --- pkgs/by-name/no/novelwriter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index 7f578f54a442..101783ee607d 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.4.4"; + version = "2.5.1"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; rev = "v${version}"; - hash = "sha256-vYvrSRQTp/8jcCQIL6HgxdSJwogiPJKfVO+9hhK6emc="; + hash = "sha256-DgeDAPE5IkZtzi+Xq2BpGfpgTRonzNjaa1NTcwnqdNo="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; From 9573db47a5ad034ce1fe82c6af2a59d4e6015e95 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Fri, 17 May 2024 10:47:36 +0200 Subject: [PATCH 79/92] linuxPackages.rtw88: unstable-2023-07-23 -> 0-unstable-2024-07-27 Newer versions of the out-of-tree rtw88 driver feature significantly expanded hardware support, including many hardware previously supported by the rtl8821au driver. --- pkgs/os-specific/linux/rtw88/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index a28a9f3d19e8..86eee7ac7ccd 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "unstable-2023-07-23"; + version = "0-unstable-2024-07-27"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "9b6fe04a741a6b0a1edc5ca134927784bff033a5"; - hash = "sha256-OzaIy+WTrljwAhC73wEIRUXrkz1NrGNJAS3zofQyV6E="; + rev = "610e04fc38343dcdcef95475c1579efc07572f1f"; + hash = "sha256-54XhluBnspjyKR+OjYRa5g66N8F0d/oV3x89IV3zdT0="; }; nativeBuildInputs = kernel.moduleBuildDependencies; From ec60e56b26377cd42bdb226b5b6b4a08cb531bd0 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Fri, 28 Jun 2024 09:13:55 +0200 Subject: [PATCH 80/92] rtw88-firmware: drop It's all part of linux-firmware now. --- nixos/modules/hardware/all-firmware.nix | 1 - .../linux/firmware/rtw88-firmware/default.nix | 25 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index a97c8c418c86..abad6e08611f 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -43,7 +43,6 @@ in { rtl8192su-firmware rt5677-firmware rtl8761b-firmware - rtw88-firmware zd1211fw alsa-firmware sof-firmware diff --git a/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix deleted file mode 100644 index b4e07624b6ef..000000000000 --- a/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenvNoCC, lib, linuxPackages }: - -stdenvNoCC.mkDerivation { - pname = "rtw88-firmware"; - inherit (linuxPackages.rtw88) version src; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/firmware/rtw88 - cp *.bin $out/lib/firmware/rtw88 - - runHook postInstall - ''; - - meta = with lib; { - description = "Firmware for the newest Realtek rtlwifi codes"; - homepage = "https://github.com/lwfinger/rtw88"; - license = licenses.unfreeRedistributableFirmware; - maintainers = with maintainers; [ tvorog ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7cf6ef30692..d5a1e367f006 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1182,6 +1182,7 @@ mapAliases ({ # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, # due to it being inside the linuxPackagesFor function. rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14 + rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28 rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19 ### S ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f06962f5fad6..4711b9917d89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27766,8 +27766,6 @@ with pkgs; rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { }; - rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { }; - rvvm = callPackage ../applications/virtualization/rvvm { }; s3ql = callPackage ../tools/backup/s3ql { }; From 4cfab1b3d69cb66acc1e326e52a1f30ca41dcd82 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 30 Jul 2024 16:36:19 +0200 Subject: [PATCH 81/92] pdal: fix libdir path in pkgconfig file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Johannes Jöns <34899572+jopejoe1@users.noreply.github.com> --- pkgs/development/libraries/pdal/default.nix | 8 +++++++- pkgs/development/libraries/pdal/pdal.pc.in.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/pdal/pdal.pc.in.patch diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index a6a594883712..c85459c244c9 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-ukBZLr/iyYQ68sv9JWrR4YP0ahHfGhytgcWKPzrF3Ps="; }; + patches = [ + ./pdal.pc.in.patch + ]; + nativeBuildInputs = [ cmake pkg-config @@ -124,7 +128,9 @@ stdenv.mkDerivation (finalAttrs: { version = "pdal ${finalAttrs.finalPackage.version}"; }; pdal = callPackage ./tests.nix { pdal = finalAttrs.finalPackage; }; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/pdal/pdal.pc.in.patch b/pkgs/development/libraries/pdal/pdal.pc.in.patch new file mode 100644 index 000000000000..1d981c0f6a97 --- /dev/null +++ b/pkgs/development/libraries/pdal/pdal.pc.in.patch @@ -0,0 +1,12 @@ +diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in +index 6885221cacc8..a07ee82cea68 100644 +--- a/apps/pdal.pc.in ++++ b/apps/pdal.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@/bin +-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + includedir=@CMAKE_INSTALL_PREFIX@/include + + Name: PDAL From 0358591a761a15ce52dd213fdaad11bf3740ca1f Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 31 Jul 2024 10:43:38 +0200 Subject: [PATCH 82/92] librepo: 1.15.1 -> 1.18.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../package-management/librepo/default.nix | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 1d43efe3f8af..4d263e3e1d89 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,33 +1,43 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, python -, pkg-config -, libxml2 -, glib -, openssl -, zchunk -, curl -, check -, gpgme +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + python, + pkg-config, + libxml2, + glib, + openssl, + zchunk, + curl, + check, + gpgme, + libselinux, + nix-update-script, + doxygen, }: stdenv.mkDerivation rec { - version = "1.15.1"; + version = "1.18.0"; pname = "librepo"; - outputs = [ "out" "dev" "py" ]; + outputs = [ + "out" + "dev" + "py" + ]; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "sha256-XVjVu+UTIDbrKHmfJ2zZBLp/h0cLCZFxv/XZ0Iy8VPI="; + sha256 = "sha256-u9dE1TqqZp/cHIgqnRDgOT4gU7XNLnSnmAFJxLKnDSQ="; }; nativeBuildInputs = [ cmake pkg-config + doxygen ]; buildInputs = [ @@ -39,6 +49,7 @@ stdenv.mkDerivation rec { check gpgme zchunk + libselinux ]; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here @@ -54,6 +65,8 @@ stdenv.mkDerivation rec { moveToOutput "lib/${python.libPrefix}" "$py" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; homepage = "https://rpm-software-management.github.io/librepo/"; From c3837ef025a35877dec9f58de3dfe33d4d278a63 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 31 Jul 2024 10:44:02 +0200 Subject: [PATCH 83/92] dnf5: 5.1.15 -> 5.2.5.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../tools/package-management/dnf5/default.nix | 106 ++++++++++-------- 1 file changed, 59 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index 81c4a10c08c9..b0cbba31bfce 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -1,59 +1,66 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, createrepo_c -, doxygen -, gettext -, help2man -, pkg-config -, python3Packages -, cppunit -, fmt -, json_c -, libmodulemd -, librepo -, libsmartcols -, libsolv -, libxml2 -, libyaml -, pcre2 -, rpm -, sdbus-cpp -, sphinx -, sqlite -, systemd -, testers -, toml11 -, zchunk +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + createrepo_c, + doxygen, + gettext, + help2man, + pkg-config, + python3Packages, + cppunit, + fmt, + json_c, + libmodulemd, + librepo, + libsmartcols, + libsolv, + libxml2, + libyaml, + pcre2, + rpm, + sdbus-cpp, + sphinx, + sqlite, + systemd, + testers, + toml11, + zchunk, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.15"; + version = "5.2.5.0"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-IDF/jRnPpGbHk5bY7plkCO1x/i10H+HCcU88JI4EHvs="; + hash = "sha256-zH+TDtVMEsgKZR0EA+G8SB1PZyiTfhnG7n6lupeoWyI="; }; - nativeBuildInputs = [ - cmake - createrepo_c - doxygen - gettext - help2man - pkg-config - sphinx - ] ++ (with python3Packages; [ - breathe - sphinx-autoapi - sphinx-rtd-theme - ]); + nativeBuildInputs = + [ + cmake + createrepo_c + doxygen + gettext + help2man + pkg-config + sphinx + ] + ++ (with python3Packages; [ + breathe + sphinx-autoapi + sphinx-rtd-theme + ]); buildInputs = [ cppunit @@ -81,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_PERL5=OFF" "-DWITH_PYTHON3=OFF" "-DWITH_RUBY=OFF" + "-DWITH_SYSTEMD=OFF" "-DWITH_PLUGIN_RHSM=OFF" # Red Hat Subscription Manager plugin # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly # (setting it to an absolute path causes include files to go to $out/$out/include, @@ -105,8 +113,9 @@ stdenv.mkDerivation (finalAttrs: { dontFixCmake = true; - passthru.tests = { - version = testers.testVersion { package = finalAttrs.finalPackage; }; + passthru = { + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + updateScript = nix-update-script { }; }; meta = with lib; { @@ -114,7 +123,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/rpm-software-management/dnf5"; changelog = "https://github.com/rpm-software-management/dnf5/releases/tag/${finalAttrs.version}"; license = licenses.gpl2Plus; - maintainers = with lib.maintainers; [ malt3 katexochen ]; + maintainers = with lib.maintainers; [ + malt3 + katexochen + ]; mainProgram = "dnf5"; platforms = platforms.linux ++ platforms.darwin; }; From 0bab1a6d6e9bb6a0e7d4ae1b06ffeca97c30d842 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 27 Jul 2024 10:27:12 +0200 Subject: [PATCH 84/92] prometheus-smartctl-exporter: fix path to smartctl --- .../monitoring/prometheus/smartctl-exporter/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix index b03a006982ec..707c8bbb0c1d 100644 --- a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildGoModule , nixosTests +, smartmontools }: buildGoModule rec { @@ -17,6 +18,11 @@ buildGoModule rec { vendorHash = "sha256-WUB2FgBl4Tybz7T0yvcSYIlG75NEhXpn1F0yuB9F21g="; + postPatch = '' + substituteInPlace main.go README.md \ + --replace-fail /usr/sbin/smartctl ${lib.getExe smartmontools} + ''; + ldflags = [ "-X github.com/prometheus/common/version.Version=${version}" ]; From c3392ad349a5227f4a3464dce87bcc5046692fce Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 29 Jul 2024 20:53:40 +0200 Subject: [PATCH 85/92] nixos/prometheus-smartctl-exporter: providing the path to the binary is no longer needed --- .../monitoring/prometheus/exporters/smartctl.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix index 8aadd87abbed..e3dcc6126ff1 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix @@ -2,20 +2,23 @@ let cfg = config.services.prometheus.exporters.smartctl; + inherit (lib) mkOption types literalExpression; + args = lib.escapeShellArgs ([ "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}" - "--smartctl.path=${pkgs.smartmontools}/bin/smartctl" "--smartctl.interval=${cfg.maxInterval}" ] ++ map (device: "--smartctl.device=${device}") cfg.devices ++ cfg.extraFlags); -in { + +in +{ port = 9633; extraOpts = { devices = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = literalExpression '' [ "/dev/sda", "/dev/nvme0n1" ]; ''; @@ -24,6 +27,7 @@ in { all disks if none given. ''; }; + maxInterval = mkOption { type = types.str; default = "60s"; @@ -50,9 +54,7 @@ in { "block-sd rw" "char-nvme rw" ]; - ExecStart = '' - ${pkgs.prometheus-smartctl-exporter}/bin/smartctl_exporter ${args} - ''; + ExecStart = "${pkgs.prometheus-smartctl-exporter}/bin/smartctl_exporter ${args}"; PrivateDevices = lib.mkForce false; ProtectProc = "invisible"; ProcSubset = "pid"; From be8664b55598843a6137e1e1eaae831143726e26 Mon Sep 17 00:00:00 2001 From: aviac Date: Mon, 6 May 2024 16:50:37 +0200 Subject: [PATCH 86/92] radiance: init at 5.4 --- pkgs/by-name/ra/radiance/package.nix | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/ra/radiance/package.nix diff --git a/pkgs/by-name/ra/radiance/package.nix b/pkgs/by-name/ra/radiance/package.nix new file mode 100644 index 000000000000..afbf754d9628 --- /dev/null +++ b/pkgs/by-name/ra/radiance/package.nix @@ -0,0 +1,47 @@ +{ + cmake, + fetchFromGitHub, + runCommand, + lib, + libGLU, + stdenv, + libX11, + tcsh, + tk, +}: +let + csh = runCommand "csh" { } '' + mkdir -p $out/bin + ln -s ${lib.getExe tcsh} $out/bin/csh + ''; +in +stdenv.mkDerivation (finalAttrs: { + pname = "radiance"; + version = "5.4"; + + src = fetchFromGitHub { + owner = "LBNL-ETA"; + repo = "radiance"; + rev = "refs/tags/rad${lib.versions.major finalAttrs.version}R${lib.versions.minor finalAttrs.version}"; + hash = "sha256-21lVWqO8uJefnm/dyfrjQJYbGck0fIRr2j0A+7WlZbM="; + }; + + nativeBuildInputs = [ + cmake + csh # for some custom scripting in the repo + tk # for wish + ]; + + buildInputs = [ + libGLU + libX11 + ]; + + meta = { + description = "Validated Lighting Simulation Tool"; + homepage = "https://github.com/LBNL-ETA/Radiance"; + license = lib.licenses.radiance; + maintainers = with lib.maintainers; [ robwalt ]; + mainProgram = "rad"; + }; +}) From 4f2da6c9c17d75ba43fbe85d5243a57735a5e4eb Mon Sep 17 00:00:00 2001 From: euxane Date: Sat, 6 Jul 2024 01:49:10 +0200 Subject: [PATCH 87/92] nixos/fcgiwrap: add option migration instruction errors This adds migration instructions for the removed global shared instance configuration of fcgiwrap. Adding those explicit messages to the previous options requires moving the newly defined options from `services.fcgiwrap.*` to `services.fcgiwrap.instances.*` due to an option namespace clash. `mkRenamedOptionModule` was not used because the previous options do not directly map to the new ones. In particular, `user` and `group` were described as setting the socket's permission, but were actually setting the process' running user. Co-authored-by: Minijackson --- .../manual/release-notes/rl-2411.section.md | 2 +- nixos/modules/services/misc/zoneminder.nix | 4 ++-- nixos/modules/services/networking/cgit.nix | 4 ++-- .../modules/services/networking/smokeping.nix | 4 ++-- .../modules/services/web-servers/fcgiwrap.nix | 22 +++++++++++++++---- nixos/tests/gitolite-fcgiwrap.nix | 4 ++-- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 368e4a459bfa..3ad57cbe3f17 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -107,7 +107,7 @@ The option `services.fgciwrap` now takes an attribute set of the configuration of each individual instance. This requires migrating any previous configuration keys from - `services.fcgiwrap.*` to `services.fcgiwrap.some-instance.*`. + `services.fcgiwrap.*` to `services.fcgiwrap.instances.some-instance.*`. The ownership and mode of the UNIX sockets created by this service are now configurable and private by default. Processes also now run as a dynamically allocated user by default instead of diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 3167be0bbd46..42f322e00066 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -202,7 +202,7 @@ in { ]; services = { - fcgiwrap.zoneminder = lib.mkIf useNginx { + fcgiwrap.instances.zoneminder = lib.mkIf useNginx { process.prefork = cfg.cameras; process.user = user; process.group = group; @@ -255,7 +255,7 @@ in { fastcgi_param HTTP_PROXY ""; fastcgi_intercept_errors on; - fastcgi_pass unix:${config.services.fcgiwrap.zoneminder.socket.address}; + fastcgi_pass unix:${config.services.fcgiwrap.instances.zoneminder.socket.address}; } location /cache/ { diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index de8128ed5a59..cdd316dd99d2 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -32,7 +32,7 @@ let fastcgi_split_path_info ^(${regexLocation cfg})(/.+)$; fastcgi_param PATH_INFO $fastcgi_path_info; '' - }fastcgi_pass unix:${config.services.fcgiwrap."cgit-${name}".socket.address}; + }fastcgi_pass unix:${config.services.fcgiwrap.instances."cgit-${name}".socket.address}; ''; cgitrcLine = name: value: "${name}=${ @@ -171,7 +171,7 @@ in groups.${cfg.group} = { }; })); - services.fcgiwrap = flip mapAttrs' cfgs (name: cfg: + services.fcgiwrap.instances = flip mapAttrs' cfgs (name: cfg: nameValuePair "cgit-${name}" { process = { inherit (cfg) user group; }; socket = { inherit (config.services.nginx) user group; }; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index a07cde847cf6..2e572a3d071a 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -337,7 +337,7 @@ in }; # use nginx to serve the smokeping web service - services.fcgiwrap.smokeping = mkIf cfg.webService { + services.fcgiwrap.instances.smokeping = mkIf cfg.webService { process.user = cfg.user; process.group = cfg.user; socket = { inherit (config.services.nginx) user group; }; @@ -353,7 +353,7 @@ in locations."/smokeping.fcgi" = { extraConfig = '' include ${config.services.nginx.package}/conf/fastcgi_params; - fastcgi_pass unix:${config.services.fcgiwrap.smokeping.socket.address}; + fastcgi_pass unix:${config.services.fcgiwrap.instances.smokeping.socket.address}; fastcgi_param SCRIPT_FILENAME ${smokepingHome}/smokeping.fcgi; fastcgi_param DOCUMENT_ROOT ${smokepingHome}; ''; diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index 29ddd39942c6..d352f4fdd2b4 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -3,12 +3,26 @@ with lib; let - forEachInstance = f: flip mapAttrs' config.services.fcgiwrap (name: cfg: - nameValuePair "fcgiwrap-${name}" (f cfg) + forEachInstance = f: flip mapAttrs' config.services.fcgiwrap.instances ( + name: cfg: nameValuePair "fcgiwrap-${name}" (f cfg) ); in { - options.services.fcgiwrap = mkOption { + imports = forEach [ + "enable" + "user" + "group" + "socketType" + "socketAddress" + "preforkProcesses" + ] (attr: mkRemovedOptionModule [ "services" "fcgiwrap" attr ] '' + The global shared fcgiwrap instance is no longer supported due to + security issues. + Isolated instances should instead be configured through + `services.fcgiwrap.instances.*'. + ''); + + options.services.fcgiwrap.instances = mkOption { description = "Configuration for fcgiwrap instances."; default = { }; type = types.attrsOf (types.submodule ({ config, ... }: { options = { @@ -95,7 +109,7 @@ in { assertion = cfg.socket.mode != null -> cfg.socket.type == "unix"; message = "Socket mode can only be set for the UNIX socket type."; } - ]) config.services.fcgiwrap); + ]) config.services.fcgiwrap.instances); systemd.services = forEachInstance (cfg: { after = [ "nss-user-lookup.target" ]; diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix index 6e8dae6f72d7..43d65faebbee 100644 --- a/nixos/tests/gitolite-fcgiwrap.nix +++ b/nixos/tests/gitolite-fcgiwrap.nix @@ -24,7 +24,7 @@ import ./make-test-python.nix ( { networking.firewall.allowedTCPPorts = [ 80 ]; - services.fcgiwrap.gitolite = { + services.fcgiwrap.instances.gitolite = { process.user = "gitolite"; process.group = "gitolite"; socket = { inherit (config.services.nginx) user group; }; @@ -64,7 +64,7 @@ import ./make-test-python.nix ( fastcgi_param SCRIPT_FILENAME ${pkgs.gitolite}/bin/gitolite-shell; # use Unix domain socket or inet socket - fastcgi_pass unix:${config.services.fcgiwrap.gitolite.socket.address}; + fastcgi_pass unix:${config.services.fcgiwrap.instances.gitolite.socket.address}; ''; }; From efc7aebda7f85f67b52cc334066c6dd344371103 Mon Sep 17 00:00:00 2001 From: euxane Date: Thu, 11 Jul 2024 15:36:30 +0200 Subject: [PATCH 88/92] nixos/fcgiwrap: require explicit owner for UNIX sockets The default in the previous option documentation was incorrect, resulting in the UNIX socket to be unreachable except by root by default. This fixes the documentation and requires consumers to set values explicitly for the socket's owning user and group. --- nixos/modules/services/web-servers/fcgiwrap.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index d352f4fdd2b4..36a327b9ab9f 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -68,7 +68,6 @@ in { default = null; description = '' User to be set as owner of the UNIX socket. - Defaults to the process running user. ''; }; @@ -77,7 +76,6 @@ in { default = null; description = '' Group to be set as owner of the UNIX socket. - Defaults to the process running group. ''; }; @@ -97,6 +95,14 @@ in { config = { assertions = concatLists (mapAttrsToList (name: cfg: [ + { + assertion = cfg.socket.type == "unix" -> cfg.socket.user != null; + message = "Socket owner is required for the UNIX socket type."; + } + { + assertion = cfg.socket.type == "unix" -> cfg.socket.group != null; + message = "Socket owner is required for the UNIX socket type."; + } { assertion = cfg.socket.user != null -> cfg.socket.type == "unix"; message = "Socket owner can only be set for the UNIX socket type."; From fcb2a4a5fff1903d403955a9753a34f79bb24455 Mon Sep 17 00:00:00 2001 From: euxane Date: Thu, 11 Jul 2024 15:42:55 +0200 Subject: [PATCH 89/92] nixos/zoneminder: set fcgiwrap socket owner --- nixos/modules/services/misc/zoneminder.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 42f322e00066..5b0b1448f685 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -206,6 +206,7 @@ in { process.prefork = cfg.cameras; process.user = user; process.group = group; + socket = { inherit (config.services.nginx) user group; }; }; mysql = lib.mkIf cfg.database.createLocally { From 632da757110b3670b387111b23ffed4abb9e53c4 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Wed, 31 Jul 2024 11:27:11 +0200 Subject: [PATCH 90/92] nixos/xdg/portal: remove deprecated option `gtkUsePortal` --- .../manual/release-notes/rl-2411.section.md | 2 ++ nixos/modules/config/xdg/portal.nix | 27 ++----------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index a8007c9a0694..015382790894 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -257,6 +257,8 @@ - `ffmpeg_5` has been removed. Please use the unversioned `ffmpeg`, pin a newer version, or if necessary pin `ffmpeg_4` for compatibility. +- The `xdg.portal.gtkUsePortal` option has been removed, as it had been deprecated for over 2 years. Using the `GTK_USE_PORTAL` environment variable in this manner is not intended nor encouraged by the GTK developers, but can still be done manually via `environment.sessionVariables`. + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 2368ca04a49e..ec4e13169fa3 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -6,6 +6,7 @@ let mkIf mkOption mkRenamedOptionModule + mkRemovedOptionModule teams types; @@ -17,18 +18,7 @@ in { imports = [ (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ]) - - ({ config, lib, options, ... }: - let - from = [ "xdg" "portal" "gtkUsePortal" ]; - fromOpt = lib.getAttrFromPath from options; - in - { - warnings = lib.mkIf config.xdg.portal.gtkUsePortal [ - "The option `${lib.showOption from}' defined in ${lib.showFiles fromOpt.files} has been deprecated. Setting the variable globally with `environment.sessionVariables' NixOS option can have unforeseen side-effects." - ]; - } - ) + (mkRemovedOptionModule [ "xdg" "portal" "gtkUsePortal" ] "This option has been removed due to being unsupported and discouraged by the GTK developers.") ]; meta = { @@ -54,18 +44,6 @@ in ''; }; - gtkUsePortal = mkOption { - type = types.bool; - visible = false; - default = false; - description = '' - Sets environment variable `GTK_USE_PORTAL` to `1`. - This will force GTK-based programs ran outside Flatpak to respect and use XDG Desktop Portals - for features like file chooser but it is an unsupported hack that can easily break things. - Defaults to `false` to respect its opt-in nature. - ''; - }; - xdgOpenUsePortal = mkOption { type = types.bool; default = false; @@ -154,7 +132,6 @@ in ]; sessionVariables = { - GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; NIXOS_XDG_OPEN_USE_PORTAL = mkIf cfg.xdgOpenUsePortal "1"; NIX_XDG_DESKTOP_PORTAL_DIR = "/run/current-system/sw/share/xdg-desktop-portal/portals"; }; From 2920bc8d9fc0f29a7f3a4065d7fc7c862223c011 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sat, 29 Jun 2024 21:02:44 -0700 Subject: [PATCH 91/92] recoll: 1.37.5 -> 1.39.1 switched to meson parallel building disabled, as there is a dependency bug somewhere in the build scripts update homepage --- pkgs/applications/search/recoll/default.nix | 37 ++++++++++++--------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index c3c1b6d85ed3..5de1166e116d 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -22,6 +22,8 @@ , libxslt , lyx , makeWrapper +, meson +, ninja , perl , perlPackages , pkg-config @@ -66,35 +68,36 @@ let filters = { perl = perl.passthru.withPackages (p: [ p.ImageExifTool ]); }; filterPath = lib.makeBinPath (map lib.getBin (builtins.attrValues filters)); + useInotify = if stdenv.isLinux then "true" else "false"; in mkDerivation rec { pname = "recoll"; - version = "1.37.5"; + version = "1.39.1"; src = fetchurl { - url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-vv2AMt6ufrfxRX2yF28X3E500MYP9hnGfDb3I9RdMVU="; + url = "https://www.recoll.org/${pname}-${version}.tar.gz"; + hash = "sha256-Eeadj/AnuztCb7VIYEy4hKbduH3CzK53tADvI9+PWmQ="; }; - configureFlags = [ - "--enable-recollq" - "--disable-webkit" - "--without-systemd" + mesonFlags = [ + "-Drecollq=true" + "-Dwebkit=false" + "-Dsystemd=false" # this leaks into the final `librecoll-*.so` binary, so we need # to be sure it is taken from `pkgs.file` rather than `stdenv`, # especially when cross-compiling - "--with-file-command=${file}/bin/file" + "-Dfile-command=${file}/bin/file" ] ++ lib.optionals (!withPython) [ - "--disable-python-module" - "--disable-python-chm" + "-Dpython-module=false" + "-Dpython-chm=false" ] ++ lib.optionals (!withGui) [ - "--disable-qtgui" - "--disable-x11mon" + "-Dqtgui=false" + "-Dx11mon=false" ] ++ [ - (lib.withFeature stdenv.isLinux "inotify") + "-Dinotify=${useInotify}" ]; env.NIX_CFLAGS_COMPILE = toString [ @@ -111,6 +114,8 @@ mkDerivation rec { nativeBuildInputs = [ makeWrapper + meson + ninja pkg-config which ] ++ lib.optionals withGui [ @@ -174,7 +179,7 @@ mkDerivation rec { ln -s ../Applications/recoll.app/Contents/MacOS/recoll $out/bin/recoll ''; - enableParallelBuilding = true; + enableParallelBuilding = false; # XXX: -j44 tried linking befoire librecoll had been created meta = with lib; { description = "Full-text search tool"; @@ -182,8 +187,8 @@ mkDerivation rec { Recoll is an Xapian frontend that can search through files, archive members, email attachments. ''; - homepage = "https://www.lesbonscomptes.com/recoll/"; - changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${versions.majorMinor version}.html"; + homepage = "https://www.recoll.org"; + changelog = "https://www.recoll.org/pages/release-history.html"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ jcumming ehmry ]; From 6a95df6cfd3787a55f71145af80d7b188287bbd3 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 31 Jul 2024 12:34:04 +0200 Subject: [PATCH 92/92] osu-lazer{,-bin}: 2024.727.0 -> 2024.731.0 --- pkgs/games/osu-lazer/bin.nix | 8 ++++---- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 016705ec962a..a9d60f24d41d 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.727.0"; + version = "2024.731.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-yoNtCfL0wrwAUrwYTZLDsR7udUa82Jh1CIcgVQ8TBX4="; + hash = "sha256-Z6BIRFkaVBthkZXvewr4lAQCXVNz5SAsm9dR26lZu64="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-rdRGwD9tDxZFR8Qbd1bVG/YsbuMGZAj0roA9vRO+wQE="; + hash = "sha256-FWmkcmuMMj4B2dsIlliCuOiQjR+5sAU+b9Jmd+RCmiU="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-wRahb7XvhdfP42iwyVsDGR8gFdsK9G8vDANS6Q3RySM="; + hash = "sha256-6BxHRM7hC+v61BVqSFTzGpi7EyZQeo7kWua0CkrWiPM="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 831cb35bea64..d05d272639c5 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.727.0"; + version = "2024.731.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-pw1UkP3VktQ2xFTBOcFAOGQuAOF+uGiU7rZsxKBQ10w="; + hash = "sha256-f7HkIWRxMLoBnPsca6wqr/KEx3IAXxX3ecBIZxlu78A="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 2e7f38d41dcc..1320c505c44c 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -139,7 +139,7 @@ (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.720.0"; hash = "sha256-OL78drEPNhpcfeR7rPIe4egGdNg/ADRF2wfD0Hfz21A="; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.326.0-nativelibs"; hash = "sha256-smHbz5/uBrY7cLKOOClrrVv0MyWNYQz6T9kmIv5DfZM="; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; hash = "sha256-XXV/qBJ9vEVF15fcOlDyoJ8j47azuSJaXHEgsn3fOwA="; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.713.0"; hash = "sha256-wdIvhPpSQHKUidy5bP6EFMJLIK5/uL3Pqv6aXGe1Swg="; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.731.0"; hash = "sha256-GKZo8rV0p1utWkUIzuL3nIVMoVpwQ2X7sdW3znnDpA4="; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; hash = "sha256-Xu4uiYs1pqIXcBWeTBIc8OIqbLmH6MvaY6Dim4ZNikg="; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; hash = "sha256-sdX+MoMlIPUyi4yEUVHtqxKWF/VK04e2VaUavmgBEJU="; }) (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.717.0"; hash = "sha256-duH4pLfI6IhTjA+abiOE57e7J41AP7+8ba09rIat1Pg="; })