<del> { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32 , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils </del> <ins> { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant , wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils </ins> , libnotify, libcanberra_gtk3, libsecret, gmime , libpthreadstubs, sqlite , gnome3, librsvg, gnome_doc_utils, webkitgtk }: let <del> majorVersion = "0.11"; </del> <ins> majorVersion = "0.12"; </ins> in stdenv.mkDerivation rec { <del> name = "geary-${majorVersion}.3"; </del> <ins> name = "geary-${majorVersion}.0"; </ins> src = fetchurl { url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; <del> sha256 = "1r42ijxafach5lv8ibs6y0l5k4nacjg427dnma8fj00xr1sri7j1"; </del> <ins> sha256 = "0ii4qaqfqx90kvqwg0g9jahygkir4mb03ja55fa55yyx6cq0kwff"; </ins> }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; <del> nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite </del> <ins> nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ]; buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite </ins> libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; preConfigure = '' <del> substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' ''; postInstall = '' mkdir -p $out/share/gsettings-schemas/${name}/ mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} </del> <ins> substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' </ins> ''; preFixup = '' <del> wrapProgram "$out/bin/geary"  --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"  --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" </del> <ins> # Add geary to path for geary-attach gappsWrapperArgs+=(--prefix PATH : "$out/bin") </ins> ''; enableParallelBuilding = true;


default = []; description = "Other GNOME Flashback sessions to enable."; }; <ins> panelModulePackages = mkOption { default = [ pkgs.gnome.gnome-applets ]; type = types.listOf types.path; description = '' Packages containing modules that should be made available to <literal>gnome-panel</literal> (usually for applets). If you're packaging something to use here, please install the modules in <literal>$out/lib/gnome-panel/modules</literal>. ''; example = literalExample "[ pkgs.gnome.gnome-applets ]"; }; </ins> }; };


githubId = 40633781; name = "Sergei S."; }; <ins> dit7ya = { email = "7rat13@gmail.com"; github = "dit7ya"; githubId = 14034137; name = "Mostly Void"; }; </ins> dizfer = { email = "david@izquierdofernandez.com"; github = "dizfer";


{ lib <ins> , stdenv </ins> , rustPlatform , gettext , meson


-- Some needed machinery to handle multiple-output external dependencies, -- as per https://github.com/luarocks/luarocks/issues/766 ${lib.optionalString (lib.length depVariables > 0) '' <del> ${lib.concatStringsSep "n  " depVariables}''} ${extraVariables} </del> <ins> ${lib.concatStringsSep "n  " depVariables}''} ${extraVariablesStr} </ins> } ${extraConfig} '';


sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; # TODO Mac support <del> maintainers = [ maintainers.mausch ]; </del> <ins> maintainers = with maintainers; [ mausch dylanmtaylor ]; </ins> }; }


, rustPlatform , stdenv , stdenvNoCC <del> , wasm-bindgen-cli </del> , webkitgtk }: let <del> esbuild-18-20 = let version = "0.18.20"; </del> <ins> esbuild-20-2 = let version = "0.20.2"; </ins> in esbuild.override { buildGoModule = args: buildGoModule (args // {


<ins> import ./make-test-python.nix ({ lib, ... }: { name = "swap-file-btrfs"; meta.maintainers = with lib.maintainers; [ oxalica ]; nodes.machine = { pkgs, ... }: { virtualisation.useDefaultFilesystems = false; virtualisation.bootDevice = "/dev/vda"; boot.initrd.postDeviceCommands = '' ${pkgs.btrfs-progs}/bin/mkfs.btrfs --label root /dev/vda ''; virtualisation.fileSystems = { "/" = { device = "/dev/disk/by-label/root"; fsType = "btrfs"; }; }; swapDevices = [ { device = "/var/swapfile"; size = 1; # 1MiB. } ]; }; testScript = '' machine.wait_for_unit('var-swapfile.swap') machine.succeed("stat --file-system --format=%T /var/swapfile | grep btrfs") # First run. Auto creation. machine.succeed("swapon --show | grep /var/swapfile") machine.shutdown() machine.start() # Second run. Use it as-is. machine.wait_for_unit('var-swapfile.swap') machine.succeed("swapon --show | grep /var/swapfile") ''; }) </ins>


mesonFlags = (lib.mapAttrsToList lib.mesonEnable { <del> "cava" = cavaSupport; </del> <ins> "cava" = cavaSupport && lib.asserts.assertMsg sndioSupport "Sndio support is required for Cava"; </ins> "dbusmenu-gtk" = traySupport; "jack" = jackSupport; <ins> "libevdev" = evdevSupport; </ins> "libinput" = inputSupport; "libnl" = nlSupport; "libudev" = udevSupport;


installPhase = '' runHook preInstall <del> install -Dm644 *.ttf -t $out/share/fonts/hack </del> <ins> install -Dm644 *.ttf -t $out/share/fonts/truetype </ins> runHook postInstall '';


} ) <ins> # Octoprint pulls in celery indirectly but has no support for the up-to-date releases ( self: super: { celery = super.celery.overrideAttrs (oldAttrs: rec { version = "5.0.0"; src = oldAttrs.src.override { inherit version; sha256 = "sha256-MTkw/d3nA9jjcCmjBL+RQpzRGu72PFfebayp2Vjh8lU="; }; doCheck = false; }); } ) # Octoprint would allow later sentry-sdk releases but not later click releases ( self: super: { sentry-sdk = super.sentry-sdk.overrideAttrs (oldAttrs: rec { pname = "sentry-sdk"; version = "1.4.3"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; sha256 = "sha256-vdE6eqELMM69CWHaNYhF0HMCTV3tQsJlMHAA96oCy8c="; }; disabledTests = [ "test_apply_simulates_delivery_info" "test_auto_enabling_integrations_catches_import_error" ]; disabledTestPaths = [ # Don't test integrations "tests/integrations" ]; }); } ) </ins> # Built-in dependency ( self: super: {


<ins> { lib , rustPlatform , fetchFromGitHub , stdenv , darwin , nix-update-script , nixosTests }: rustPlatform.buildRustPackage rec { pname = "realm"; version = "2.6.0"; src = fetchFromGitHub { owner = "zhboner"; repo = "realm"; rev = "v${version}"; hash = "sha256-G3scFSOxbmR3Q2fkRdg115WN/GCYpys/8Y4JC4YMGdY="; }; cargoHash = "sha256-EvXafTujqTdQwfK4NXgT7lGKGnrpyP9ouplD6DmJUKU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; env.RUSTC_BOOTSTRAP = 1; passthru = { updateScript = nix-update-script { }; tests = { inherit (nixosTests) realm; }; }; meta = with lib; { description = "A simple, high performance relay server written in rust"; homepage = "https://github.com/zhboner/realm"; mainProgram = "realm"; license = licenses.mit; maintainers = with maintainers; [ ocfox ]; }; } </ins>


pydantic ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs <ins> ] ++ lib.optionals (!stdenv.isDarwin) [ octoprint-pisupport </ins> ]; nativeCheckInputs = with self; [


librsvg ]; <del> # Don't use buildRustPackage phases, only use it for rust deps setup configurePhase = null; buildPhase = null; checkPhase = null; installPhase = null; </del> postPatch = '' chmod +x build-aux/meson_post_install.py patchShebangs build-aux/meson_post_install.py


diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py <del> index fec0563..d158b96 100755 </del> <ins> index 9641970..6a2b268 100755 </ins> --- a/src/protontricks/cli.py +++ b/src/protontricks/cli.py <del> @@ -14,7 +14,7 @@ import os import logging </del> <ins> @@ -15,8 +15,8 @@ import sys </ins> from . import __version__ <del> -from .steam import (find_proton_app, find_steam_path, find_steam_runtime_path, +from .steam import (find_proton_app, find_steam_path, get_steam_apps, get_steam_lib_paths) from .winetricks import get_winetricks_path </del> from .gui import select_steam_app_with_gui <ins> -from .steam import (find_legacy_steam_runtime_path, find_proton_app, -                    find_steam_path, get_steam_apps, get_steam_lib_paths) +from .steam import (find_proton_app, find_steam_path, get_steam_apps, +                    get_steam_lib_paths) from .util import run_command from .winetricks import get_winetricks_path </ins> @@ -75,8 +75,7 @@ def main(args=None): "WINE: path to a custom 'wine' executablen" "WINESERVER: path to a custom 'wineserver' executablen"


boost = boost179; }; <del> libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { </del> <ins> libreoffice-qt-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { </ins> unwrapped = libsForQt5.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; }); }); <ins> libreoffice-qt-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; libreoffice-qt-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { unwrapped = libsForQt5.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "still"; }); }); libreoffice-qt-still-unwrapped = libreoffice-qt-still.unwrapped; </ins> libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { unwrapped = callPackage ../applications/office/libreoffice


cmakeFlags = with stdenv.lib; [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" <ins> "-DENABLE_JAVASCRIPT=OFF"  # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 "-DENABLE_PHP=OFF" </ins> ] ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"] ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins


, icu66 , krb5 , lib <ins> , libtasn1 </ins> , makeWrapper , stdenv , openssl }: stdenv.mkDerivation rec { pname = "roon-server"; <del> version = "1.8-850"; </del> <ins> version = "1.8-880"; </ins> src = let


sha256 = "sha256-CqmE4V+svSuQAsoX0I3NpUqPU5CQf3fyCHJPrjUjHF4="; }; <del> nativeBuildInputs = [ wheel ]; </del> <ins> nativeBuildInputs = [ wheel ]; </ins> propagatedBuildInputs = [ arrow


runHook postInstall ''; <del> meta = with lib; { </del> <ins> postFixup = '' makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit  "''${gappsWrapperArgs[@]}" ''; meta = { </ins> description = "Real-time strategy game with programmable units"; mainProgram = "liberation-circuit"; longDescription = '' <del> Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C. </del> <ins> Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C. </ins> ''; homepage = "https://linleyh.itch.io/liberation-circuit"; <del> maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl3Only; platforms = platforms.linux; </del> <ins> maintainers = with lib.maintainers; [ emilytrau ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; </ins> }; }


installPhase = '' runHook preInstall <del> # resources mkdir -p "$out/share/redisinsight" mkdir -p "$out/share/redisinsight/static/resources/plugins" mkdir -p "$out/share/redisinsight/default" </del> <ins> mkdir -p "$out/share/redisinsight"/{app,defaults,static/plugins,static/resources/plugins} </ins> <del> cp -r release/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/{app.asar,app.asar.unpacked} $out/share/redisinsight/ cp -r resources/ $out/share/redisinsight </del> <ins> cp -r release/*-unpacked/{locales,resources{,.pak}} "$out/share/redisinsight/app" mv "$out/share/redisinsight/app/resources/resources" "$out/share/redisinsight" </ins> # icons <del> for icon in "$out/resources/icons/*.png"; do </del> <ins> for icon in "$out/share/redisinsight/resources/icons"/*.png; do </ins> mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/redisinsight.png" done <del> ln -s "${finalAttrs.desktopItem}/share/applications" "$out/share/applications" </del> makeWrapper '${electron}/bin/electron' "$out/bin/redisinsight"  <del> --add-flags "$out/share/redisinsight/app.asar"  </del> <ins> --add-flags "$out/share/redisinsight/app/resources/app.asar"  </ins> --add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"  <del> --chdir "$out/share/redisinsight"  --argv0 "$out/share/redisinsight/app.asar" </del> <ins> --set-default ELECTRON_FORCE_IS_PACKAGED 1  --inherit-argv0 </ins> runHook postInstall ''; <del> desktopItem = makeDesktopItem { name = "redisinsight"; exec = "redisinsight %u"; icon = "redisinsight"; desktopName = "RedisInsight"; genericName = "RedisInsight Redis Client"; comment = finalAttrs.meta.description; categories = [ "Development" ]; startupWMClass = "redisinsight"; }; meta = with lib; { </del> <ins> desktopItems = [ (makeDesktopItem { name = "redisinsight"; exec = "redisinsight %u"; icon = "redisinsight"; desktopName = "RedisInsight"; genericName = "RedisInsight Redis Client"; comment = finalAttrs.meta.description; categories = [ "Development" ]; startupWMClass = "redisinsight"; }) ]; meta = { </ins> description = "RedisInsight Redis client powered by Electron"; homepage = "https://github.com/RedisInsight/RedisInsight"; <del> license = licenses.sspl; maintainers = with maintainers; [ gmemstr ]; platforms = [ "x86_64-linux" ]; </del> <ins> #license = licenses.sspl; maintainers = with lib.maintainers; [ gmemstr tomasajt ]; platforms = lib.platforms.linux; </ins> }; })


gspeech = callPackage ../applications/audio/gspeech { }; <ins> gtkcord4 = callPackage ../applications/audio/gtkcord4 {}; </ins> haruna = libsForQt5.callPackage ../applications/video/haruna { }; hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { };


mv $out/bin/arion $out/libexec makeWrapper $out/libexec/arion $out/bin/arion  --unset PYTHONPATH  <del> --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose_1 ]}  </del> <ins> --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose ]}  </ins> ; ''; };


