), formatter_class=argparse.RawTextHelpFormatter ) <del> @@ -133,14 +132,10 @@ def main(args=None): </del> <ins> @@ -138,18 +137,9 @@ def main(args=None): ) </ins> sys.exit(-1) <del> # 2. Find Steam Runtime if enabled -    steam_runtime_path = None +    steam_runtime = False </del> <ins> -    # 2. Find the pre-installed legacy Steam Runtime if enabled -    legacy_steam_runtime_path = None -    use_steam_runtime = True - +    # 2. Use Steam Runtime if enabled </ins> if os.environ.get("STEAM_RUNTIME", "") != "0" and not args.no_runtime: <del> -        steam_runtime_path = find_steam_runtime_path(steam_root=steam_root) </del> <ins> -        legacy_steam_runtime_path = find_legacy_steam_runtime_path( -            steam_root=steam_root -        ) </ins> - <del> -        if not steam_runtime_path: </del> <ins> -        if not legacy_steam_runtime_path: </ins> -            print("Steam Runtime was enabled but couldn't be found!") -            sys.exit(-1) <del> +        steam_runtime = True </del> <ins> +        use_steam_runtime = True </ins> else: <ins> use_steam_runtime = False </ins> logger.info("Steam Runtime disabled.") <del> @@ -201,7 +196,7 @@ def main(args=None): winetricks_path=winetricks_path, </del> <ins> @@ -212,7 +202,6 @@ def main(args=None): </ins> proton_app=proton_app, steam_app=steam_app, <del> -            steam_runtime_path=steam_runtime_path, +            steam_runtime=steam_runtime, command=[winetricks_path, "--gui"] </del> <ins> use_steam_runtime=use_steam_runtime, -            legacy_steam_runtime_path=legacy_steam_runtime_path, command=[winetricks_path, "--gui"], use_bwrap=use_bwrap </ins> ) <del> @@ -269,7 +264,7 @@ def main(args=None): winetricks_path=winetricks_path, </del> <ins> @@ -282,7 +271,6 @@ def main(args=None): </ins> proton_app=proton_app, steam_app=steam_app, <del> -            steam_runtime_path=steam_runtime_path, +            steam_runtime=steam_runtime, </del> <ins> use_steam_runtime=use_steam_runtime, -            legacy_steam_runtime_path=legacy_steam_runtime_path, use_bwrap=use_bwrap, </ins> command=[winetricks_path] + args.winetricks_command) elif args.command: <del> run_command( @@ -277,7 +272,7 @@ def main(args=None): proton_app=proton_app, </del> <ins> @@ -292,7 +280,6 @@ def main(args=None): </ins> steam_app=steam_app, command=args.command, <del> -            steam_runtime_path=steam_runtime_path, +            steam_runtime=steam_runtime, </del> <ins> use_steam_runtime=use_steam_runtime, -            legacy_steam_runtime_path=legacy_steam_runtime_path, use_bwrap=use_bwrap, </ins> # Pass the command directly into the shell *without* # escaping it <del> cwd=steam_app.install_path, </del> diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py <del> index fa5772d..4f30cd3 100644 </del> <ins> index 8554e24..509afb6 100644 </ins> --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py <del> @@ -11,7 +11,7 @@ from .util import lower_dict </del> <ins> @@ -13,8 +13,8 @@ from .util import lower_dict </ins> __all__ = ( "COMMON_STEAM_DIRS", "SteamApp", "find_steam_path", <del> -    "find_steam_proton_app", "find_proton_app", "find_steam_runtime_path", +    "find_steam_proton_app", "find_proton_app", "find_appid_proton_prefix", "get_steam_lib_paths", "get_steam_apps", "get_custom_proton_installations" </del> <ins> "find_steam_proton_app", "find_proton_app", -    "find_legacy_steam_runtime_path", "find_appid_proton_prefix", -    "get_steam_lib_paths", "get_steam_apps", "get_custom_proton_installations" +    "find_appid_proton_prefix", "get_steam_lib_paths", +    "get_steam_apps", "get_custom_proton_installations" </ins> ) <del> @@ -254,37 +254,6 @@ def find_steam_path(): </del> <ins> COMMON_STEAM_DIRS = [ @@ -283,37 +283,6 @@ def find_steam_path(): </ins> return None, None <del> -def find_steam_runtime_path(steam_root): </del> <ins> -def find_legacy_steam_runtime_path(steam_root): </ins> -    """ <del> -    Find the Steam Runtime either using the STEAM_RUNTIME env or </del> <ins> -    Find the legacy Steam Runtime either using the STEAM_RUNTIME env or </ins> -    steam_root -    """ -    env_steam_runtime = os.environ.get("STEAM_RUNTIME", "")


{ lib, stdenv , substituteAll , fetchurl <ins> , fetchpatch </ins> , fetchFromGitHub , autoreconfHook , gettext


cp -r ${driver} driver-src chmod -R +w driver-src <ins> cp ${driverKernel610MainC} driver-src/driver/main.c </ins> cmakeFlagsArray+=( "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"


"google.oauth2" ]; <ins> disabledTests = lib.optionals stdenv.isDarwin [ "test_request_with_timeout_success" "test_request_with_timeout_failure" "test_request_headers" "test_request_error" "test_request_basic" ]; </ins> meta = with lib; { description = "Google Auth Python Library"; longDescription = ''


MACOSX_DEPLOYMENT_TARGET=10.16 '' else null; <ins> configureFlags = [ "PYTHON_VERSION=${lib.versions.major python.version}" ]; </ins> nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus dbus-glib ] # My guess why it's sometimes trying to -lncurses.


}; users.groups.${cfg.group}.gid = config.ids.gids.gitolite; <del> systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} - -" "d '${cfg.dataDir}'/.gitolite - ${cfg.user} ${cfg.group} - -" "d '${cfg.dataDir}'/.gitolite/logs - ${cfg.user} ${cfg.group} - -" "Z ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -" ]; </del> systemd.services.gitolite-init = { description = "Gitolite initialization"; wantedBy    = [ "multi-user.target" ];


{ fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3 <del> , libcanberra_gtk3 }: </del> <ins> , libcanberra_gtk3, makeWrapper, gnome3 }: </ins> stdenv.mkDerivation rec { name = "pavucontrol-2.0";


'' # Move the outputs into their respective outputs. + strings.concatMapStringsSep "n" mkMoveToOutputCommand (builtins.tail finalAttrs.outputs) <ins> # Add a newline to the end of the installPhase, so that the post-install hook doesn't # get concatenated with the last moveToOutput command. + "n" </ins> # Post-install hook + '' runHook postInstall


homepage = "https://github.com/cinemast/libjson-rpc-cpp"; license = licenses.mit; platforms = platforms.linux; <ins> sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ robertrichter ]; </ins> }; }


dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; <del> dm-tree = callPackage ../development/python-modules/dm-tree { }; </del> <ins> dm-tree = callPackage ../development/python-modules/dm-tree { abseil-cpp = pkgs.abseil-cpp.override { cxxStandard = "14"; }; }; </ins> dnachisel = callPackage ../development/python-modules/dnachisel { };


<ins> { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl }: stdenv.mkDerivation rec { pname = "libxcrypt"; version = "4.4.18"; src = fetchFromGitHub { owner = "besser82"; repo = "libxcrypt"; rev = "v${version}"; sha256 = "4015bf1b3a2aab31da5a544424be36c1a0f0ffc1eaa219c0e7b048e4cdcbbfe1"; }; preConfigure = '' patchShebangs autogen.sh ./autogen.sh ''; nativeBuildInputs = [ autoconf automake libtool pkg-config perl ]; doCheck = true; meta = with lib; { description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others"; homepage = "https://github.com/besser82/libxcrypt/"; platforms = platforms.all; maintainers = with maintainers; [ dottedmag ]; license = licenses.lgpl21Plus; }; } </ins>


${upstreamDoc} ''; }; <ins> configFile = mkOption { type = types.path; default = mkConfig name config; defaultText = "A config file generated by values from other kanata module options."; description = '' The config file. By default, it is generated by values from other kanata module options. You can also set it to your own full config file which overrides all other kanata module options.  ${upstreamDoc} ''; }; </ins> extraArgs = mkOption { type = types.listOf types.str; default = [ ];


passthru = { wpName = pname; <ins> }; meta = { license = lib.licenses.${license}; </ins> } // (args.passthru or {}); } // lib.optionalAttrs (type == "language") { nativeBuildInputs = [ gettext wp-cli ];


<del> { lib, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: </del> <ins> { lib, buildGoModule, fetchurl, fetchFromGitHub }: </ins> let <del> version = "1.6.4"; </del> <ins> version = "1.8.0"; </ins> # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { <del> url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; sha256 = "1shf1s9s525wns5vrsc4ns21zjxm1si43lx6v0q8ma6vd5x5445l"; </del> <ins> url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}.xpi"; sha256 = "sha256-12xWbf4ngYHWLKV9yyxyi0Ny/zHSj2o7Icats+Ef+pA="; </ins> }; <del> in buildGoPackage rec { </del> <ins> in buildGoModule rec { </ins> inherit version; pname = "browsh"; <del> goPackagePath = "browsh"; </del> <ins> sourceRoot = "source/interfacer"; </ins> <del> # further go package dependencies are defined in deps.nix, see line below. </del> src = fetchFromGitHub { owner = "browsh-org"; repo = "browsh"; rev = "v${version}"; <del> sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0"; </del> <ins> sha256 = "sha256-/tH1w6qi+rimsqtk8Y8AYljU3X4vbmoDtV07piWSBdw="; </ins> }; <del> nativeBuildInputs = [ go-bindata ]; </del> <ins> vendorSha256 = "sha256-eCvV3UuM/JtCgMqvwvqWF3bpOmPSos5Pfhu6ETaS58c="; </ins> <del> # embed the web extension in a go file and place it where it's supposed to # be. See # https://github.com/browsh-org/browsh/blob/v1.5.0/interfacer/contrib/xpi2bin.sh </del> preBuild = '' <del> xpiprefix="$(mktemp -d)" cp "${webext}" "$xpiprefix/browsh.xpi" go-bindata  -prefix "$xpiprefix"  -pkg browsh  -o "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/webextension.go"  "$xpiprefix/browsh.xpi" sed  -e 's:Asset("/browsh.xpi"):Asset("browsh.xpi"):g'  -i "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/firefox.go" ''; postBuild = '' mv "$NIX_BUILD_TOP/go/bin/src" "$NIX_BUILD_TOP/go/bin/browsh" </del> <ins> cp "${webext}" src/browsh/browsh.xpi </ins> ''; <del> goDeps = ./deps.nix; </del> <ins> # Tests require network access doCheck = false; </ins> meta = with lib; { description = "A fully-modern text-based browser, rendering to TTY and browsers"; homepage = "https://www.brow.sh/"; <del> maintainers = [ maintainers.kalbasit ]; </del> <ins> maintainers = with maintainers; [ kalbasit siraben ]; </ins> license = lib.licenses.lgpl21; platforms = lib.platforms.linux ++ lib.platforms.darwin; };


(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) <del> (fetchNuGet { pname = "NLog"; version = "5.2.7"; sha256 = "1gq5l9qv3vnl0rvxa110bbqsq6m43h8h912xijqab1hsjdpb46q3"; }) (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.7"; sha256 = "1hv2v4hqqq86vjvxa0cbk4klaii8n8h1wjrlsfzbp9nnxnzg9pzi"; }) (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.7"; sha256 = "1jifwnvkfi3jankan7543q985gzrywddvajlqrf573aa2dbp5n1f"; }) </del> <ins> (fetchNuGet { pname = "NLog"; version = "5.2.8"; sha256 = "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12"; }) (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; }) (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.8"; sha256 = "05a6bzvdf63lbnn6sj3yfggxcgv96j91kdbcw0ac5hxl58df58r6"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) </ins> (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.26"; sha256 = "1mcg46xnhgqwjacy6j8kvp3rylpi26wjnmhwv8mh5cwjya9nynqb"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.26"; sha256 = "1wrr38ygdanf121bkl8b1d4kz1pawm064z69bqf3qbr46h4j575w"; })


meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ]; options.services.freshrss = { <del> enable = mkEnableOption "FreshRSS feed reader"; </del> <ins> enable = mkEnableOption "FreshRSS RSS aggregator and reader with php-fpm backend."; </ins> package = mkPackageOption pkgs "freshrss" { };


}; }; <ins> patches = [ (substituteAll { src = ./fix_gmenu.patch; gmenu_path = "${gnome3.gnome-menus}/lib/girepository-1.0"; }) ]; </ins> doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext glib ];