<ins> { "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://jcenter.bintray.com": { "io/pebbletemplates#pebble-project/3.1.5": { "pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM=" }, "io/pebbletemplates#pebble/3.1.5": { "jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=", "pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc=" }, "junit#junit/4.12": { "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" }, "net/java/dev/jna#jna-platform/4.5.2": { "jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=", "pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU=" }, "net/java/dev/jna#jna/4.5.2": { "jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=", "pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8=" }, "org/bouncycastle#bcprov-jdk15on/1.59": { "jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=", "pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU=" }, "org/hamcrest#hamcrest-core/1.3": { "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" }, "org/hamcrest#hamcrest-library/1.3": { "jar": "sha256-cR1kUi+exBCYO9MQk0KW2hNL5CVKElCAoEFuwXjfrRw=", "pom": "sha256-HOtL+w8JiuKbk1BEsjY+ETIzE/4+0gVd+LeXN9UFYnc=" }, "org/hamcrest#hamcrest-parent/1.3": { "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" }, "org/mockito#mockito-core/1.9.5": { "jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=", "pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw=" }, "org/objenesis#objenesis/1.0": { "jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=", "pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs=" }, "org/slf4j#slf4j-api/1.7.25": { "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" }, "org/slf4j#slf4j-parent/1.7.25": { "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" }, "org/unbescape#unbescape/1.1.6.RELEASE": { "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=", "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E=" } }, "https://mvn.freenetproject.org": { "org/freenetproject#freenet-ext/29": { "jar": "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=" } }, "https://repo.maven.apache.org/maven2": { "com/android/tools#common/22.7.2": { "jar": "sha256-6ttGKrkD+J2cPRFUxxHwRni3mSHGgmjTQYuba/NEMk4=", "pom": "sha256-8zhO5T3Z3fYzOUMDUs3/+WY225ZP0mzxaNvVOt8fSQg=" }, "com/android/tools#dvlib/22.7.2": { "jar": "sha256-/a4X4WbglSc1P37HGgt/PZPMBhxkf8p73ZZjJjO7Z+s=", "pom": "sha256-Q1HWW5dIC0kjSGhulIFI7Hp/AOVXbZjC9DHPIBxDSpw=" }, "com/android/tools#sdk-common/22.7.2": { "jar": "sha256-l/7SZpQEdLQTNBcmSalIWvV6Qqmsmrcm2S27X6SjPpU=", "pom": "sha256-Ln4pJV6PBhvVs706Vj7/nqu2xqmLSIHwlpzklOkrhD4=" }, "com/android/tools#sdklib/22.7.2": { "jar": "sha256-qFsaBA/dxaWEWjBuaOK4qx/+LFMS4buyoosTvxOE7RU=", "pom": "sha256-mGlFT4xtSEwnyYC4eIETnMx/7/Q+7g+MGkhtsbXUPSM=" }, "com/android/tools/build#builder-model/0.9.2": { "jar": "sha256-Utfe2Ho/LgcOOyj3IdFPXtik4s6cVFlT2C3cp0XQ/pU=", "pom": "sha256-8F2KJ7WoFcgydCbzj7DeW6zpgmAAtE4iR+vTxtcnw28=" }, "com/android/tools/build#builder-test-api/0.9.2": { "jar": "sha256-+i52Ho1fu3bUsVJVeE2nx89qaGW03e1IDXpCxvjqbgo=", "pom": "sha256-c2xEI3eXn7+LDkxMnGSI6Gg7In6VIXekA6LH+4SB2Fg=" }, "com/android/tools/build#builder/0.9.2": { "jar": "sha256-Vbz5bMADnI7bU9GRVeq+1NfgGgkbZv6zrbb/acJ59Bk=", "pom": "sha256-UaLeg+swvMwBEbTd3mkxvswC5HwpuqNgm9ErCm7kvvg=" }, "com/android/tools/build#gradle/0.9.2": { "jar": "sha256-gX/QEcuyw4yF/39EWHwTsUCoRUrfk3/Do/KKZggULII=", "pom": "sha256-DCk9CiNuuQYLtf32UJGE98BPy2xFGXbKkS0LysbBt7Y=" }, "com/android/tools/build#manifest-merger/22.7.2": { "jar": "sha256-KUCCoJLJeibyMtC+EhCamQj7pI/dOfdkWTI2nONiD5Q=", "pom": "sha256-yTWvDWMw7Lk41paAn7mIG5hMz07owjDEUP8nqVNIFv0=" }, "com/android/tools/build/gradle/maven-metadata": { "xml": { "groupId": "com.android.tools.build", "lastUpdated": "20170306221012", "release": "2.3.0" } }, "com/android/tools/ddms#ddmlib/22.7.2": { "jar": "sha256-NZ5F7s1IkUbifaIimc7nOzYL1Ox/wCfb2zXKys5BOfk=", "pom": "sha256-YrMjYBcQ4UiBuJ/LDEJ/DfnNbewtmiY+F17jMt8iMXY=" }, "com/android/tools/external/lombok#lombok-ast/0.2.2": { "jar": "sha256-Ww2J1DBMXGFGDkijsPMTf3EitDOBuLtQWr9HzF/bmoE=", "pom": "sha256-iuaeannJXNEvRP80ak/B1wrnLTlkqnk3cTbGPIv0074=" }, "com/android/tools/layoutlib#layoutlib-api/22.7.2": { "jar": "sha256-X/eOSXu1N9Hi9toYoVGvyQZ7Cj6Q6KQvHJldOxd0kSw=", "pom": "sha256-dyDIj0DkMDb+tWMd2uEnO8XSwURDnqGK3/p0J3LzHnM=" }, "com/android/tools/lint#lint-api/22.7.2": { "jar": "sha256-1faoCgpY1ycOFmiZGr+akAkteBBqy1qDRGddCv71Tv4=", "pom": "sha256-gs32TSJflZ0SMJzK4k21b17zmJzn27TrE/oEW01RaQM=" }, "com/android/tools/lint#lint-checks/22.7.2": { "jar": "sha256-Hrp9wZ3RAhpR3BkT5obPwe4yrP3e26H3NZf2X6ghXzM=", "pom": "sha256-5/n3/kXskHm5S/kCh6xSbyGQ6/vJyU3LJsGhsG2+uM8=" }, "com/android/tools/lint#lint/22.7.2": { "jar": "sha256-vyzGoCzhz2/wdqBBo6GC8G8chqZfU/vR69VK/cxqjrg=", "pom": "sha256-PPoEnyzLSe5u7n55c5WjqGrpizxkIIINKEb+B6bqKlc=" }, "com/google/guava#guava-parent/15.0": { "pom": "sha256-9RllyaeD1msuchhUmHcfYJsJcQik/g9xfPwzCBWV2js=" }, "com/google/guava#guava/15.0": { "jar": "sha256-ejRXV3DuvGClR2YW42dqbLbyl1x4xBXipgFKxyS6V4M=", "pom": "sha256-lxBXG7i0qZL0X/gKSOL+Ws7cdD6/iD1M/cuSBgIruFs=" }, "com/squareup#javawriter/2.2.1": { "jar": "sha256-HIIW3l9u2UaerpQhAybEt/5hFmvlAnaOkCd5xqe6vOo=", "pom": "sha256-XNmnCSuBlmCSc4cBpL28LkoDm/r8E6NcfKCYEc+7MPA=" }, "commons-codec#commons-codec/1.4": { "jar": "sha256-aqQjTHTzoQNXUaJYIlRYZ8jDcnElpkK24ElmXRhjYxs=", "pom": "sha256-9fMAaUIboBPna+znYEB9zIACJGHclVXcvXX9sG2aQI8=" }, "commons-logging#commons-logging/1.1.1": { "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" }, "kxml2#kxml2/2.3.0": { "pom": "sha256-CVvyT0be2d4LZsqdZx3PVPj2FbqVFQsaMTw0dcVf1qU=" }, "net/sf/kxml#kxml2/2.3.0": { "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=", "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU=" }, "net/sf/proguard#proguard-base/4.10": { "jar": "sha256-pCU0cXeR5+2oMDYTNzWP4siLCRmAEfnu0epVkfNUTyQ=", "pom": "sha256-iYTsEfuzfC9fj1aDRT2mLVtGYU8VxVBxJUH9isYqnWs=" }, "net/sf/proguard#proguard-gradle/4.10": { "jar": "sha256-ijb/GXYIYcPPWijb4aadk+aEfi5aadg5PQhkQv8R0Ms=", "pom": "sha256-kZNouji8XuG6t3YYOqf2HKBaDg1syDbiOhByk59mK5E=" }, "net/sf/proguard#proguard-parent/4.10": { "pom": "sha256-31W088lOxk4iyZFZ/VmWktA9VNdaFRMXMqovUDOeLGM=" }, "org/apache#apache/4": { "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" }, "org/apache/commons#commons-compress/1.0": { "jar": "sha256-CehOeXeMoboVtzNll6MhRX/CJb1dQfe0aTXSeSL8KnQ=", "pom": "sha256-O4swzTU6QIV7IEMRzGQVBLATSET8lhOMIkMlniAo/5E=" }, "org/apache/commons#commons-parent/11": { "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" }, "org/apache/commons#commons-parent/5": { "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" }, "org/apache/httpcomponents#httpclient/4.1.1": { "jar": "sha256-6uUm0Ipmeb9soTjUWgAFsgum7EpAJ4i+gQlwcTyOR1E=", "pom": "sha256-rboX2TSKl9TOBfKCZ5cP2BlcYaVssG1eDdFfr/YP4qc=" }, "org/apache/httpcomponents#httpcomponents-client/4.1": { "pom": "sha256-UhW2SHmMbI2bnN42QtO/taTMiUt8hBEAQ1Ln3l0RmCc=" }, "org/apache/httpcomponents#httpcomponents-client/4.1.1": { "pom": "sha256-R1KE5emVUm1+dxUTSgdBLOctWYUEY0I4P13kGIoCKlM=" }, "org/apache/httpcomponents#httpcomponents-core/4.1": { "pom": "sha256-T3l//Zw9FW3g2+wf0eY+n9hYSpPHBDV2VT38twb2TeQ=" }, "org/apache/httpcomponents#httpcore/4.1": { "jar": "sha256-POON5R9OJGaMbRhAV6jQhUH56BXS0xnQ9GLwgwkrKc8=", "pom": "sha256-T8hq+jjpyfqwmcz0XCvHQ9RT5qsiJJCr/oZxl1w8cyc=" }, "org/apache/httpcomponents#httpmime/4.1": { "jar": "sha256-MWKVZhSOikdoiuQ7Qgq8Ps14PtFbM768AIJL8kybFao=", "pom": "sha256-2zzZW+wQAWBeFlPyhD6FQucS+iu2cv2cjBrOhsV2c9E=" }, "org/apache/httpcomponents#project/4.1.1": { "pom": "sha256-IbtNRN/1TjOjfBGvaYWacUICrgCWmqtUU+unJ2aI+Ow=" }, "org/bouncycastle#bcpkix-jdk15on/1.48": { "jar": "sha256-U0czNrTlqtd5aKGLFsVNFc28Q/Plehh4eZ7faUHQujc=", "pom": "sha256-v3z/mqxILUKuuKFVHQDrZ81DbsjNThJuyKHgnITdIX0=" }, "org/bouncycastle#bcprov-jdk15on/1.48": { "jar": "sha256-gEt+Ljuax3Hf07Q94WZmrGAI+GAPSPKN3JTjmhFOIog=", "pom": "sha256-KRIr50qOwbT8VB49opmL62Irw4wEuovx9Vk4aReCeYI=" }, "org/eclipse/jdt/core/compiler#ecj/4.2.2": { "jar": "sha256-THTfiGENZzssdL9bSLYoS65C+biA8K2JqK2mn+hKDXA=", "pom": "sha256-sh7YTnfE/FhyYqADSzUx+vt+WxGlMWqbjKo/47fqYj0=" }, "org/ow2#ow2/1.3": { "pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs=" }, "org/ow2/asm#asm-analysis/4.0": { "jar": "sha256-3VOXq69XIxBJrLEBxFHlmKlHpd0YKYMneVNc/cK68U4=", "pom": "sha256-7U8zeG58CrtuaOYcK047V7WLFOqu/ewxtwkCXja3/Hg=" }, "org/ow2/asm#asm-parent/4.0": { "pom": "sha256-QFr+Cu5AfJEcXkqoCpSdtVOS8XleE8oCrnKdFV30rBg=" }, "org/ow2/asm#asm-tree/4.0": { "jar": "sha256-2LAWoiBbLhQdtCbAQdKubQ1ButBQBioqUXWiWdNkF9o=", "pom": "sha256-eskVIWBDQDSQMyuS1unIoqd5QIyy1kgdqdOjXtGKLvw=" }, "org/ow2/asm#asm/4.0": { "jar": "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc=", "pom": "sha256-5jzvroWeRrEtOd1Yh3oZ+JN0pM6xvLE2Fz+nbUfXhtc=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" } } } </ins>