, javaPackages }: <del> javaPackages.mavenfod rec { </del> <ins> (javaPackages.mavenfod.override { inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { </ins> pname = "dbeaver"; <del> version = "22.0.1"; # When updating also update fetchedMavenDeps.sha256 </del> <ins> version = "22.0.1"; # When updating also update mvnSha256 </ins> src = fetchFromGitHub { owner = "dbeaver";


autoSuspend = mkOption { default = true; description = '' <del> Suspend the machine after inactivity. </del> <ins> On the GNOME Display Manager login screen, suspend the machine after inactivity. (Does not affect automatic suspend while logged in, or at lock screen.) </ins> ''; type = types.bool; };


npmDepsHash = "sha256-157hm7h5FWuOuxoo6WTtlMPq5LcRZIsSt5NDg0pvim8="; npmFlags = [ "--legacy-peer-deps" ]; <del> nativeBuildInputs = [ (writeShellScriptBin "phantomjs" "echo 2.1.1") pkg-config ] ++ lib.optionals (! stdenv.isDarwin) [ makeWrapper copyDesktopItems ]; buildInputs = [ pixman cairo pango ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreText giflib ]; </del> <ins> nativeBuildInputs = [ (writeShellScriptBin "phantomjs" "echo 2.1.1") pkg-config ] ++ lib.optionals (!stdenv.isDarwin) [ makeWrapper copyDesktopItems ]; buildInputs = [ pixman cairo pango ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreText ]; </ins> desktopItems = [ (makeDesktopItem {


<ins> { buildPythonPackage , fetchFromGitHub , lib , writeShellScriptBin , cmake , doxygen , draco , graphviz-nox , ninja , setuptools , pyqt6 , pyopengl , jinja2 , pyside6 , boost , numpy , git , tbb , opensubdiv , openimageio , opencolorio , osl , ptex , embree , alembic , openexr , flex , bison , qt6 , python }: let # Matches the pyside6-uic implementation # https://code.qt.io/cgit/pyside/pyside-setup.git/tree/sources/pyside-tools/pyside_tool.py?id=e501cad66146a49c7a259579c7bb94bc93a67a08#n82 pyside-tools-uic = writeShellScriptBin "pyside6-uic" '' exec ${qt6.qtbase}/libexec/uic -g python "$@" ''; in buildPythonPackage rec { pname = "OpenUSD"; version = "23.11"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = pname; rev = "refs/tags/v${version}"; hash = "sha256-5zQrfB14kXs75WbL3s4eyhxELglhLNxU2L2aVXiyVjg="; }; outputs = ["out" "doc"]; format = "other"; propagatedBuildInputs = [ setuptools pyqt6 pyopengl jinja2 pyside6 pyside-tools-uic boost numpy ]; cmakeFlags = [ "-DPXR_BUILD_EXAMPLES=OFF" "-DPXR_BUILD_TUTORIALS=OFF" "-DPXR_BUILD_USD_TOOLS=ON" "-DPXR_BUILD_IMAGING=ON" "-DPXR_BUILD_USD_IMAGING=ON" "-DPXR_BUILD_USDVIEW=ON" "-DPXR_BUILD_DOCUMENTATION=ON" "-DPXR_BUILD_PYTHON_DOCUMENTATION=ON" "-DPXR_BUILD_EMBREE_PLUGIN=ON" "-DPXR_BUILD_ALEMBIC_PLUGIN=ON" "-DPXR_ENABLE_OSL_SUPPORT=ON" "-DPXR_BUILD_DRACO_PLUGIN=ON" "-DPXR_BUILD_MONOLITHIC=ON" # Seems to be commonly linked to monolithically ]; nativeBuildInputs = [ cmake ninja git qt6.wrapQtAppsHook doxygen graphviz-nox ]; buildInputs = [ tbb opensubdiv openimageio opencolorio osl ptex embree alembic.dev openexr flex bison boost draco qt6.qtbase qt6.qtwayland ]; pythonImportsCheck = [ "pxr" "pxr.Usd" ]; postInstall = '' # Make python lib properly accessible target_dir=$out/${python.sitePackages} mkdir -p $(dirname $target_dir) mv $out/lib/python $target_dir mv $out/docs $doc rm $out/share -r # only examples rm $out/tests -r ''; meta = { description = "Universal Scene Description"; longDescription = '' Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications. ''; homepage = "https://openusd.org/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ shaddydc ]; }; } </ins>


stdenv.mkDerivation (finalAttrs: { pname = "quickemu"; <del> version = "4.9.4"; </del> <ins> version = "4.9.4-unstable-2024-05-28"; </ins> src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; <del> rev = finalAttrs.version; hash = "sha256-fjbXgze6klvbRgkJtPIUh9kEkP/As7dAj+cazpzelBY="; </del> <ins> rev = "d78255b097b599e8ab3713cb61c4085cc45f5a95"; # TODO: return to version on next release hash = "sha256-fF306CdGqKM+779OLm0NNyqPBtm7TuU7UN/NanT12y8="; </ins> }; postPatch = ''


User = "unifi"; UMask = "0077"; WorkingDirectory = "${stateDir}"; <ins> # Hardening AmbientCapabilities = ""; CapabilityBoundingSet = ""; # ProtectClock= adds DeviceAllow=char-rtc r DeviceAllow = ""; DevicePolicy = "closed"; LockPersonality = true; NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; PrivateTmp = true; PrivateUsers = true; ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; ProtectHostname = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; ProtectSystem = "strict"; RemoveIPC = true; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; SystemCallErrorNumber = "EPERM"; SystemCallFilter = [ "@system-service" ]; # Required for ProtectSystem=strict BindPaths = [ stateDir ]; # Needs network access PrivateNetwork = false; # Cannot be true due to OpenJDK MemoryDenyWriteExecute = false; </ins> }; };


meta = with stdenv.lib; { homepage = "https://01.org/linuxmedia"; license = licenses.mit; <del> description = "Intel driver for the VAAPI library"; platforms = platforms.unix; maintainers = with maintainers; [ ]; </del> <ins> description = "VA-API user mode driver for Intel GEN Graphics family"; longDescription = '' This VA-API video driver backend provides a bridge to the GEN GPUs through the packaging of buffers and commands to be sent to the i915 driver for exercising both hardware and shader functionality for video decode, encode, and processing. VA-API is an open-source library and API specification, which provides access to graphics hardware acceleration capabilities for video processing. It consists of a main library and driver-specific acceleration backends for each supported hardware vendor. ''; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ primeos ]; </ins> }; }


pydf = callPackage ../applications/misc/pydf { }; <del> pygmentex = callPackage ../tools/typesetting/pygmentex { }; </del> pympress = callPackage ../applications/office/pympress { }; pythonIRClib = pythonPackages.pythonIRClib;


When this command successfully finishes, it will tell you where the manual got generated. The HTML will be accessible through the `result` symlink at `./result/share/doc/nixos/index.html`. <del> ## Editing DocBook XML {#sec-writing-docs-editing-docbook-xml} For general information on how to write in DocBook, see [DocBook 5: The Definitive Guide](https://tdg.docbook.org/tdg/5.1/). Emacs nXML Mode is very helpful for editing DocBook XML because it validates the document as you write, and precisely locates errors. To use it, see [](#sec-emacs-docbook-xml). [Pandoc](https://pandoc.org/) can generate DocBook XML from a multitude of formats, which makes a good starting point. Here is an example of Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML: ```ShellSession pandoc -f markdown_github -t docbook5 docs.md -o my-section.md ``` Pandoc can also quickly convert a single `section.xml` to HTML, which is helpful when drafting. Sometimes writing valid DocBook is too difficult. In this case, submit your documentation updates in a [GitHub Issue](https://github.com/NixOS/nixpkgs/issues/new) and someone will handle the conversion to XML for you. ## Creating a Topic {#sec-writing-docs-creating-a-topic} You can use an existing topic as a basis for the new topic or create a topic from scratch. Keep the following guidelines in mind when you create and add a topic: -   The NixOS [`book`](https://tdg.docbook.org/tdg/5.0/book.html) element is in `nixos/doc/manual/manual.xml`. It includes several [`parts`](https://tdg.docbook.org/tdg/5.0/book.html) which are in subdirectories. -   Store the topic file in the same directory as the `part` to which it belongs. If your topic is about configuring a NixOS module, then the XML file can be stored alongside the module definition `nix` file. -   If you include multiple words in the file name, separate the words with a dash. For example: `ipv6-config.xml`. -   Make sure that the `xml:id` value is unique. You can use abbreviations if the ID is too long. For example: `nixos-config`. -   Determine whether your topic is a chapter or a section. If you are unsure, open an existing topic file and check whether the main element is chapter or section. ## Adding a Topic to the Book {#sec-writing-docs-adding-a-topic} Open the parent CommonMark file and add a line to the list of chapters with the file name of the topic that you created. If you created a `section`, you add the file to the `chapter` file. If you created a `chapter`, you add the file to the `part` file. If the topic is about configuring a NixOS module, it can be automatically included in the manual by using the `meta.doc` attribute. See [](#sec-meta-attributes) for an explanation. </del>


<del> { lib, buildPythonPackage, fetchPypi , billiard, click, click-didyoumean, click-plugins, click-repl, kombu, pytz, vine , boto3, case, moto, pytest, pytest-celery, pytest-subtests, pytest-timeout </del> <ins> { lib , billiard , boto3 , buildPythonPackage , case , click , click-didyoumean , click-plugins , click-repl , fetchPypi , kombu , moto , pymongo , pytest-celery , pytest-subtests , pytest-timeout , pytestCheckHook , pythonOlder , pytz , vine </ins> }: buildPythonPackage rec { pname = "celery"; version = "5.2.1"; <ins> format = "setuptools"; disabled = pythonOlder "3.7"; </ins> src = fetchPypi { inherit pname version; sha256 = "sha256-tBpZC0nK+OZJilfbYo5YDV+Nxv69oPQt5deDrtW3+Ag="; }; <del> propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ]; </del> <ins> propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ]; checkInputs = [ boto3 case moto pymongo pytest-celery pytest-subtests pytest-timeout pytestCheckHook ]; disabledTestPaths = [ # test_eventlet touches network "t/unit/concurrency/test_eventlet.py" # test_multi tries to create directories under /var "t/unit/bin/test_multi.py" "t/unit/apps/test_multi.py" ]; </ins> <del> checkInputs = [ boto3 case moto pytest pytest-celery pytest-subtests pytest-timeout ]; </del> <ins> disabledTests = [ "msgpack" "test_check_privileges_no_fchown" ]; </ins> <del> # ignore test that's incompatible with pytest5 # test_eventlet touches network # test_mongodb requires pymongo # test_multi tries to create directories under /var checkPhase = '' pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply and not pytest'  --ignore=t/unit/contrib/test_pytest.py  --ignore=t/unit/concurrency/test_eventlet.py  --ignore=t/unit/bin/test_multi.py  --ignore=t/unit/apps/test_multi.py  --ignore=t/unit/backends/test_mongodb.py ''; </del> <ins> pythonImportsCheck = [ "celery" ]; </ins> meta = with lib; { <del> homepage = "https://github.com/celery/celery/"; </del> description = "Distributed task queue"; <ins> homepage = "https://github.com/celery/celery/"; </ins> license = licenses.bsd3; <del> maintainers = [ ]; </del> <ins> maintainers = with maintainers; [ ]; </ins> }; }


<ins> diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp index c477851c1b..ff5e28d95b 100644 --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp @@ -368,13 +368,13 @@ void os::init_system_properties_values() { //        ... //        7: The default directories, normally /lib and /usr/lib. #if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390)) -#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" +#define DEFAULT_LIBPATH "" #else -#define DEFAULT_LIBPATH "/lib:/usr/lib" +#define DEFAULT_LIBPATH "" #endif // Base path of extensions installed on the system. -#define SYS_EXT_DIR     "/usr/java/packages" +#define SYS_EXT_DIR     "" #define EXTENSIONS_DIR  "/lib/ext" #define ENDORSED_DIR    "/lib/endorsed" @@ -437,13 +437,13 @@ void os::init_system_properties_values() { strlen(v) + 1 + sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1, mtInternal); -    sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch); +    sprintf(ld_library_path, "%s%s", v); Arguments::set_library_path(ld_library_path); FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal); } // Extensions directories. -  sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); +  sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); Arguments::set_ext_dirs(buf); // Endorsed standards default directory. </ins>


installShellFiles = callPackage ../build-support/install-shell-files {}; <ins> # See doc/builders/special/invalidateFetcherByDrvHash.section.md or # https://nixos.org/manual/nixpkgs/unstable/#sec-pkgs-invalidateFetcherByDrvHash invalidateFetcherByDrvHash = f: args: let drvPath = (f args).drvPath; # It's safe to discard the context, because we don't access the path. salt = builtins.unsafeDiscardStringContext (lib.substring 0 12 (baseNameOf drvPath)); in f (args // { name = "${args.name or "source"}-salted-${salt}"; }); </ins> lazydocker = callPackage ../tools/misc/lazydocker { }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; }


path = with pkgs; [ iptables ipset iproute systemd ]; postStart = '' <del> ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:ip family inet ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:ip family inet6 </del> ${pkgs.iptables}/bin/iptables  -I INPUT -m set --match-set sshguard4 src -j DROP ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP '';


{ stdenv, fetchurl, nss, python3 , blacklist ? [] <del> , includeEmail ? false </del> <ins> # Used for tests only , runCommand , cacert , openssl </ins> }: with stdenv.lib;


import ../make-test-python.nix ( <del> { pkgs, lib, ... }: { </del> <ins> { pkgs, lib, ... }: let quadletContainerFile = pkgs.writeText "quadlet.container" '' [Unit] Description=A test quadlet container [Container] Image=localhost/scratchimg:latest Exec=bash -c 'trap exit SIGTERM SIGINT; while true; do sleep 1; done' ContainerName=quadlet Volume=/nix/store:/nix/store Volume=/run/current-system/sw/bin:/bin [Install] WantedBy=default.target ''; in { </ins> name = "podman"; meta = { maintainers = lib.teams.podman.members;


wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" <del> , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: </del> <ins> , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }: </ins> let cfg = stdenv.lib.attrByPath [ browserName ] {} config; enableAdobeFlash = cfg.enableAdobeFlash or false;


{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp <del> , perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny }: </del> <ins> , perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny , fetchpatch }: </ins> buildPerlPackage rec { pname = "po4a";


libnotify libxfce4ui libxfce4util <ins> pcre </ins> xfconf ];


"colorlog" "emoji" "immutabledict" <ins> "sarge" </ins> "sentry-sdk" "watchdog" "wrapt"


<ins> { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "typst-fmt"; version = "unstable-2023-04-16"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = pname; rev = "9ed1fd1656f8e776b6c8d9d326c488f5ba1091eb"; hash = "sha256-yHR13n5yx5Yl2atteGQq+qqz21zsy37ZJfGllbvSZcQ="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "typst-0.2.0" = "sha256-+YHyxZTzMG9zpzLV9NgJsMtrXG+/ymPQo5b26HDYJaQ="; }; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock ''; checkFlags = [ # test_eof is ignored upstream "--skip=rules::tests_typst_format::test_eof" ]; meta = with lib; { description = "A formatter for the Typst language"; homepage = "https://github.com/astrale-sharp/typst-fmt"; license = licenses.mit; maintainers = with maintainers; [ geri1701 ]; }; } </ins>


<ins> { lib , buildPythonApplication , fetchFromGitHub , gitMinimal , arrow , click , sh , wheel }: buildPythonApplication rec { pname = "gitlint"; version = "0.15.1"; src = fetchFromGitHub { owner = "jorisroovers"; repo = "gitlint"; rev = "v${version}"; sha256 = "sha256-CqmE4V+svSuQAsoX0I3NpUqPU5CQf3fyCHJPrjUjHF4="; }; nativeBuildInputs = [ wheel ]; propagatedBuildInputs = [ arrow click sh ]; preCheck = '' export PATH="$out/bin:$PATH" ''; checkInputs = [ gitMinimal ]; meta = { description = "Linting for your git commit messages"; homepage = "http://jorisroovers.github.io/gitlint"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ethancedwards8 ]; }; } </ins>


nativeBuildInputs = [ autoconf cargo <del> dump_syms </del> llvmPackages.llvm # llvm-objdump makeWrapper nodejs


<del> { lib, stdenv, fetchFromGitHub, rustPlatform, Security, installShellFiles }: </del> <ins> { lib , stdenv , fetchFromGitHub , rustPlatform , Security , SystemConfiguration , installShellFiles }: </ins> rustPlatform.buildRustPackage rec { pname = "ferium";


./darwin-mutexes-4.8.patch ]; <ins> drvArgs.configureFlags = lib.optional (targetPlatform.useLLVM or false) "--with-mutex=POSIX/pthreads"; </ins> drvArgs.hardeningDisable = [ "format" ]; drvArgs.doCheck = false; })


openai = with python3Packages; toPythonApplication openai; <ins> openai-whisper = with python3.pkgs; toPythonApplication openai-whisper; </ins> opengrok = callPackage ../development/tools/misc/opengrok { }; openocd = callPackage ../development/embedded/openocd { };


if (ipc) { const generator = (stdout: any, res: any) => { <del> diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts index f298ec7..87a6bc4 100644 --- a/src/floating_exceptions/src/main.ts +++ b/src/floating_exceptions/src/main.ts @@ -1,4 +1,4 @@ -#!/usr/bin/gjs +#!/usr/bin/env gjs imports.gi.versions.Gtk = '3.0' @@ -329,4 +329,4 @@ function main() { Gtk.main() } -main()  No newline at end of file +main() </del> diff --git a/src/panel_settings.ts b/src/panel_settings.ts index 83ff56c..1bc1e98 100644 --- a/src/panel_settings.ts


, zlib , zstd <ins> # Dependencies of overridden Python dependencies, hopefully we can remove these soon. , rustPlatform </ins> # Optional Dependencies , curl ? null , expat ? null


|| cfg.openssh.authorizedKeys.keyFiles != []) ) cfg.users) ++ [ config.security.googleOsLogin.enable <del> ]); </del> <ins> ]; </ins> message = '' Neither the root account nor any wheel user has a password or SSH authorized key. <del> You must set one to prevent being locked out of your system.''; </del> <ins> You must set one to prevent being locked out of your system. If you really want to be locked out of your system, set users.allowNoPasswordLogin = true; However you are most probably better off by setting users.mutableUsers = true; and manually running passwd root to set the root password. ''; </ins> } ] ++ flatten (flip mapAttrsToList cfg.users (name: user: [


# Splicer will pull out correct variations libDeps = platform: [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp <del> ++ stdenv.lib.optional (platform.libc != "glibc") libiconv ++ stdenv.lib.optional enableDwarf elfutils; </del> <ins> ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; </ins> toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc


${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigJSON} -o $out ''; <del> availableComponents = pkgs.home-assistant.availableComponents; </del> <ins> availableComponents = cfg.package.availableComponents; </ins> # Given component "parentConfig.platform", returns whether config.parentConfig # is a list containing a set with set.platform == "platform".


configureFlags = [ "--with-gtk" "--with--board3d" ]; <ins> desktopItems = makeDesktopItem { desktopName = "GNU Backgammon"; name = pname; genericName = "Backgammon"; comment = meta.description; exec = pname; icon = pname; categories = [ "Game" "GTK" "StrategyGame" ]; }; </ins> meta = with lib; { description = "World class backgammon application"; homepage = "https://www.gnu.org/software/gnubg/";


fsck = handleTest ./fsck.nix {}; fwupd = handleTestOn ["x86_64-linux"] ./fwupd.nix {}; # libsmbios is unsupported on aarch64 gdk-pixbuf = handleTest ./gdk-pixbuf.nix {}; <ins> gotify-server = handleTest ./gotify-server.nix {}; </ins> gitea = handleTest ./gitea.nix {}; gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {};


<ins> { lib, stdenv, fetchFromGitHub, cmake, libminc }: stdenv.mkDerivation { pname = "ebtks"; version  = "unstable-2017-09-23"; src = fetchFromGitHub { owner  = "BIC-MNI"; repo   = "EBTKS"; rev    = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; }; # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? postPatch = '' substituteInPlace templates/EBTKS/SimpleArray.h  --replace "#define FINITE(x) finite(x)" "#define FINITE(x) isfinite(x)" '' # error: ISO C++17 does not allow 'register' storage class specifier + '' find . -type f -exec sed -i -e 's/register //g' {} + ''; nativeBuildInputs = [ cmake ]; buildInputs = [ libminc ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; meta = with lib; { homepage = "https://github.com/BIC-MNI/EBTKS"; description = "Library for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license   = licenses.free; }; } </ins>


openapi-core = callPackage ../development/python-modules/openapi-core { }; <ins> openusd = callPackage ../development/python-modules/openusd { alembic = pkgs.alembic; }; </ins> overly = callPackage ../development/python-modules/overly { }; overpy = callPackage ../development/python-modules/overpy { };


''; strictDeps = true; <del> propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; </del> <ins> propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or cc.langJava or false [ zlib ]; </ins> depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages; setupHooks = [


<del> { lib, stdenv, fetchurl, fetchpatch, libtool }: </del> <ins> { lib, stdenv, fetchurl, fetchpatch, libtool, libtommath }: </ins> stdenv.mkDerivation rec { pname = "libtomcrypt";


<del> { haskellLib }: </del> <ins> { haskellLib, fetchpatch, buildPackages }: </ins> <del> let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; </del> <ins> let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak markUnbroken overrideCabal; </ins> in self: super: { <del> ghcjs = doJailbreak (super.ghcjs.overrideScope (self: super: { </del> <ins> ghcjs = overrideCabal (drv: { # Jailbreak and patch can be dropped after https://github.com/ghcjs/ghcjs/pull/833 jailbreak = true; patches = drv.patches or [] ++ [ (fetchpatch { name = "ghcjs-aeson-2.0.patch"; url = "https://github.com/ghcjs/ghcjs/commit/9ef1f92d740e8503d15d91699f57db147f0474cc.patch"; sha256 = "0cgxcy6b5870bv4kj54n3bzcqinh4gl4w4r78dg43h2mblhkzbnj"; }) ]; }) (super.ghcjs.overrideScope (self: super: { </ins> optparse-applicative = self.optparse-applicative_0_15_1_0; <ins> webdriver = overrideCabal (drv: { patches = drv.patches or [] ++ [ # Patch for aeson 2.0 which adds a lower bound on it, so we don't apply it globally # Pending https://github.com/kallisti-dev/hs-webdriver/pull/183 (fetchpatch { name = "webdriver-aeson-2.0.patch"; url = "https://github.com/georgefst/hs-webdriver/commit/90ded63218da17fc0bd9f9b208b0b3f60b135757.patch"; sha256 = "1xvkk51r2v020xlmci5n1fd1na8raa332lrj7r9f0ijsyfvnqlv0"; excludes = [ "webdriver.cabal" ]; }) ]; # Fix line endings so patch applies prePatch = drv.prePatch or "" + '' find . -name '*.hs' | xargs "${buildPackages.dos2unix}/bin/dos2unix" ''; jailbreak = true; broken = false; }) super.webdriver; </ins> })); }


# package customization , channel ? "stable" , enableNaCl ? false <del> , enableHotwording ? false </del> , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true


<del> { lib, stdenv, fetchFromGitHub, makeWrapper, perl, procps, file, gnused, bash }: </del> <ins> { lib, stdenv, fetchFromGitHub, makeWrapper, perl, procps, file, gnused, bash, binutils }: </ins> stdenv.mkDerivation rec { pname = "lesspipe";


pnpmWorkspace prePnpmInstall ; <del> hash = "sha256-n7HTd/rKxJdQKnty5TeOcyvBU9j/EClQ9IHqbBaEwQE="; </del> <ins> hash = "sha256-q9a4nFPRhR6W/PT1l/Q1799iDmI+WTsudUP8rb8e97g="; </ins> }; nativeBuildInputs = [


stdenv.mkDerivation rec { pname = "opensc"; <del> version = "0.20.0"; </del> <ins> version = "0.21.0"; </ins> src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; <del> sha256 = "0mg8qmhww3li1isfgvn5hang1hq58zra057ilvgci88csfziv5lv"; </del> <ins> sha256 = "sha256-OjOfA1pIu8NeN+hPuow5UVMKsg0PrsLojw5h05/Qm+o="; </ins> }; <del> patches = [ (fetchpatch { # https://nvd.nist.gov/vuln/detail/CVE-2020-26570 name = "CVE-2020-26570.patch"; url = "https://github.com/OpenSC/OpenSC/commit/6903aebfddc466d966c7b865fae34572bf3ed23e.patch"; sha256 = "sha256-aB9iCVcdp9zFhZiSv5A399Ttj7NUHRVgXr0EfmMwKN4="; }) (fetchpatch { # https://nvd.nist.gov/vuln/detail/CVE-2020-26572 name = "CVE-2020-26572.patch"; url = "https://github.com/OpenSC/OpenSC/commit/9d294de90d1cc66956389856e60b6944b27b4817.patch"; sha256 = "sha256-gKJaR5K+NaXh4NeTkGpzHzHCdpt6n54Hnt1GAq0tA9o="; }) ]; </del> nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan


in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; <del> version = "1.112.0"; </del> <ins> version = "1.113.0"; </ins> format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; <del> hash = "sha256-8iXw9C91kPWDlzo/3AA/iVCQqq47eGSORMTzEQTTS+8="; </del> <ins> hash = "sha256-8Ts2QOSugPU8Do1Mpusez9tSqiaB+UzCWWY4XJk/KRM="; </ins> }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; <del> hash = "sha256-hx/IMOxk4vUHXMMIcnxnC3RJcIvJL+IooZnf+m+VKSs="; </del> <ins> hash = "sha256-Jlnv3GAobrXaO5fBq6oI9Gq8phz2/jFc+QIUYsUyeNo="; </ins> }; postPatch = ''


cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" "-DCMAKE_SKIP_BUILD_RPATH=OFF" <ins> "-DSNAPPY_BUILD_TESTS=OFF" "-DSNAPPY_BUILD_BENCHMARKS=OFF" </ins> ]; postInstall = '' substituteInPlace "$out"/lib/cmake/Snappy/SnappyTargets.cmake  --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"' <ins> mkdir -p $dev/lib/pkgconfig cat <<EOF > $dev/lib/pkgconfig/snappy.pc Name: snappy Description: Fast compressor/decompressor library. Version: ${version} Libs: -L$out/lib -lsnappy Cflags: -I$dev/include EOF </ins> ''; <del> checkTarget = "test"; </del> <ins> #checkTarget = "test"; </ins> <del> doCheck = true; </del> <ins> # requires gbenchmark and gtest but it also installs them out $dev doCheck = false; </ins> meta = with lib; { homepage = "https://google.github.io/snappy/";


, fetchurl , dpkg , autoPatchelfHook <ins> , copyDesktopItems </ins> , pango , gtk3 , alsa-lib


stdenv.mkDerivation rec { pname = "calibre"; <del> version = "6.11.0"; </del> <ins> version = "6.15.1"; </ins> src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; <del> hash = "sha256-ylOZ5ljA5uBb2bX/qFhsmPQW6dJVEH9jxQaR2u8C4Wc="; </del> <ins> hash = "sha256-t9fG1hBlQmDh0i5ezBoqk9C9oliNNF0peKDz1YH7RBo="; </ins> }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1


phases = [ "installPhase" "fixupPhase" ]; installPhase = '' <del> mkdir -p $out/bin cp ${src} $out/bin/kpcli chmod +x $out/bin/kpcli </del> <ins> mkdir -p $out/{bin,share} cp ${src} $out/share/kpcli.pl chmod +x $out/share/kpcli.pl </ins> <del> wrapProgram $out/bin/kpcli --set PERL5LIB  </del> <ins> makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB  </ins> "${with perlPackages; stdenv.lib.makePerlPath ([ CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard)}"


gspeech = callPackage ../applications/audio/gspeech { }; <ins> haruna = libsForQt5.callPackage ../applications/video/haruna { }; </ins> icesl = callPackage ../applications/misc/icesl { }; keepassx = callPackage ../applications/misc/keepassx { };


terminal-parrot = callPackage ../applications/misc/terminal-parrot { }; <ins> epsonscan2 = pkgs.libsForQt5.callPackage ../misc/drivers/epsonscan2 { }; </ins> epson-alc1100 = callPackage ../misc/drivers/epson-alc1100 { }; epson-escpr = callPackage ../misc/drivers/epson-escpr { };


wayshot = callPackage ../tools/misc/wayshot { }; <ins> waylevel = callPackage ../tools/misc/waylevel { }; </ins> wbg = callPackage ../applications/misc/wbg { }; hikari = callPackage ../applications/window-managers/hikari {


src = fetchurl { url = "https://www.expressvpn.works/clients/linux/expressvpn_${version}-1_amd64.deb"; <del> hash = "sha256-lyDjG346FrgT7SZbsWET+Hexl9Un6mzMukfO2PwlInA="; </del> <ins> hash = "sha256-cDZ9R+MA3FXEto518bH4/c1X4W9XxgTvXns7zisylew="; </ins> }; nativeBuildInputs = [ dpkg autoPatchelfHook ];


# Update submodules init_submodules(){ <del> # Add urls into .git/config file clean_git submodule init # list submodule directories and their hashes git submodule status | while read -r l; do local hash local dir local name local url # checkout each submodule hash=$(echo "$l" | awk '{print $1}' | tr -d '-') dir=$(echo "$l" | sed -n 's/^.[0-9a-f]+ (.*[^)]*)( (.*))?$/1/p') name=$( git config -f .gitmodules --get-regexp submodule..*.path | sed -n "s,^(.*).path $dir$,1,p") url=$(git config --get "${name}.url") clone "$dir" "$url" "$hash" "" done </del> <ins> clean_git submodule update --init --recursive -j $NIX_BUILD_CORES </ins> } clone(){


''; homepage = "https://nixos.org/"; license = licenses.lgpl2Plus; <del> maintainers = with maintainers; [ eelco lovesegfault artturin ]; </del> <ins> inherit maintainers; </ins> platforms = platforms.unix; outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; mainProgram = "nix";


description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; license = lib.licenses.bsd2; maintainers = with lib.maintainers;[ erictapen ]; <del> platforms = lib.platforms.linux; </del> <ins> platforms = lib.platforms.unix; </ins> }; }


owner = "draios"; repo = "sysdig"; rev = version; <del> hash = "sha256-y6WArSz57w8vb3A3nHT37G6D8++6en2jQfeIS4YCD9U="; </del> <ins> hash = "sha256-oufRTr5TFdpF50pmem2L3bBFIfwxCR8f1xi0A328iHo="; </ins> }; nativeBuildInputs = [


distro josepy parsedatetime <del> psutil </del> pyRFC3339 pyopenssl pytz <ins> requests </ins> six zope_component zope_interface ]; <del> buildInputs = [ dialog ] ++ (with python37Packages; [ mock gnureadline ]); </del> <ins> buildInputs = [ dialog mock gnureadline ]; </ins> <del> checkInputs = with python37Packages; [ pytest_xdist pytest dateutil ]; </del> <ins> checkInputs = [ pytest_xdist pytest dateutil ]; </ins> <del> postPatch = '' </del> <ins> preBuild = '' </ins> cd certbot <del> substituteInPlace certbot/_internal/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" </del> ''; postInstall = ''


, callPackage , cargo , cffi <ins> , cryptography-vectors ? (callPackage ./vectors.nix { }) </ins> , fetchPypi , hypothesis , iso8601


}); contentsList = if builtins.isList contents then contents else [ contents ]; <ins> bind-paths = builtins.toString (builtins.map (path: "--bind=${path}:${path}!") [ "/dev/" "/proc/" "/sys/" "${builtins.storeDir}/" "$out/layer.tar" ]); </ins> # We store the customisation layer as a tarball, to make sure that # things like permissions set on 'extraCommands' are not overridden


update-source-version perlPackages.SysVirt "$sysvirtVersion" --file="pkgs/top-level/perl-packages.nix" ''; <ins> passthru.tests.libvirtd = nixosTests.libvirtd; </ins> meta = { homepage = "https://libvirt.org/"; description = ''


stdenv.mkDerivation rec { pname = "gasket"; <del> version = "1.0-18-unstable-2023-09-05"; </del> <ins> version = "1.0-18-unstable-2024-04-25"; </ins> src = fetchFromGitHub { owner = "google"; repo = "gasket-driver"; <del> rev = "09385d485812088e04a98a6e1227bf92663e0b59"; sha256 = "fcnqCBh04e+w8g079JyuyY2RPu34M+/X+Q8ObE+42i4="; </del> <ins> rev = "5815ee3908a46a415aac616ac7b9aedcb98a504c"; sha256 = "O17+msok1fY5tdX1DvqYVw6plkUDF25i8sqwd6mxYf8="; </ins> }; makeFlags = kernel.makeFlags ++ [


<ins> <?xml version="1.0"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sdk="http://schemas.android.com/sdk/android/repository/11"> <xsl:output omit-xml-declaration="yes" indent="no" /> <xsl:template name="repository-url"> <xsl:variable name="raw-url" select="sdk:archives/sdk:archive/sdk:url"/> <xsl:choose> <xsl:when test="starts-with($raw-url, 'http')"> <xsl:value-of select="$raw-url"/> </xsl:when> <xsl:otherwise> <xsl:text>https://dl.google.com/android/repository/</xsl:text> <xsl:value-of select="$raw-url"/> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template match="/sdk:sdk-repository"> # This file is generated from generate-sources.sh. DO NOT EDIT. # Execute generate-sources.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let buildSource = args: stdenv.mkDerivation (args // { buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out cd $out unzip $src ''; }); in { <xsl:for-each select="sdk:source"><xsl:sort select="sdk:api-level" data-type="number"/> source_<xsl:value-of select="sdk:api-level" /> = buildSource { name = "android-source-<xsl:value-of select="sdk:api-level" />"; src = fetchurl { url = <xsl:call-template name="repository-url"/>; sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />"; }; meta = { description = "Source code for Android API <xsl:value-of select="sdk:api-level" />"; }; }; </xsl:for-each> } </xsl:template> </xsl:stylesheet> </ins>


github = "jali-clarke"; githubId = 17733984; }; <ins> james-atkins = { name = "James Atkins"; github = "james-atkins"; githubId = 9221409; }; </ins> jamiemagee = { email = "jamie.magee@gmail.com"; github = "JamieMagee";


<ins> { lib , stdenvNoCC , fetchFromGitHub }: stdenvNoCC.mkDerivation rec { pname = "mutt-wizard"; version = "3.2.1"; src = fetchFromGitHub { owner = "LukeSmithxyz"; repo = "mutt-wizard"; rev = "v${version}"; sha256 = "1m4s0vj57hh38rdgdc28p10vnsq80dh708imvdgxbj1i96nq41r8"; }; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "System for automatically configuring mutt and isync"; homepage = "https://github.com/LukeSmithxyz/mutt-wizard"; license = licenses.gpl3Plus; maintainers = with maintainers; [ shamilton ]; platforms = platforms.unix; }; } </ins>


<ins> { lib, buildGoModule, fetchpatch, fetchFromGitHub, }: buildGoModule rec { pname = "journalist"; version = "1.0.0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "mrusme"; repo = "journalist"; rev = "93781b1278e271995769f576b74fee794a19de14"; hash = "sha256-RRo9AEaHJPzN9+oW5kIBUNCPVdFkY2USOIZeUts8P/M="; }; overrideModAttrs = _oldAttrs: { patches = [ # fix go.sum by adding missing module # see https://github.com/mrusme/journalist/pull/18 (fetchpatch { name = "fix-go-sum.patch"; url = "https://github.com/mrusme/journalist/commit/546585222993586057a12ab4e9b38000c537f6cf.patch"; hash = "sha256-+QZhP/Har5UVi1pvqB6wWY0+xKqP0B8QukCcNlGkqxQ="; }) ]; }; vendorHash = "sha256-fEHVc9kRbeeXICWhJshLp9JK/ICBR/RB5SVChJzSXpI="; ldflags = [ "-s" "-w" "-X github.com/mrusme/journalist/journalistd.VERSION=${version}" ]; meta = { description = "RSS aggregator"; homepage = "https://github.com/mrusme/journalist"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "journalist"; }; } </ins>


<del> { stdenv, lib, fetchurl, appimageTools, makeWrapper, electron_22 }: </del> <ins> { stdenv, lib, fetchurl, appimageTools, makeWrapper, electron, nixosTests }: </ins> stdenv.mkDerivation rec { pname = "freetube";


<del> { stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }: </del> <ins> { stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }: </ins> import ./base.nix { version = "63.1";


, gtkspell3 , glib , libgee <ins> , pcre </ins> , sqlite , discount , wrapGAppsHook <del> , withPantheon ? false }: </del> <ins> , withPantheon ? false }: </ins> stdenv.mkDerivation rec { pname = "notes-up"; <del> version = "2.0.2"; </del> <ins> version = "unstable-2020-12-29"; </ins> src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Notes-up"; <del> rev = version; sha256 = "0bklgp8qrrj9y5m77xqbpy1ld2d9ya3rlxklgzx3alffq5312i4s"; </del> <ins> rev = "2ea9f35f588769758f5d2d4436d71c4059141a6f"; sha256 = "sha256-lKOM9+s34xYB9bF9pgip9DFu+6AaxSE4HjFVhoWtttk="; </ins> }; nativeBuildInputs = [ cmake ninja <del> # fails with newer vala: https://github.com/Philip-Scott/Notes-up/issues/349 vala_0_46 </del> <ins> vala </ins> pkg-config wrapGAppsHook ];


systemd.packages = [ cfg.package ]; <ins> # The upstream unit does not use StateDirectory, and will # fail if the directory it needs is not present. Should be # fixed when https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/5 # is merged. systemd.services.fprintd.serviceConfig.StateDirectory = "fprint"; </ins> }; }


<del> { stdenv, fetchFromGitHub, makeWrapper, chromaprint </del> <ins> { stdenv, mkDerivation, fetchFromGitHub, makeWrapper, chromaprint </ins> , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile


liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; <ins> liberation-circuit = callPackage ../games/liberation-circuit { }; </ins> lincity = callPackage ../games/lincity {}; lincity_ng = callPackage ../games/lincity/ng.nix {


(fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; }) (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; }) (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; }) <del> (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; }) </del> <ins> (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) </ins> (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })


let cfg = config.services.nbd; <del> configFormat = pkgs.formats.ini { }; </del> iniFields = with types; attrsOf (oneOf [ bool int float str ]); <del> serverConfig = configFormat.generate "nbd-server-config" ({ generic = (cfg.server.extraOptions // { user = "root"; group = "root"; port = cfg.server.listenPort; } // (optionalAttrs (cfg.server.listenAddress != null) { listenaddr = cfg.server.listenAddress; })); } // (mapAttrs </del> <ins> # The `[generic]` section must come before all the others in the # config file.  This means we can't just dump an attrset to INI # because that sorts the sections by name.  Instead, we serialize it # on its own first. genericSection = { generic = (cfg.server.extraOptions // { user = "root"; group = "root"; port = cfg.server.listenPort; } // (optionalAttrs (cfg.server.listenAddress != null) { listenaddr = cfg.server.listenAddress; })); }; exportSections = mapAttrs </ins> (_: { path, allowAddresses, extraOptions }: extraOptions // { exportname = path; } // (optionalAttrs (allowAddresses != null) { authfile = pkgs.writeText "authfile" (concatStringsSep "n" allowAddresses); })) <del> cfg.server.exports) ); </del> <ins> cfg.server.exports; serverConfig = pkgs.writeText "nbd-server-config" '' ${lib.generators.toINI {} genericSection} ${lib.generators.toINI {} exportSections} ''; </ins> splitLists = partition (path: hasPrefix "/dev/" path)


(b == armv7l && isCompatible a armv7a) (b == armv7l && isCompatible a armv7r) (b == armv7l && isCompatible a armv7m) <del> (b == armv7a && isCompatible a armv8a) (b == armv7r && isCompatible a armv8a) (b == armv7m && isCompatible a armv8a) (b == armv7a && isCompatible a armv8r) (b == armv7r && isCompatible a armv8r) (b == armv7m && isCompatible a armv8r) (b == armv7a && isCompatible a armv8m) (b == armv7r && isCompatible a armv8m) (b == armv7m && isCompatible a armv8m) </del> # ARMv8 <del> (b == armv8r && isCompatible a armv8a) (b == armv8m && isCompatible a armv8a) # XXX: not always true! Some arm64 cpus don’t support arm32 mode. </del> (b == aarch64 && a == armv8a) (b == armv8a && isCompatible a aarch64) <ins> (b == armv8r && isCompatible a armv8a) (b == armv8m && isCompatible a armv8a) </ins> # PowerPC (b == powerpc && isCompatible a powerpc64)


{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; <del> version = "1.2.189.1"; </del> <ins> version = "1.2.198.0"; </ins> nativeBuildInputs = [ cmake ];


<del> { lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils , substituteAll, nixosTests, fetchpatch, writeText }: let version = "01497"; freenet_ext = fetchurl { url = "https://github.com/freenet/fred/releases/download/build01495/freenet-ext.jar"; sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158="; }; seednodes = fetchurl { url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; }; patches = [ # gradle 7 support # https://github.com/freenet/fred/pull/827 (fetchpatch { url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch"; sha256 = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY="; }) ]; in stdenv.mkDerivation rec { pname = "freenet"; inherit version patches; src = fetchFromGitHub { owner = "freenet"; repo = "fred"; rev = "refs/tags/build${version}"; hash = "sha256-pywNPekofF/QotNVF28McojqK7c1Zzucds5rWV0R7BQ="; }; postPatch = '' rm gradle/verification-{keyring.keys,metadata.xml} ''; nativeBuildInputs = [ gradle jdk ]; wrapper = substituteAll { src = ./freenetWrapper; inherit bash coreutils jre seednodes; }; mitmCache = gradle.fetchDeps { inherit pname; data = ./deps.json; }; # using reproducible archives breaks the build gradleInitScript = writeText "empty-init-script.gradle" ""; gradleFlags = [ "-Dorg.gradle.java.home=${jdk}" ]; gradleBuildTask = "jar"; installPhase = '' runHook preInstall install -Dm444 build/libs/freenet.jar $out/share/freenet/freenet.jar ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar mkdir -p $out/bin install -Dm555 ${wrapper} $out/bin/freenet substituteInPlace $out/bin/freenet  --subst-var-by outFreenet $out runHook postInstall ''; passthru.tests = { inherit (nixosTests) freenet; }; meta = { description = "Decentralised and censorship-resistant network"; homepage = "https://freenetproject.org/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ nagy ]; platforms = with lib.platforms; linux; changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md"; }; } </del>


stdenv.mkDerivation rec { pname = "ibus"; <del> version = "1.5.24"; </del> <ins> version = "1.5.26"; </ins> src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; <del> sha256 = "sha256-1qx06MlEUjSS067FdQG1Bdi4ZAh3hPcNjUX5PIiC3Sk="; </del> <ins> sha256 = "7Vuj4Gyd+dLUoCkR4SPkfGPwVQPRo2pHk0pRAsmtjxc="; </ins> }; patches = [ <ins> # Fixes systemd unit installation path https://github.com/ibus/ibus/pull/2388 (fetchpatch { url = "https://github.com/ibus/ibus/commit/33b4b3932bfea476a841f8df99e20049b83f4b0e.patch"; sha256 = "kh8SBR+cqsov/B0A2YXLJVq1F171qoSRUKbBPHjPRHI="; }) </ins> (substituteAll { src = ./fix-paths.patch; pythonInterpreter = python3Runtime.interpreter;


<del> { buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: # v5.0 (eol) { aspnetcore_5_0 = buildAspNetCore { inherit icu; version = "5.0.17"; srcs = { x86_64-linux = { url     = "https://download.visualstudio.microsoft.com/download/pr/a2b96f83-e22a-4fa6-a10e-709b3effac9a/0d6ade6c0ceebc8ef7dbf2b1a6d86f17/aspnetcore-runtime-5.0.17-linux-x64.tar.gz"; sha512  = "d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d"; }; aarch64-linux = { url     = "https://download.visualstudio.microsoft.com/download/pr/6eb8aee2-cbea-4c4f-9bb9-ea6229ec229b/d6c438e5071c359ad995134f0a33e731/aspnetcore-runtime-5.0.17-linux-arm64.tar.gz"; sha512  = "ac1a9d89f1b730dfdca9c2e48373ef21f8f9316014eefbe6b11516f8195d3b3efc4e482883774b74ea2ff1cb77174a2cb471bd1157ab5b7d71621e3026c38e9b"; }; x86_64-darwin = { url     = "https://download.visualstudio.microsoft.com/download/pr/25e4817f-6fd0-46dc-be0d-d819445bac5c/a8fa228c872df683741c8a79745f8fb3/aspnetcore-runtime-5.0.17-osx-x64.tar.gz"; sha512  = "bb0c43c723090fa2d8a0255e6fc8c004ebe7baf2d5d56e22ad2e6336a67fe415333d451e459c8857c0ccb5819d998232c9617bf45f222559d4b8891b0af41f20"; }; }; }; runtime_5_0 = buildNetRuntime { inherit icu; version = "5.0.17"; srcs = { x86_64-linux = { url     = "https://download.visualstudio.microsoft.com/download/pr/e77438f6-865f-45e0-9a52-3e4b04aa609f/024a880ed4bfbfd3b9f222fec0b6aaff/dotnet-runtime-5.0.17-linux-x64.tar.gz"; sha512  = "a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261"; }; aarch64-linux = { url     = "https://download.visualstudio.microsoft.com/download/pr/6690730f-cf10-40f1-9d4d-4c0d002f22d0/e117133858f190c169873200b8d7b9d7/dotnet-runtime-5.0.17-linux-arm64.tar.gz"; sha512  = "99cb11871924d3abedcc9c8079c54bc0c550203c7cbe4e349ed70d4355f40e4620b68d90b797e6461d898c06bed6953580e2cd4ad01483e5de107ca5a3409610"; }; x86_64-darwin = { url     = "https://download.visualstudio.microsoft.com/download/pr/39326cf0-dc7f-42a3-9f7a-fe30c75c7a7f/33cbce552148e13d47120fe4502f5b5e/dotnet-runtime-5.0.17-osx-x64.tar.gz"; sha512  = "31add512418640f98bc9511509db2049a2674c7725169d26be89218a02ac7972e03e5d6be5a3d45a0dfa764e6eade503a8f4957b7b198ec6ad412e423d95f1b9"; }; }; }; sdk_5_0 = buildNetSdk { inherit icu; version = "5.0.408"; srcs = { x86_64-linux = { url     = "https://download.visualstudio.microsoft.com/download/pr/904da7d0-ff02-49db-bd6b-5ea615cbdfc5/966690e36643662dcc65e3ca2423041e/dotnet-sdk-5.0.408-linux-x64.tar.gz"; sha512  = "abbf22c420df2d8398d1616efa3d31e1b8f96130697746c45ad68668676d12e65ec3b4dd75f28a5dc7607da58b6e369693c0e658def15ce2431303c28e99db55"; }; aarch64-linux = { url     = "https://download.visualstudio.microsoft.com/download/pr/d4b71fac-a2fd-4516-ac58-100fb09d796a/e79d6c2a8040b59bf49c0d167ae70a7b/dotnet-sdk-5.0.408-linux-arm64.tar.gz"; sha512  = "50f23d7aca91051d8b7c37f1a76b1eb51e6fe73e017d98558d757a6b9699e4237d401ce81515c1601b8c21eb62fee4e0b4f0bbed8967eefa3ceba75fc242f01b"; }; x86_64-darwin = { url     = "https://download.visualstudio.microsoft.com/download/pr/4aeecc7c-7ffa-418f-9362-cf5eb3ed0396/055d5e6064a9fdecd7d906f5f262373d/dotnet-sdk-5.0.408-osx-x64.tar.gz"; sha512  = "3fdd4deac2809b00c0f669d5488000ac1b9a47dee6ab7b31167d7cec4759a10ee347fd4f52090a40684e5ecc1e1f57eb99c558e561edfd1436a2f77fc1c1a0b2"; }; }; packages = { fetchNuGet }: [ (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mfawgcc23r44a1r7ynafxwga6jzn0f0z5ys03qssrvlcdsb376x"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "183xgqzlwd5lhacxdwcjl8vcq7r7xypv0hddps9k32mmmwf83d8h"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "0i5pp1smjkyhiyhcbkyc3cxz0sx9204bfml8wsdy7bxznbh2gkmw"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "1fmd9jq2nzy63hjh4sa6zl636wpgwr3r8ahzln5w14m9k87lfdbk"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "066fwdlssbv556zd9w1x87x1j8j4kafj9rxyy0692bssdb4gcyc8"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1qvvqf8mmzzc7a7fhx324dprnbxhknr3qxspb2xhsn3yyg44xn2d"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "1gzf2gv4z9bn1cr1kpqpf1jf7m0p0wd1pxq5ndylq6bw353yglk1"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1lml70ln9bfjrfjf3jbxfzd5kgd4cp4h7v052md5ja364g7lalsy"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0j90fri15c05lw96xybgvqkysfm7g8grhkrg25g75vhi6ni2ricj"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "1bdb887xvgxsmphys83zp9skn848p1r8viclc8p29w1rby4wi19i"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.17"; sha256 = "0y90p765sj54clf2bwrka99w73g8b9550b4qvyilqggzydl1c1hk"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.17"; sha256 = "07v7vyqm556xr1ypkazfp6gh6drgf20zkwbhkpja8bwdcr6lphbb"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "5.0.17"; sha256 = "0sbzlzhazh31s63hw9553hk9j56fxssncmfgidiyh0dg73aacrsp"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "5.0.17"; sha256 = "1qxphvlr882rvmj71y2imnf6r3hh4ln2n138qjyv1z129dp2g4y1"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.17"; sha256 = "02g5w41ivrw3n6cy3l3ixhcl8bw1fsv4bzs2m34k9h5fqmliaf3c"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "5.0.17"; sha256 = "07rfkxpf6rp8x0lybl8hx40mk09w5gjrr9djkjcp8lvjgzidnxq9"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "5.0.17"; sha256 = "1i7wka56n3akr96jrkj37jx98bwxfzhpx5705930v50izligd08x"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.17"; sha256 = "15f1kqlpp1d05dhg3dfya32vvzbpj6c7gxds947f10jb0hqlnhdj"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "5.0.17"; sha256 = "1j1334zxv815ksdnllnbwwsbwnimjlpknjmqy1riy2zpswxlfkz6"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mmgd6nacx4fzf0w02ch0qxa43vrv6wfspykxsy2bkpvrnvr8xr9"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "16whaq82pj6fqa0vam3a0va9ly843aa1z12hza040vn6252kk9fq"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "1zavnwqvn2f7lhb880wgv02anrvqsh6l34w72knwd31irggph08l"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "173r2srcbad2prrw3l914scmdks3mghxgszvlwypdjnv0f2szgvv"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "0jgcfs3jc98jfyaaamssznckbpnaygplk8pjsp6dswpansz5bnnq"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1ph5kx18syinp8bpzw80bgq3njl65gwzws727xcmxnysgm7snmjp"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "0m4jhn70parwnl18fql0sk9sf14y8cf08xw6x2cm5bfhnc9jvjny"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1af20jkv73767b4fy18s2dvjncaca1ny0csyr7wbhvqfs59y3n1x"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0llhsi03wyp2yjqy0snywqgwjgam91i4nsf5lc9kaxkk5h6vj1a0"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "0xvprbjwd3fymddvavsy7wk5q2hp45hdi10qz4rdbmns23vqkzmf"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0vhvxpba3i9ffp4gp56l3rnlhq9yg07n3dv5qi89zb90vgyqjh1p"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "074c9byxwmndfdavxn103220f5gklaaxc9wj7zpb5v3yr3ads30f"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "03jkkpsy2zjfp722fa2fcnpk2g6jzy0bn9vip5c39k78y5pz29x6"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1ih6c104skp9q17i2dnsma45l6nv5c62vv2i1988dcjw2v0sl98m"; }) (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0gwsxd1l0n32xnw0lyjixj2634iyygdb8pd7chydsr3qk8njxnpk"; }) (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0x5dhn1jkwqnd0cki1vi97rhyfac6w79hvh9dxvnkn2k04sbps8q"; }) (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ipx3qn78z6gi415c4fa9wgy8k75aifbml6ys1c9ghl6yxbv0fd0"; }) (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1wgbx648yndl0hh8vx6sflfwjyr5pfhi7vj7v19l6vxnrr1096w7"; }) (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17jc8jc2dk1g8996jpq3k0g6c5inijivxkbz0grxrgr5jbyiv19y"; }) (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0ydn40qn6cs6f20byvmc9j008s6csxjbh6jh5w4q995vipcmcpcj"; }) (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bw08wlf96vcyix850y8jips1glrz2cbj647af4d7gggw8p3wwzw"; }) (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0xsqyw848scwcz09pgc719776q712xabx4xv47srzij34p2pq7np"; }) (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "00b0vipypjai4l8icr74kjhglxx2xlc3nw3vyiwisg52l9zyby66"; }) (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1cdgd4p5zr1mzz9hlb5mj946zfa1vn9wya5y2bhqn9y4ak831wzp"; }) (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "17v8m4fxm4q40z49a2h4lw9dawg6pwfv4s2dskzc23ggcjgr6dp1"; }) (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1fbqi92prqmvxx0rx7vhl10l665jmmhb2ng5jndimggydb0ckpqh"; }) (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1rijxkzzk65xs9z2ygs13h0rhw1cli5vwshmvs1gfnwhhn8ic0gx"; }) (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "02mxvpm2zs5jvawigvxlnrw6si4zwj6qlcas99m9xdmm8yqq22cm"; }) (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0c1lcl3yy88vdfw12c7h0ww596qfjd5f8l2mn7mlqs6i3f864bkg"; }) (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w0wg9ah7vngvpyds67l6qhizpkdf2r6m6cqyyvv3s5dw5l8rxin"; }) (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17yy7605vkfz0f4h58005gdfg6fnjxlcnq0vg0hrxsgbdqmd7p1i"; }) (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0av25fgkdl7zvn44wp8gqx2xl2mdlv1f9cgxzp7xk5yq8f7ynxpq"; }) (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1smhmdfq0jlv1gq18hdaj0y9yzkvqzmki19c0b3j5b76yxxxpbwz"; }) (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0n0cdb9zpdb4h4v6r265pqmqg8c94ydywvna6jp1c6qhqlr0qk39"; }) (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1s2n2sx29c8rx549zizj8yrddjl98a7vwvxw56y0jvvbwphr9gz4"; }) (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "19m66yvv0hnmyrmx2l4drbls0fcib75fxq2csdx6p8gd54bnrsh3"; }) (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bcnlsxcrvhybcjbb9879njx0c4z76y7djx4643g1rpjnkcrj9ww"; }) (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1bf95h2f0dmpmv7z7961zia5vaqvmjq3wkf6iil9jxv4z674624w"; }) (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "02q593q09mwwh23m86048vc7b7an7pqch5nd86d4hxzkamnpnpsa"; }) (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "16vzxywfj88gjcwfnmcb6b50ld8dp46i4pqiwwcy7yz15xgdhbm2"; }) (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ix5lg2j5ihdfp9j3jdxc042g4syjzc4bafid465j52h6znsm6wm"; }) (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w30v8r26cg427n5glm9nz6r10baalkqq5icqqxkq71hmh8fsjqb"; }) (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "168iq4hdp6bhdpgqa1mir1bygmh2ggwkys1r82d6kpl2lzbxjy28"; }) (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "18jpw2wbrb1b941729lb7hiq4yfq2z53pcxwz4mpgawnr58y0562"; }) (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0ig464fcsj2jr0p02f6slifwf1m0408g95npm0vccf5ww1nbgkpi"; }) (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0qj5avmjrvabxzimprg4m54k3p6zkwrhbpv0byc8c9gbi47s323j"; }) (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "05ghz164lpff7n8mrxs7jm2h8n3clsg4w953zrag3k5ry9j36m9c"; }) (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0azgs542mbg69jlc81529i2z5m728w8sc2i9m5dx15hvxqqqcjiz"; }) (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "12n1kcgcv5z8hkvjqfk0n705kcipbai4sgcwiimi52xpaf34xw8m"; }) (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0b1s2m0a7xcdzfz22x6k7v5hkca90azdjk6pw7wwdnvszwq26nxp"; }) (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1sjpq07swgj0isdgyh6p2yb254qb9781lv44xfhj6nz7mx2yhdh1"; }) (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1gnzrqdp26d7pwwz29gm4qb09n2zsb767qkhbwkifcsyxlwi6m0f"; }) (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "089jww13gaf7x7yd9d3qkyx9iq8abcp3r147hd9nblh561c9bzbg"; }) (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1nycl1rayk0fhaakpj6q9rfp2lv3dpl7pziavmd9kcfryz952ff5"; }) ]; }; } </del>


openssl sqlite xz <del> ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals atLeast24 [ </del> gtest libarchive lowdown <del> ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [ </del> <ins> ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals (stdenv.isx86_64) [ </ins> libcpuid ] ++ lib.optionals atLeast214 [ rapidcheck


in rec { <del> electron = electron_18; </del> <ins> electron = electron_19; </ins> electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450";


with lib; <ins> let cfg = config.services.gnome.tracker; in </ins> { meta = {


# Create a derivation from the official wordpress.org packages. # This takes the type, the pname and the data generated from the go tool. mkOfficialWordpressDerivation = self.callPackage ({ mkWordpressDerivation, fetchWordpress }: <del> { type, pname, data }: </del> <ins> { type, pname, data, license }: </ins> mkWordpressDerivation { <del> inherit type pname; </del> <ins> inherit type pname license; </ins> version = data.version; src = fetchWordpress type data;


sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; <ins> patches = [ # Needed to build against qt 6.5.3, until pyside 6.5.3 is released (fetchpatch2 { url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/sources/pyside6?id=63ef7628091c8827e3d0d688220d3ae165587eb2"; hash = "sha256-TN1xdBkrzZhNontShMC1SKyJK6a8fOk/Di3zX3kv5+I="; stripLen = 2; }) ]; </ins> # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. postPatch = lib.optionalString stdenv.isLinux ''


<ins> { lib, buildLua, fetchFromGitHub, }: buildLua (finalAttrs: { pname = "mpv-osc-tethys"; version = "0-unstable-2024-08-19"; scriptPath = "osc_tethys.lua"; extraScripts = [ "mpv_thumbnail_script_server.lua" ]; src = fetchFromGitHub { owner = "Zren"; repo = "mpv-osc-tethys"; rev = "c4167f88a0e9944738419e90a71f1f80fba39ccb"; hash = "sha256-eAY+ZUuOxPJiNCuL7lqMBU4iURCMz12LQdfaYj4WFQc="; }; meta = { description = "OSC UI replacement for MPV with icons from the bomi video player"; homepage = "https://github.com/Zren/mpv-osc-tethys"; license = lib.licenses.unfree; # no license specified maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; }; }) </ins>


vcdimager flac ]}" <ins> # FIXME: this should really be done with patchelf --add-rpath, but it breaks the binary somehow "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ cdparanoia libdvdcss ]}" </ins> ]; meta.mainProgram = "k3b"; }


buildInputs = [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender <del> libXxf86misc intltool xorg.appres makeWrapper gle </del> <ins> libXxf86misc intltool xorg.appres makeWrapper gle gdk-pixbuf gdk-pixbuf-xlib </ins> ]; preConfigure =


python3Packages.buildPythonApplication rec { pname = "waydroid"; <del> version = "1.3.0"; </del> <ins> version = "1.3.3"; </ins> format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; <del> sha256 = "sha256-6osDGYyFuyPDeK1QFowh414j3laD8i4bqPgCeJmsszE="; </del> <ins> sha256 = "sha256-av1kcOSViUV2jsFiTE21N6sAJIL6K+zKkpPHjx6iYVk="; </ins> }; propagatedBuildInputs = with python3Packages; [


packages = [ (with dotnetCorePackages; combinePackages [ sdk_3_1 <del> sdk_5_0 </del> <ins> sdk_6_0 </ins> ]) ]; } ``` <del> This will produce a dotnet installation that has the dotnet 3.1, 3.0, and 2.1 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: </del> <ins> This will produce a dotnet installation that has the dotnet 3.1 6.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: </ins> ```ShellSession $ dotnet --info


mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; <ins> freac = callPackage ../applications/audio/freac { }; </ins> freedroid = callPackage ../games/freedroid { }; freedroidrpg = callPackage ../games/freedroidrpg { };


buildInputs = [ openssl zlib ] ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; <ins> patches = [ # not able to use fetchpatch here: infinite recursion (fetchurl { name = "CVE-2019-17498.patch"; url = "https://github.com/libssh2/libssh2/pull/402.patch"; sha256 = "1n9s2mcz5dkw0xpm3c5x4hzj8bar4i6z0pr1rmqjplhfg888vdvc"; }) ]; </ins> meta = with stdenv.lib; { description = "A client-side C library implementing the SSH2 protocol"; homepage = https://www.libssh2.org;


${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }} ${linkPlugins { name = "cmake"; plugins = cmake; }} ${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }} <del> ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} </del> <ins> ${linkNdkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} </ins> ${lib.optionalString includeSystemImages '' mkdir -p system-images


patchInterpreter "$1" wrapProgram "$out/libexec/genymotion/$1"  --set "LD_LIBRARY_PATH" "${libPath}"  <del> --unset "QML2_IMPORT_PATH" </del> <ins> --unset "QML2_IMPORT_PATH"  --unset "QT_PLUGIN_PATH" </ins> } patchTool() {


inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max importJSON importTOML warn warnIf throwIfNot checkListOfEnum <del> info showWarnings nixpkgsVersion version </del> <ins> info showWarnings nixpkgsVersion version isInOldestRelease </ins> mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; inherit (self.fixedPoints) fix fix' converge extends composeExtensions


, autoreconfHook, pkg-config , glibcLocales, kmod, coreutils, perl , dmidecode, hwdata, sqlite, libtraceevent <ins> , fetchpatch </ins> , nixosTests }:


--- a/configure +++ b/configure <del> @@ -5894,9 +5894,9 @@ else </del> <ins> @@ -5451,9 +5451,9 @@ else </ins> die "ERROR: cannot find soundtouch 1.8.0 or later." fi


nativeBuildInputs = [ cmake ]; patches = stdenv.lib.optional staticOnly (fetchpatch { <del> # from https://github.com/google/brotli/pull/655 url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg"; </del> <ins> # context from https://github.com/google/brotli/pull/655 # updated patch from https://github.com/google/brotli/pull/655 url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch"; sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; </ins> }); cmakeFlags = []


./linux-4.11.patch # source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl ./linux-4.12.patch <ins> ./linux-4.15.patch </ins> ./null-pointer-fix.patch ./gcc.patch ];


<ins> { libX11 , libxcb , libXcomposite , libXdamage , libXext , libXfixes , libXrandr , stdenv , lib , alsa-lib , at-spi2-atk , atkmm , cairo , cups , dbus , expat , glib , gtk3 , libdrm , libglvnd , libxkbcommon , mesa , nspr , nss , pango , systemd , fetchurl , autoPatchelfHook , dpkg }: let glLibs = [ libglvnd mesa ]; libs = [ alsa-lib atkmm at-spi2-atk cairo cups dbus expat glib gtk3 libdrm libX11 libxcb libXcomposite libXdamage libXext libXfixes libxkbcommon libXrandr nspr nss pango ]; buildInputs = glLibs ++ libs; runpathPackages = glLibs ++ [ stdenv.cc.cc stdenv.cc.libc ]; version = "1.0.15"; in stdenv.mkDerivation { pname = "tana"; inherit version buildInputs; src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; hash = "sha256-94AyAwNFN5FCol97US1Pv8IN1+WMRA3St9kL2w+9FJU="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; appendRunpaths = map (pkg: "${lib.getLib pkg}/lib") runpathPackages ++ [ "${placeholder "out"}/lib/tana" ]; # Needed for Zygote runtimeDependencies = [ systemd ]; installPhase = '' runHook preInstall mkdir -p $out cp -r usr/* $out runHook postInstall ''; postFixup = '' substituteInPlace $out/share/applications/tana.desktop  --replace "Exec=tana" "Exec=$out/bin/tana"  --replace "Name=tana" "Name=Tana" ''; meta = with lib; { description = "Tana is an intelligent all-in-one workspace"; longDescription = '' At its core, Tana is an outline editor which can be extended to cover multiple use-cases and different workflows. For individuals, it supports GTD, P.A.R.A., Zettelkasten note-taking out of the box. Teams can leverage the powerful project management views, like Kanban. To complete all, a powerful AI system is integrated to help with most of the tasks. ''; homepage = "https://tana.inc"; license = licenses.unfree; maintainers = [ maintainers.massimogengarelli ]; platforms = platforms.linux; mainProgram = "tana"; }; } </ins>


{ pkgs, ... }: { virtualisation.docker.enable = true; <ins> virtualisation.docker.autoPrune.enable = true; </ins> virtualisation.docker.package = pkgs.docker; users.users = {


<del> From 6cb9aa7c69c20a677ca9fb1bc5fa1580e3236fbd Mon Sep 17 00:00:00 2001 From: Tom Hall <tahall256@protonmail.ch> Date: Sat, 14 Mar 2020 11:55:45 +0000 Subject: [PATCH] Disable optimised aarch64 dgemm_beta pending fix Identified as source of https://github.com/xianyi/OpenBLAS/issues/2496, but not yet fixed. --- kernel/arm64/KERNEL.ARMV8 | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/arm64/KERNEL.ARMV8 b/kernel/arm64/KERNEL.ARMV8 index fe32d313..33d12f94 100644 --- a/kernel/arm64/KERNEL.ARMV8 +++ b/kernel/arm64/KERNEL.ARMV8 @@ -102,7 +102,6 @@ CDOTKERNEL     = zdot.S ZDOTKERNEL     = zdot.S DSDOTKERNEL    = dot.S -DGEMM_BETA     = dgemm_beta.S SGEMM_BETA     = sgemm_beta.S SGEMMKERNEL    =  sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N).S -- 2.24.1 </del>


sha256 = "0wdgyfb1clrn3maq84vi4vkwjydy72p5hzk6kb9nb3a19bbxk5d8"; }; <del> buildInputs = [ libpng ]; </del> <ins> buildInputs = [ makeWrapper libpng perl ]; propagatedBuildInputs = [ perlPackages.LWP ]; patchPhase = '' patchShebangs extresso/extresso patchShebangs extresso/extresso.in patchShebangs extresso/genresscript patchShebangs extresso/genresscript.in ''; preFixup = '' wrapProgram $out/bin/extresso --prefix PERL5LIB : $PERL5LIB wrapProgram $out/bin/genresscript --prefix PERL5LIB : $PERL5LIB ''; </ins> meta = { homepage = http://www.nongnu.org/icoutils/; <del> description = "Set of  programs to deal with Microsoft Windows(R) icon and cursor files"; </del> <ins> description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; </ins> license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; };


## Building the Manual {#sec-writing-docs-building-the-manual} <del> The DocBook sources of the [](#book-nixos-manual) are in the </del> <ins> The sources of the [](#book-nixos-manual) are in the </ins> [`nixos/doc/manual`](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual) subdirectory of the Nixpkgs repository.


buildGoModule rec { pname = "oh-my-posh"; <del> version = "18.26.1"; </del> <ins> version = "19.6.0"; </ins> src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; <del> hash = "sha256-8MK8YzBplbP1de8QKJJBLgbMd1K+H2sVutwKSskU82Q="; </del> <ins> hash = "sha256-/VkI/ACUTGRcFpJhUV068m8HdM44NiandS+2a+Ms6vs="; </ins> }; <del> vendorHash = "sha256-ivd30IEoF9WuGDzufIOXJ8LUqHp3zPaiPgplj9jqzqw="; </del> <ins> vendorHash = "sha256-8ZupQe4b3uCX79Q0oYqggMWZE9CfX5OSFdLIrxT8CHY="; </ins> sourceRoot = "${src.name}/src";