hash = "sha256-wHCTqcBvVN/pTXH3iW57DPpMEsnehutRQB5NaugS6Zs="; }; <del> patches = [ ./01-kdtree-signature.patch ]; </del> <ins> nativeBuildInputs = [ setuptools ]; </ins> propagatedBuildInputs = [ numba


config = mkIf cfg.enable { warnings = [] <del> ++ optional (cfg.settings != null && cfg.settings.location != null) </del> <ins> ++ optional (cfg.settings != null && cfg.settings ? location) </ins> "`services.borgmatic.settings.location` is deprecated, please move your options out of sections to the global scope" ++ optional (catAttrs "location" (attrValues cfg.configurations) != []) "`services.borgmatic.configurations.<name>.location` is deprecated, please move your options out of sections to the global scope"


doCheck = true; <ins> # NOTE: Purity check is disabled for checkPhase because it doesn't fare well # with the DMD linker. See https://github.com/NixOS/nixpkgs/issues/97420 </ins> checkPhase = '' cd dmd <del> make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL </del> <ins> NIX_ENFORCE_PURITY=  make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL </ins> cd ../druntime <del> make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release </del> <ins> NIX_ENFORCE_PURITY=  make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release </ins> cd ../phobos <del> make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" </del> <ins> NIX_ENFORCE_PURITY=  make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" </ins> cd .. '';


<ins> { config, pkgs ,lib ,... }: with lib; { options.xdg.portal = { enable = mkEnableOption "<link xlink:href='https://github.com/flatpak/xdg-desktop-portal'>xdg desktop integration</link>"//{ default = true; }; extraPortals = mkOption { type = types.listOf types.package; default = []; description = '' List of additional portals to add to path. Portals allow interaction with system, like choosing files or taking screenshots. At minimum, a desktop portal implementation should be listed. GNOME and KDE already adds <package>xdg-desktop-portal-gtk</package>; and <package>xdg-desktop-portal-kde</package> respectively. On other desktop environments you probably want to add them yourself. ''; }; }; config = let cfg = config.xdg.portal; packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; in mkIf cfg.enable { services.dbus.packages  = packages; systemd.packages = packages; environment.variables = { GTK_USE_PORTAL = "1"; XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals; }; }; } </ins>


done poolImported "${pool}" || poolImport "${pool}"  # Try one last time, e.g. to import a degraded pool. if poolImported "${pool}"; then <del> ${optionalString cfgZfs.requestEncryptionCredentials '' </del> <ins> ${optionalString (if isBool cfgZfs.requestEncryptionCredentials then cfgZfs.requestEncryptionCredentials else cfgZfs.requestEncryptionCredentials != []) '' </ins> ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'t' read ds kl; do <del> (case "$kl" in </del> <ins> (${optionalString (!isBool cfgZfs.requestEncryptionCredentials) '' if ! echo '${concatStringsSep "n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then continue fi ''} case "$kl" in </ins> none ) ;; prompt )


make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc ''; enableParallelBuilding = true; meta = with lib; {


vix = callPackage ../tools/misc/vix { }; <ins> vkBasalt = callPackage ../tools/graphics/vkBasalt { vkBasalt32 = pkgsi686Linux.vkBasalt; }; </ins> vnc2flv = callPackage ../tools/video/vnc2flv {}; vncrec = callPackage ../tools/video/vncrec { };


{ lib <ins> , stdenv </ins> , buildPythonPackage , fetchPypi , click


wantedBy = [ "multi-user.target" ]; aliases = [ "dbus-org.freedesktop.resolve1.service" ]; restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ]; <ins> # Upstream bug: https://github.com/systemd/systemd/issues/18078 # systemd-resolved without libidn2 is broken environment.LD_LIBRARY_PATH = "${lib.getLib pkgs.libidn2}/lib"; </ins> }; environment.etc = {


config = mkIf cfg.enable { systemd = { packages = [ pkgs.networkd-dispatcher ]; services.networkd-dispatcher = { wantedBy = [ "multi-user.target" ]; # Override existing ExecStart definition <del> serviceConfig.ExecStart = [ </del> <ins> serviceConfig.ExecStart = let scriptDir = pkgs.symlinkJoin { name = "networkd-dispatcher-script-dir"; paths = lib.mapAttrsToList (name: cfg: (map(state: pkgs.writeTextFile { inherit name; text = cfg.script; destination = "/${state}.d/${name}"; executable = true; } ) cfg.onState) ) cfg.rules; }; in [ </ins> "" <del> "${pkgs.networkd-dispatcher}/bin/networkd-dispatcher -v --script-dir ${cfg.scriptDir} $networkd_dispatcher_args" </del> <ins> "${pkgs.networkd-dispatcher}/bin/networkd-dispatcher -v --script-dir ${scriptDir} $networkd_dispatcher_args" </ins> ]; }; <del> # Directory structure required according to upstream instructions # https://gitlab.com/craftyguy/networkd-dispatcher tmpfiles.rules = [ "d '${cfg.scriptDir}'               0750 root root - -" "d '${cfg.scriptDir}/routable.d'    0750 root root - -" "d '${cfg.scriptDir}/dormant.d'     0750 root root - -" "d '${cfg.scriptDir}/no-carrier.d'  0750 root root - -" "d '${cfg.scriptDir}/off.d'         0750 root root - -" "d '${cfg.scriptDir}/carrier.d'     0750 root root - -" "d '${cfg.scriptDir}/degraded.d'    0750 root root - -" "d '${cfg.scriptDir}/configuring.d' 0750 root root - -" "d '${cfg.scriptDir}/configured.d'  0750 root root - -" ]; </del> }; }; }


<ins> diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile --- gildas-src-aug18a/kernel/etc/Makefile	2016-09-09 09:39:37.000000000 +0200 +++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile	2018-09-04 12:03:11.000000000 +0200 @@ -29,7 +29,8 @@ SEDEXE=sed -e 's?source tree?executable tree?g' -$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey +$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey  +	$(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw) $(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin else </ins>


<ins> { lib, stdenvNoCC, fetchurl, dpkg, makeWrapper, electron, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; version = "1.17.5"; src = fetchurl { url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; hash = "sha256-2dnR/4LpLiQlJebv74/F7L/a5lYPh+AMPqQVIBHvxcg="; }; dontConfigure = true; dontBuild = true; nativeBuildInputs = [ dpkg makeWrapper ]; installPhase = '' runHook preInstall mkdir -p $out cp -r usr/share/ $out/ cp -r usr/lib/proton-pass/resources/app.asar $out/share/ runHook postInstall ''; preFixup = '' makeWrapper ${lib.getExe electron} $out/bin/proton-pass  --add-flags $out/share/app.asar  --add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"  --set-default ELECTRON_FORCE_IS_PACKAGED 1  --set-default ELECTRON_IS_DEV 0  --inherit-argv0 ''; meta = { description = "Desktop application for Proton Pass"; homepage = "https://proton.me/pass"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ massimogengarelli sebtm ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "proton-pass"; }; }) </ins>


<del> { stdenv, lib, fetchurl, extra-cmake-modules , qtbase, kio , libatasmart, parted , util-linux }: </del> <ins> { stdenv, lib, fetchurl, fetchpatch, extra-cmake-modules , qca-qt5, kauth, kio, polkit-qt, qtbase , util-linux }: </ins> stdenv.mkDerivation rec { pname = "kpmcore"; <del> version = "3.3.0"; </del> <ins> # NOTE: When changing this version, also change the version of `partition-manager`. version = "4.2.0"; </ins> src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; <del> sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq"; </del> <ins> hash = "sha256-MvW0CqvFZtzcJlya6DIpzorPbKJai6fxt7nKsKpJn54="; </ins> }; <del> buildInputs = [ qtbase libatasmart parted # we only need the library </del> <ins> patches = [ # Fix build with `kcoreaddons` >= 5.77.0 (fetchpatch { url = "https://github.com/KDE/kpmcore/commit/07e5a3ac2858e6d38cc698e0f740e7a693e9f302.patch"; sha256 = "sha256-LYzea888euo2HXM+acWaylSw28iwzOdZBvPBt/gjP1s="; }) # Fix crash when `fstab` omits mount options. (fetchpatch { url = "https://github.com/KDE/kpmcore/commit/eea84fb60525803a789e55bb168afb968464c130.patch"; sha256 = "sha256-NJ3PvyRC6SKNSOlhJPrDDjepuw7IlAoufPgvml3fap0="; }) ]; buildInputs = [ qca-qt5 kauth </ins> kio <ins> polkit-qt </ins> <del> util-linux # needs blkid (note that this is not provided by util-linux-compat) </del> <ins> util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat) </ins> ]; nativeBuildInputs = [ extra-cmake-modules ];


chntpw = callPackage ../tools/security/chntpw { }; <ins> cliphist = callPackage ../tools/wayland/cliphist { }; </ins> clipman = callPackage ../tools/wayland/clipman { }; kanshi = callPackage ../tools/wayland/kanshi { };


pushd unpacked/tensorboard-${version} substituteInPlace tensorboard-${version}.dist-info/METADATA  <del> --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)"  </del> <ins> --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<1.0,>=0.4.1)"  </ins> --replace "protobuf (<3.20,>=3.9.2)" "protobuf (>=3.9.2)" popd


with subtest("A podman non-member can not use the docker cli"): docker.fail(su_cmd("docker version", user="mallory")) <ins> with subtest("A rootless quadlet container service is created"): dir = "/home/alice/.config/containers/systemd" rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) rootless.succeed(su_cmd(f"mkdir -p {dir}")) rootless.succeed(su_cmd(f"cp -f ${quadletContainerFile} {dir}/quadlet.container")) rootless.systemctl("daemon-reload", "alice") rootless.systemctl("start quadlet", "alice") rootless.wait_until_succeeds(su_cmd("podman ps | grep quadlet"), timeout=20) rootless.systemctl("stop quadlet", "alice") </ins> # TODO: add docker-compose test '';


rm ./texmfcnf.lua sed  -e 's,texmf-dist,texmf,g'  <del> -e 's,texmf-local,texmf,g'  -e "s,(TEXMFLOCAL[ ]*=[ ]*)[^,]*,1"$out/share/texmf",g"  </del> <ins> -e "s,(TEXMFLOCAL[ ]*=[ ]*)[^,]*,1"$out/share/texmf-local",g"  </ins> -e "s,$SELFAUTOLOC,$out,g"  -e "s,selfautodir:/,$out/share/,g"  -e "s,selfautodir:,$out/share/,g"


, xhtml1 , yajl , writeScript <ins> , nixosTests </ins> # Linux , acl ? null


${stdenv.lib.optionalString enablePlayer '' --prefix LD_LIBRARY_PATH : ${vlc}/lib ''} <ins> mkdir -p $out/share/applications $out/share/icons $out/share/man/man1 cp $out/Tribler/Main/Build/Ubuntu/tribler.desktop $out/share/applications/tribler.desktop cp $out/Tribler/Main/Build/Ubuntu/tribler_big.xpm $out/share/icons/tribler.xpm cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1 </ins> ''; meta = with stdenv.lib; {


inherit (darwin.apple_sdk.frameworks) Security; }; <ins> vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { }; </ins> vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; verbiste = callPackage ../applications/misc/verbiste {


case $o in init=*) IFS== read -r -a initParam <<< "$o" <del> closure="$(dirname "''${initParam[1]}")" </del> <ins> closure="''${initParam[1]}" </ins> ;; esac done


let pname = "expressvpn"; <del> clientVersion = "3.25.0"; clientBuild = "13"; </del> <ins> clientVersion = "3.52.0"; clientBuild = "2"; </ins> version = lib.strings.concatStringsSep "." [ clientVersion clientBuild ]; expressvpnBase = stdenvNoCC.mkDerivation {


'' + optionalString targetPlatform.isAndroid '' <del> echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags </del> <ins> echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags </ins> '' # There are a few tools (to name one libstdcxx5) which do not work


<del> { stdenv, fetchurl, perl, git }: </del> <ins> { stdenv, fetchurl, git, nettools, perl }: </ins> stdenv.mkDerivation rec { name = "gitolite-${version}"; <del> version = "3.6.2"; </del> <ins> version = "3.6.3"; </ins> src = fetchurl { url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz"; <del> sha256 = "1gsgzi9ayb4rablki3mqr11b0h8db4xg43df660marfpacmkfb01"; </del> <ins> sha256 = "16cxifjxnri719qb6zzwkdf61x5y957acbdhcgqcan23x1mfn84v"; </ins> }; <del> buildInputs = [ perl git ]; </del> <ins> buildInputs = [ git nettools perl ]; </ins> buildPhase = "true"; patchPhase = ''


stumpwm = sbclPackages.stumpwm; <ins> stumpwm-unwrapped = sbclPackages.stumpwm-unwrapped; </ins> sublime = callPackage ../applications/editors/sublime/2 { }; sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { });


{ description = stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; <ins> priority = 10; </ins> } // optionalAttrs useMacosReexportHack { platforms = stdenv.lib.platforms.darwin; };


{ lib, stdenv, fetchurl, cmake, bison, pkg-config , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds <del> , libtirpc, rpcsvc-proto </del> <ins> , libtirpc, rpcsvc-proto, nixosTests </ins> }: # Note: zlib is not required; MySQL can use an internal zlib.


<del> { stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook }: </del> <ins> { lib , buildPythonApplication , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, mock, gnureadline , pytest_xdist, pytest, dateutil }: </ins> <del> python37Packages.buildPythonApplication rec { </del> <ins> buildPythonApplication rec { </ins> pname = "certbot"; <del> version = "1.0.0"; </del> <ins> version = "1.3.0"; </ins> src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; <del> sha256 = "180x7gcpfbrzw8k654s7b5nxdy2yg61lq513dykyn3wz4gssw465"; </del> <ins> sha256 = "1nzp1l63f64qqp89y1vyd4lgfhykfp5dkr6iwfiyf273y7sjwpsa"; </ins> }; patches = [ ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch ]; <del> propagatedBuildInputs = with python37Packages; [ </del> <ins> propagatedBuildInputs = [ </ins> ConfigArgParse acme configobj


fi poolImported "${pool}" || poolImport "${pool}"  # Try one last time, e.g. to import a degraded pool. fi <del> ${lib.optionalString cfgZfs.requestEncryptionCredentials '' zfs load-key -a ''} </del> <ins> ${if isBool cfgZfs.requestEncryptionCredentials then optionalString cfgZfs.requestEncryptionCredentials '' zfs load-key -a '' else concatMapStrings (fs: '' zfs load-key ${fs} '') cfgZfs.requestEncryptionCredentials} </ins> '') rootPools)); };


libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes <del> enet libtheora freetype physfs libopus pkg-config gtk2 pcre libXdmcp </del> <ins> enet libtheora freetype physfs libopus pkg-config gtk3 pcre libXdmcp </ins> libpulseaudio libpthreadstubs ];


XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config} ''; <del> startplasma = '' ${set_XDG_CONFIG_HOME} mkdir -p "''${XDG_CONFIG_HOME}" '' + optionalString config.hardware.pulseaudio.enable '' # Load PulseAudio module for routing support. # See also: http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" '' + '' ${activationScript} # Create default configurations if Plasma has never been started. kdeglobals="''${XDG_CONFIG_HOME}/kdeglobals" if ! [ -f "$kdeglobals" ]; then kcminputrc="''${XDG_CONFIG_HOME}/kcminputrc" if ! [ -f "$kcminputrc" ]; then cat ${kcminputrc} >"$kcminputrc" fi gtkrc2="$HOME/.gtkrc-2.0" if ! [ -f "$gtkrc2" ]; then cat ${gtkrc2} >"$gtkrc2" fi gtk3_settings="''${XDG_CONFIG_HOME}/gtk-3.0/settings.ini" if ! [ -f "$gtk3_settings" ]; then mkdir -p "$(dirname "$gtk3_settings")" cat ${gtk3_settings} >"$gtk3_settings" fi fi ''; </del> in {


description = "Open the GitHub page or website for a repository in your browser"; license = licenses.mit; platforms = platforms.all; <del> maintainers = with maintainers; [ jlesquembre SuperSandro2000 ]; </del> <ins> maintainers = with maintainers; [ SuperSandro2000 ]; </ins> }; }


go-junit-report = callPackage ../development/tools/go-junit-report { }; <ins> gobang = callPackage ../development/tools/database/gobang { }; </ins> gogetdoc = callPackage ../development/tools/gogetdoc { }; gox = callPackage ../development/tools/gox { };


# Load extensions from NEMO_EXTENSION_DIR environment variable # https://github.com/NixOS/nixpkgs/issues/78327 ./load-extensions-from-env.patch <ins> # Don't tie the interactive search box with the window's lifetime # https://github.com/linuxmint/nemo/issues/3423 (fetchpatch { url = "https://github.com/linuxmint/nemo/commit/055b47af0e1a830e556989372f3689bbd36b639d.patch"; hash = "sha256-cMtBz1uLGCV4nnrBITzXAV/SffI0nNcEdeujrHxAzQc="; }) </ins> ]; outputs = [ "out" "dev" ];