{ LOCATE_PATH = cfg.output; }; <del> warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root" </del> <ins> warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)" </ins> ++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component" ++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts";


"--enable-gc" ] ++ lib.optionals (!enableDocumentation) [ "--disable-doc-gen" <del> ] ++ lib.optionals (!atLeast24) [ # option was removed in 2.4 "--disable-init-state" </del> ] ++ lib.optionals atLeast214 [ "CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include" ] ++ lib.optionals stdenv.isLinux [


description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl3Plus; platforms = platforms.linux; <del> knownVulnerabilities = [ "CVE-2021-3514" # https://nvd.nist.gov/vuln/detail/CVE-2021-3514 ]; </del> }; }


<del> { lib, stdenvNoCC, pijul }: </del> <ins> { lib, stdenvNoCC, pijul, cacert }: </ins> lib.makeOverridable ( { url


fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; }]; }; <ins> lilacious = { email = "yuchenhe126@gmail.com"; github = "Lilacious"; githubId = 101508537; name = "Yuchen He"; }; </ins> lillycham = { email = "lillycat332@gmail.com"; github = "lillycat332";


stdenv.mkDerivation rec { name = "tsocks-${version}"; version = "1.8beta5"; src = fetchurl { url = "mirror://sourceforge/tsocks/${name}.tar.gz"; sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; }; <ins> patches = [ ./poll.patch ]; </ins> preConfigure = '' <del> export configureFlags="$configureFlags --libdir=$out/lib" </del> <ins> sed -i -e "s,/usr,"$(echo $out|sed -e "s,/,/,g")",g" tsocks substituteInPlace tsocks --replace /usr $out export configureFlags="$configureFlags --libdir=$out/lib" </ins> ''; meta = with stdenv.lib; {


<del> { mkDerivation , lib , fetchFromGitHub , qtbase , cmake , qttools , qtsvg , nix-update-script , fetchpatch , kguiaddons }: mkDerivation rec { pname = "flameshot"; version = "12.1.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; sha256 = "sha256-omyMN8d+g1uYsEw41KmpJCwOmVWLokEfbW19vIvG79w="; }; patches = [ # https://github.com/flameshot-org/flameshot/pull/3166 (fetchpatch { name = "10-fix-wayland.patch"; url = "https://github.com/flameshot-org/flameshot/commit/5fea9144501f7024344d6f29c480b000b2dcd5a6.patch"; sha256 = "sha256-SnjVbFMDKD070vR4vGYrwLw6scZAFaQA4b+MbI+0W9E="; }) ]; passthru = { updateScript = nix-update-script { }; }; cmakeFlags = [ (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true) ]; nativeBuildInputs = [ cmake qttools qtsvg ]; buildInputs = [ qtbase kguiaddons ]; meta = with lib; { description = "Powerful yet simple to use screenshot software"; homepage = "https://github.com/flameshot-org/flameshot"; mainProgram = "flameshot"; maintainers = with maintainers; [ scode oxalica ]; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; } </del>


<ins> let tests = { wayland = { pkgs, ... }: { imports = [ ./common/wayland-cage.nix ]; services.cage.program = "${pkgs.freetube}/bin/freetube"; virtualisation.memorySize = 2047; environment.variables.NIXOS_OZONE_WL = "1"; environment.variables.DISPLAY = "do not use"; }; xorg = { pkgs, ... }: { imports = [ ./common/user-account.nix ./common/x11.nix ]; virtualisation.memorySize = 2047; services.xserver.enable = true; services.xserver.displayManager.sessionCommands = '' ${pkgs.freetube}/bin/freetube ''; test-support.displayManager.auto.user = "alice"; }; }; mkTest = name: machine: import ./make-test-python.nix ({ pkgs, ... }: { inherit name; nodes = { "${name}" = machine; }; meta.maintainers = with pkgs.lib.maintainers; [ kirillrdy ]; enableOCR = true; testScript = '' start_all() machine.wait_for_unit('graphical.target') machine.wait_for_text('Your Subscription list is currently empty') machine.send_key("ctrl-r") machine.wait_for_text('Your Subscription list is currently empty') machine.screenshot("main.png") machine.send_key("ctrl-comma") machine.wait_for_text('General Settings', timeout=30) machine.screenshot("preferences.png") ''; }); in builtins.mapAttrs (k: v: mkTest k v { }) tests </ins>


meta = with lib; { description = "Markdown notes editor and manager designed for elementary OS" <del> + lib.optionalString withPantheon " - built with Contractor support"; </del> <ins> + lib.optionalString withPantheon " - built with Contractor support"; </ins> homepage = "https://github.com/Philip-Scott/Notes-up"; <del> license = licenses.gpl2; </del> <ins> license = licenses.gpl2Only; </ins> maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; };


{ stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 <del> , libxml2, libglade, intltool, xorg, makeWrapper, gle </del> <ins> , libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib </ins> , forceInstallAllHacks ? false }:


s = # Generated upstream information rec { baseName="firejail"; <del> version="0.9.44.10"; </del> <ins> version="0.9.48"; </ins> name="${baseName}-${version}"; <del> hash="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj"; url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.10.tar.xz"; sha256="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj"; </del> <ins> hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3"; url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz"; sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3"; </ins> }; buildInputs = [ which


<ins> diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs index c1c89cf..d7bd822 100644 --- a/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs @@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet}; use std::env; use std::fmt::Display; use std::fs; +use std::iter; use std::path::{Path, PathBuf}; use which::which; use xdg::BaseDirectories; @@ -216,34 +217,24 @@ impl Config { } } None => { -                // Search in the system library locations and in `~/.local/share/yabridge` if no -                // path was set explicitely. We'll also search through `/usr/local/lib` just in case -                // but since we advocate against installing yabridge there we won't list this path -                // in the error message when `libyabridge-vst2.so` can't be found. -                let system_path = Path::new("/usr/lib"); +                // Search through NIX_PROFILES & data home directory if no path was set explicitly. +                let nix_profiles = env::var("NIX_PROFILES"); let user_path = xdg_dirs.get_data_home(); -                let lib_directories = [ -                    system_path, -                    // Used on Debian based distros -                    Path::new("/usr/lib/x86_64-linux-gnu"), -                    // Used on Fedora -                    Path::new("/usr/lib64"), -                    Path::new("/usr/local/lib"), -                    Path::new("/usr/local/lib/x86_64-linux-gnu"), -                    Path::new("/usr/local/lib64"), -                    &user_path, -                ]; +                let lib_directories = nix_profiles.iter() +                    .flat_map(|profiles| profiles.split(' ') +                              .map(|profile| Path::new(profile).join("lib"))) +                    .chain(iter::once(user_path.clone())); + let mut candidates = lib_directories -                    .iter() .map(|directory| directory.join(LIBYABRIDGE_VST2_NAME)); + match candidates.find(|directory| directory.exists()) { Some(candidate) => candidate, _ => { return Err(anyhow!( -                            "Could not find '{}' in either '{}' or '{}'. You can override the  -                            default search path using 'yabridgectl set --path=<path>'.", +                            "Could not find '{}' through 'NIX_PROFILES' or '{}'. You can override the  +                             default search path using 'yabridgectl set --path=<path>'.", LIBYABRIDGE_VST2_NAME, -                            system_path.display(), user_path.display() )); } diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs index 0db1bd4..221cdd0 100644 --- a/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs @@ -102,7 +102,7 @@ fn main() -> Result<()> { .about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") .long_about( "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this  -                             is not set, then yabridgectl will look in both '/usr/lib' and  +                             is not set, then yabridgectl will look through 'NIX_PROFILES' and  '~/.local/share/yabridge' by default.", ) .validator(validate_path) </ins>


{ stdenv, buildPythonPackage, fetchFromGitHub <del> , requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore , pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt </del> <ins> , betamax , betamax-serializers , betamax-matchers , mock , six , pytestrunner , prawcore , pytest , requests-toolbelt , update_checker , websocket_client </ins> }: buildPythonPackage rec { pname = "praw"; <del> version = "6.0.0"; </del> <ins> version = "6.3.1"; </ins> src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; <del> sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i"; </del> <ins> sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky"; </ins> }; <del> postPatch = '' # drop upper bound of prawcore requirement sed -ri "s/'(prawcore >=.+), <.+'/'1'/" setup.py ''; </del> <ins> nativeBuildInputs = [ pytestrunner ]; </ins> propagatedBuildInputs = [ <del> requests decorator flake8 </del> mock <del> six update_checker pytestrunner </del> prawcore <ins> update_checker websocket_client </ins> ]; checkInputs = [ <del> pytest_3 </del> betamax betamax-serializers betamax-matchers <del> requests_toolbelt </del> <ins> mock pytest requests-toolbelt six </ins> ]; meta = with stdenv.lib; { description = "Python Reddit API wrapper"; <del> homepage = https://praw.readthedocs.org/; license = licenses.gpl3; </del> <ins> homepage = "https://praw.readthedocs.org/"; license = licenses.bsd2; </ins> platforms = platforms.all; maintainers = with maintainers; [ ]; };


inherit (callPackage ../applications/virtualization/docker {}) docker_24 docker_25 docker_26 docker_27; <del> docker = docker_24; </del> <ins> docker = docker_27; </ins> docker-client = docker.override { clientOnly = true; }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };


for usage. ''); <del> scriptDir = mkOption { type = types.path; default = "/var/lib/networkd-dispatcher"; description = mdDoc '' This directory is used for keeping various scripts read and run by networkd-dispatcher. See [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) for directory structure and script usage. </del> <ins> rules = mkOption { default = {}; example = lib.literalExpression '' { "restart-tor" = { onState = ["routable" "off"]; script = ''' #!''${pkgs.runtimeShell} if [[ $IFACE == "wlan0" && $AdministrativeState == "configured" ]]; then echo "Restarting Tor ..." systemctl restart tor fi exit 0 '''; }; }; ''; description = lib.mdDoc '' Declarative configuration of networkd-dispatcher rules. See [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) for an introduction and example scripts. </ins> ''; <ins> type = types.attrsOf (types.submodule { options = { onState = mkOption { type = types.listOf (types.enum [ "routable" "dormant" "no-carrier" "off" "carrier" "degraded" "configuring" "configured" ]); default = null; description = lib.mdDoc '' List of names of the systemd-networkd operational states which should trigger the script. See <https://www.freedesktop.org/software/systemd/man/networkctl.html> for a description of the specific state type. ''; }; script = mkOption { type = types.lines; description = lib.mdDoc '' Shell commands executed on specified operational states. ''; }; }; }); </ins> }; };


<ins> { lib , stdenv , fetchFromGitHub , pkg-config , gtk3 , curl , libxml2 }: stdenv.mkDerivation rec { pname = "smooth"; version = "0.9.6"; src = fetchFromGitHub { owner = "enzo1982"; repo = "smooth"; rev = "v${version}"; sha256 = "05j5gk6kz2089x8bcq2l0kjspfiiymxn69jcxl4dh9lw96blbadr"; }; nativeBuildInputs = [ pkg-config ]; makeFlags = [ "prefix=$(out)" ]; buildInputs = [ gtk3 curl libxml2 ]; meta = with lib; { description = "The smooth Class Library"; license = licenses.artistic2; homepage = "http://www.smooth-project.org/"; maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; }; } </ins>


# this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg <del> '' + lib.optionalString (lib.versionOlder version "1.78.0") '' </del> <ins> '' + lib.optionalString (lib.versionOlder version "1.78.0" && stdenv.isLinux) '' </ins> # see https://github.com/gentoo/gentoo/commit/4da5959 chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper '';


<del> { lib , stdenv , buildPythonPackage , fetchPypi , pythonOlder # Build dependencies , glibcLocales # Test dependencies , nose , pygments # Runtime dependencies , jedi , decorator , pickleshare , traitlets , prompt_toolkit , pexpect , appnope , backcall , fetchpatch }: buildPythonPackage rec { pname = "ipython"; version = "7.9.0"; src = fetchPypi { inherit pname version; sha256 = "103jkw18z7fnwdal1mdbijjxi1fndzn31g887lmj7ddpf2r07lyz"; }; prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace setup.py --replace "'gnureadline'" " " ''; buildInputs = [ glibcLocales ]; checkInputs = [ nose pygments ]; propagatedBuildInputs = [ jedi decorator pickleshare traitlets prompt_toolkit pygments pexpect backcall ] ++ lib.optionals stdenv.isDarwin [appnope]; LC_ALL="en_US.UTF-8"; doCheck = false; # Circular dependency with ipykernel checkPhase = '' nosetests ''; pythonImportsCheck = [ "IPython" ]; meta = with lib; { description = "IPython: Productive Interactive Computing"; homepage = "http://ipython.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor ]; }; } </del>


serviceConfig = { User         = pgmanage; Group        = pgmanage; <del> ExecStart    = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + </del> <ins> ExecStart    = "${cfg.package}/sbin/pgmanage -c ${confFile}" + </ins> optionalString cfg.localOnly " --local-only=true"; }; };


version = src.version; src = pkgs.invoiceplane; <del> patchPhase = '' </del> <ins> postPhase = '' </ins> # Patch index.php file to load additional config file substituteInPlace index.php  <del> --replace "require('vendor/autoload.php');" "require('vendor/autoload.php'); $dotenv = new DotenvDotenv(__DIR__, 'extraConfig.php'); $dotenv->load();"; </del> <ins> --replace "require('vendor/autoload.php');" "require('vendor/autoload.php'); $dotenv = DotenvDotenv::createImmutable(__DIR__, 'extraConfig.php'); $dotenv->load();"; </ins> ''; installPhase = ''


(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) <del> (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) </del> <ins> (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.0"; sha256 = "1x183b0gz1vcfiljggrn30g6jvixlwks0lfpl4hl9nnjbpg0fdvq"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.0"; sha256 = "03nnqmz0w42wiqgf5y0wkn6w0n3m93q8ihqmrrz7rdh85v06f999"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.0"; sha256 = "1b24pf0ippwbdjc3k1wzr13lr1zqlcbymi2hpvfmxmk4i6vzn4mv"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.0"; sha256 = "1qdcqcnczaqfd0cii3bcymbc7rvkypm25idxgx7hfc81h9ysh79h"; }) </ins> (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; sha256 = "1drbgqdcvbpisjn8mqfgba1pwb6yri80qc4mfvyczqwrcsj5k2ja"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) <ins> (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.0"; sha256 = "1b52s7z01wkg83dpkpyg7girjflm84zr65pacsfwm2hvhb9xa2w6"; }) (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.0.0"; sha256 = "0pvr4yga99fqr4z8s8js9hxki5c92qy7scvpqwslws5mri625m38"; }) (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.0"; sha256 = "0zzrwp5in56fhc2cdmn4i44v2jf13frbjwpb9v8s7fkr9ky4wh5w"; }) (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.0"; sha256 = "1qbf922frk4c0cam57d98f3d5q5226pgrgjm7pfcamwy5whvx5sh"; }) (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.0"; sha256 = "0my1fihyh86rckfzbrvl5kdcq34yp0ywl8azs2gx3c27sg4pjrp2"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) </ins> (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) <del> (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; }) </del> <ins> (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.0"; sha256 = "0n7iw8ppjyps4sg0rfh5pags4wq58yg1g9vnxfwa73z38jws2c10"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.0"; sha256 = "0n9aab1cxf8w23dl4yw7rqpi47v7gd02csq3zisc5whsrb9i0xbq"; }) </ins> (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })


meta = with lib; { homepage = "https://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; <del> changelog = "https://github.com/nicolargo/glances/releases/tag/v${version}"; </del> <ins> changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst"; </ins> license = licenses.lgpl3Only; maintainers = with maintainers; [ jonringer primeos koral ]; };


let self = stdenv.mkDerivation rec { pname = "mysql"; <del> version = "5.7.27"; </del> <ins> version = "5.7.37"; </ins> src = fetchurl { url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; <del> sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; </del> <ins> sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0="; </ins> }; preConfigure = lib.optionalString stdenv.isDarwin ''


ossfs = callPackage ../development/python-modules/ossfs { }; <ins> osxphotos = callPackage ../development/python-modules/osxphotos { }; </ins> ots-python = callPackage ../development/python-modules/ots-python { }; outcome = callPackage ../development/python-modules/outcome { };


# - Package: ../modules/${pname}/releases/package.nix # FIXME: do this at the module system level <del> propagatePlatforms = lib.mapAttrs (platform: subset: map (r: r // { inherit platform; }) subset); </del> <ins> propagatePlatforms = lib.mapAttrs (redistArch: packages: map (p: { inherit redistArch; } // p) packages); </ins> # All releases across all platforms # See ../modules/${pname}/releases/releases.nix


systemd.packages = [ pkgs.tracker-miners ]; <ins> services.gnome.tracker.subcommandPackages = [ pkgs.tracker-miners ]; </ins> }; }


githubId = 543055; name = "Shadaj Laddad"; }; <ins> shaddydc = { email = "nixpkgs@shaddy.dev"; github = "ShaddyDC"; githubId = 18403034; name = "Shaddy"; }; </ins> shadowrz = { email = "shadowrz+nixpkgs@disroot.org"; matrix = "@ShadowRZ:matrixim.cc";


cd ../.. <ins> # Symlink required sources mkdir -p sources cd sources ${if includeSources then stdenv.lib.concatMapStrings (platformVersion: if (builtins.hasAttr ("source_"+platformVersion) sources) then let source = builtins.getAttr ("source_"+platformVersion) sources; in "ln -s ${source}/* android-${platformVersion}n" else "") platformVersions else ""} cd .. </ins> # Symlink required platforms mkdir -p platforms


# package customization , enableNaCl ? false <del> , enableHotwording ? false </del> , enableWideVine ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null


# Fetchers {#chap-pkgs-fetchers} <del> When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way. </del> <ins> When using Nix, you will frequently need to download source code and other files from the internet. For this purpose, Nix provides the [_fixed output derivation_](https://nixos.org/manual/nix/stable/#fixed-output-drvs) feature and Nixpkgs provides various functions that implement the actual fetching from various protocols and services. </ins> <del> The two fetcher primitives are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below. </del> <ins> ## Caveats Because fixed output derivations are _identified_ by their hash, a common mistake is to update a fetcher's URL or a version parameter, without updating the hash. **This will cause the old contents to be used.** So remember to always invalidate the hash argument. For those who develop and maintain fetcheres, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#sec-pkgs-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful. ## `fetchurl` and `fetchzip` {#fetchurl} Two basic fetchers are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below. </ins> ```nix { stdenv, fetchurl }:


dontAutoPatchelf = true; postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' ( <del> cd $out/clion-${version} </del> <ins> cd $out/clion </ins> # bundled cmake does not find libc rm -rf bin/cmake/linux ln -s ${cmake} bin/cmake/linux


postInstall = '' wrapProgram $out/bin/git-flow  <del> --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt  --suffix PATH : ${pkgs.git}/bin  --prefix PATH : ${pkgs.coreutils}/bin </del> <ins> --set FLAGS_GETOPT_CMD ${getopt}/bin/getopt  --suffix PATH : ${git}/bin  --prefix PATH : ${coreutils}/bin </ins> ''; meta = with lib; {


{ fetchurl }: rec { <del> version = "1.6.23"; </del> <ins> version = "1.6.24"; </ins> src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; <del> sha256 = "1gy7a0jhagxif8av540xb1aa6cl7id08nsgjbgady54bnmb0viga"; </del> <ins> sha256 = "1dxzc1y5mmx3ap0m94sx80vfs3qxkckid3wc1xm0wr5i6fh7zn1h"; </ins> }; srcs = [ src (fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; <del> sha256 = "18my71s9mddy0k835852ksjzkza7xs73kyxavmdqflh5vkywb6y0"; </del> <ins> sha256 = "0aq9ipqpr2ksmk30h2dc4mlrkrqs16xnmspwfb6xj3rgr1pwszlx"; </ins> })]; }


crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { }; <del> cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { }; </del> dae = callPackage ../tools/networking/dae { }; darling = callPackage ../applications/emulators/darling { };


local dst="$1" local wrapper="$2" export prog="$3" <del> export use_response_file_by_default=${if isClang then "1" else "0"} </del> <ins> export use_response_file_by_default=${if isClang && !isCcache then "1" else "0"} </ins> substituteAll "$wrapper" "$out/bin/$dst" chmod +x "$out/bin/$dst" }


let pname = "ollama"; # don't forget to invalidate all hashes each update <del> version = "0.1.48"; </del> <ins> version = "0.2.1"; </ins> src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; <del> hash = "sha256-rMStHUFC88TXIH/1c9bCOU0csnEZHOhWKBlLKarmCmE="; </del> <ins> hash = "sha256-hzB/sS+6vsMuJfCPZucTQerytnq+TBzTtiWwwd+H+bE="; </ins> fetchSubmodules = true; };


, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 <ins> , ocl-icd </ins> }: stdenv.mkDerivation rec {


then tag else lib.head (lib.strings.splitString "-" (baseNameOf result.outPath)); <del> # Docker can't be made to run darwin binaries meta.badPlatforms = lib.platforms.darwin; </del> } '' ${lib.optionalString (tag == null) '' outName="$(basename "$out")"


executableName = "codium"; longName = "VSCodium"; <del> shortName = "Codium"; </del> <ins> shortName = "vscodium"; </ins> src = fetchurl { url = "https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-${plat}-${version}.${archive_fmt}";


Similarly [virtualisation.vmVariantWithBootloader](#opt-virtualisation.vmVariantWithBootLoader) was added. - The configuration portion of the `nix-daemon` module has been reworked and exposed as [nix.settings](options.html#opt-nix-settings): <del> * Legacy options have been mapped to the corresponding options under under [nix.settings](options.html#opt-nix.settings) but may be deprecated in the future. </del> <ins> * Legacy options have been mapped to the corresponding options under under [nix.settings](options.html#opt-nix.settings) and will be deprecated when NixOS 21.11 reaches end of life. </ins> * [nix.buildMachines.publicHostKey](options.html#opt-nix.buildMachines.publicHostKey) has been added. - The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added.


<ins> { yarn2nix-moretea , fetchFromGitHub }: yarn2nix-moretea.mkYarnPackage rec { name = "gotify-ui"; packageJSON = ./package.json; yarnNix = ./yarndeps.nix; version = "2.0.8"; src_all = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; sha256 = "17bxs3wcazrxippf3i9w7d2mq8lf0v5m4bn3nl2zb8v8dl3lsc9a"; }; src = "${src_all}/ui"; buildPhase = '' yarn build ''; } </ins>


"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" <del> ] ++ stdenv.lib.optional enableDwarf [ "--enable-dwarf-unwind" </del> ]; # Make sure we never relax`$PATH` and hooks support for compatability.


<ins> { stdenv, fetchurl, appimageTools, undmg, libsecret }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; pname = "keeweb"; version = "1.15.7"; name = "${pname}-${version}"; suffix = { x86_64-linux = "linux.AppImage"; x86_64-darwin = "mac.dmg"; }.${system} or throwSystem; src = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; sha256 = { x86_64-linux = "0cy0avl0m07xs523xm0rzsmifl28sv4rjb2jj3x492qmr2v64ckk"; x86_64-darwin = "0r8c3zi0ibj0bb0gfc1axfn0y4qpjqfr0xpcxf810d65kaz6wic4"; }.${system} or throwSystem; }; appimageContents = appimageTools.extract { inherit name src; }; meta = with stdenv.lib; { description = "Free cross-platform password manager compatible with KeePass"; homepage = "https://keeweb.info/"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; linux = appimageTools.wrapType2 rec { inherit name src meta; extraPkgs = pkgs: with pkgs; [ libsecret ]; extraInstallCommands = '' mv $out/bin/{${name},${pname}} install -Dm644 ${appimageContents}/keeweb.desktop -t $out/share/applications install -Dm644 ${appimageContents}/keeweb.png -t $out/share/icons/hicolor/256x256/apps install -Dm644 ${appimageContents}/usr/share/mime/keeweb.xml -t $out/share/mime substituteInPlace $out/share/applications/keeweb.desktop  --replace 'Exec=AppRun' 'Exec=${pname}' ''; }; darwin = stdenv.mkDerivation { inherit pname version src meta; nativeBuildInputs = [ undmg ]; sourceRoot = "KeeWeb.app"; installPhase = '' mkdir -p $out/Applications/KeeWeb.app cp -R . $out/Applications/KeeWeb.app ''; }; in if stdenv.isDarwin then darwin else linux </ins>


, vala , wrapGAppsHook3 , glib <ins> , glib-networking </ins> , gtk3 , json-glib , libappindicator


<ins> prefix=@out@ exec_prefix=${prefix} libdir=@out@/lib includedir=@out@/include Name: tbox Description: A glib-like multi-platform c library Version: @version@ Libs: -L${libdir} -ltbox Cflags: -I${includedir} </ins>


python3Packages.buildPythonApplication rec { pname = "pass-import"; <del> version = "3.2"; </del> <ins> version = "3.5"; </ins> <del> src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-import"; rev = "v${version}"; sha256 = "0hrpg7yiv50xmbajfy0zdilsyhbj5iv0qnlrgkfv99q1dvd5qy56"; </del> <ins> src = fetchurl { url = "https://github.com/roddhjav/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; hash = "sha256-+wrff3OxPkAGu1Mn4Kl0KN4FmvIAb+MnaERcD5ScDNc="; </ins> }; <del> patches = [ (fetchpatch { name = "support-for-pykeepass-4.0.3.patch"; url = "https://github.com/roddhjav/pass-import/commit/f1b167578916d971ee4f99be99ba0e86ef49015e.patch"; hash = "sha256-u6bJbV3/QTfRaPauKSyCWNodpy6CKsreMXUZWKRbee0="; }) ]; </del> propagatedBuildInputs = with python3Packages; [ cryptography defusedxml <ins> jsonpath-ng </ins> pyaml pykeepass python-magic # similar API to "file-magic", but already in nixpkgs. <ins> requests </ins> secretstorage <ins> zxcvbn </ins> ]; nativeCheckInputs = [


py.test ''; <ins> patches = [ # Add Python 3.7 support. Remove with the next release (fetchpatch { url = "https://github.com/google/python-fire/commit/668007ae41391f5964870b4597e41493a936a11e.patch"; sha256 = "0rf7yzv9qx66zfmdggfz478z37fi4rwx4hlh3dk1065sx5rfksi0"; }) ]; </ins> meta = with stdenv.lib; { description = "A library for automatically generating command line interfaces";


githubId = 20391; name = "Nahum Shalman"; }; <ins> nsnelson = { email = "noah.snelson@protonmail.com"; github = "peeley"; githubId = 30942198; name = "Noah Snelson"; }; </ins> nthorne = { email = "notrupertthorne@gmail.com"; github = "nthorne";


configureFlags = attrs.configureFlags ++ ["--set=build.docs=false"]; }); <ins> wasm-bindgen-84 = wasm-bindgen-cli.override { version = "0.2.84"; hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; }; </ins> commonDerivationAttrs = rec { pname = "lldap"; version = "0.4.3";


fi done # Copy all layers from input images to output image directory <del> cp -R --no-clobber inputs/*/* image/ </del> <ins> cp -R --update=none inputs/*/* image/ </ins> # Merge repositories objects and manifests jq -s add "''${repos[@]}" > repositories jq -s add "''${manifests[@]}" > manifest.json


preInstall = '' substituteInPlace platforminputcontext/cmake_install.cmake  <del> --replace ${qtbase.out} $out </del> <ins> --replace ${qtbase.bin} $out </ins> substituteInPlace quickphrase-editor/cmake_install.cmake  --replace ${fcitx} $out ''; <del> meta = with stdenv.lib; { </del> <ins> meta = with lib; { </ins> homepage    = https://gitlab.com/fcitx/fcitx-qt5; description = "Qt5 IM Module for Fcitx"; license     = licenses.gpl2;


libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp <del> ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv ++ stdenv.lib.optional enableDwarf elfutils; </del> <ins> ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; </ins> toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc


-e 's^addCVars^addCVars${_infixSalt}^g'  -e 's^[ -z "$crossConfig" ]^[[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" ]]^g' <del> '' + stdenv.lib.optionalString (textFile == ./setup-hook.sh) '' cat << 'EOF' >> $out for CMD in ar as nm objcopy ranlib strip strings size ld windres do # which is not part of stdenv, but compgen will do for now if PATH=$_PATH type -p ${prefix}$CMD > /dev/null then export ''$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=${prefix}''${CMD}; fi done EOF sed -i $out -e 's_envHooks_crossEnvHooks_g' '' + '' </del> # NIX_ things which we don't both use and define, we revert them #asymmetric=$( #  for pre in "" "$"


rustPlatform.buildRustPackage rec { pname = "edgedb"; <del> version = "3.3.0"; </del> <ins> version = "3.4.0"; </ins> src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; rev =  "v${version}"; <del> sha256 = "sha256-6uhwuAGZ/XU+eENNo0H7hOdrDDx0fWvPVZAEOm5mdcY="; </del> <ins> sha256 = "sha256-w6YpjSmh517yat45l4gGdV6qWD4O3aCx/6LL5wea+RA="; </ins> fetchSubmodules = true; };


homepage = "https://github.com/luabind/luabind"; description = "A library that helps you create bindings between C++ and Lua"; license = lib.licenses.mit; <del> platforms = lib.platforms.linux; </del> <ins> platforms = lib.platforms.unix; </ins> }; }


requests_oauth2 = buildPythonPackage rec { name = "requests-oauth2-0.1.1"; <ins> # python3 does not support relative imports disabled = isPy3k; </ins> src = pkgs.fetchurl { url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz; sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg"; }; <del> propagatedBuildInputs = with self; [ requests_oauthlib ]; </del> <ins> propagatedBuildInputs = with self; [ requests2 ]; # no tests in tarball doCheck = false; </ins> meta = { description = "Python's Requests OAuth2 (Open Authentication) plugin";


hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA="; }; <del> version = "0.38.0"; </del> <ins> # "main.c" from master after (https://github.com/falcosecurity/libs/pull/1884) # Remove when an upstream release includes the driver update driverKernel610MainC = fetchurl { url = "https://raw.githubusercontent.com/falcosecurity/libs/fa26daf65bb4117ecfe099fcad48ea75fe86d8bb/driver/main.c"; hash = "sha256-VI/tOSXs5OcEDehSqICF3apmSnwe4QCmbkHz+DGH4uM="; }; version = "0.38.1"; </ins> in stdenv.mkDerivation { pname = "sysdig";


# Unpack the wheel file. wheel unpack --dest unpacked ./*.whl <del> # Tensorflow has a hard dependency on gast==0.2.2, but we relax it to # gast==0.3.2. substituteInPlace ./unpacked/tensorflow*/tensorflow_core/tools/pip_package/setup.py --replace "gast == 0.2.2" "gast == 0.3.2" substituteInPlace ./unpacked/tensorflow*/tensorflow_*.dist-info/METADATA --replace "gast (==0.2.2)" "gast (==0.3.2)" </del> <ins> # Tensorflow wheels tightly constrain the versions of gast, tensorflow-estimator and scipy. # This code relaxes these requirements: substituteInPlace ./unpacked/tensorflow*/tensorflow_core/tools/pip_package/setup.py  --replace "tensorflow_estimator >= 2.1.0rc0, < 2.2.0" "tensorflow_estimator"  --replace "tensorboard >= 2.1.0, < 2.2.0" "tensorboard"  --replace "gast == 0.2.2" "gast"   --replace "scipy == 1.2.2" "scipy" substituteInPlace ./unpacked/tensorflow*/tensorflow*.dist-info/METADATA   --replace "gast (==0.2.2)" "gast"  --replace "tensorflow-estimator (<2.2.0,>=2.1.0rc0)" "tensorflow_estimator"  --replace "tensorboard (<2.2.0,>=2.1.0)" "tensorboard"  --replace "scipy (==1.4.1)" "scipy" </ins> # Pack the wheel file back up. wheel pack ./unpacked/tensorflow*


# THIS IS A GENERATED FILE.  DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; <del> version = "21.1.12"; </del> <ins> version = "21.1.13"; </ins> builder = ./builder.sh; src = fetchurl { <del> url = "mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz"; sha256 = "03x954bygi6sdynk5yy3yvsfhg6i9gjhisn3x9jxvk5mw4mnw08y"; </del> <ins> url = "mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz"; sha256 = "033lvjihidc68v08izrr63va8jhkfmzcjg0d6rm26wizjkah4nml"; </ins> }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true;


./services/networking/strongswan.nix ./services/networking/stubby.nix ./services/networking/stunnel.nix <ins> ./services/networking/sunshine.nix </ins> ./services/networking/supplicant.nix ./services/networking/supybot.nix ./services/networking/syncplay.nix


postFixup = '' wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version}  <del> --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" </del> <ins> --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"  --prefix PATH ":" ${ lib.makeBinPath [ graphviz ] } </ins> ''; passthru = rec {


owner = "evanw"; repo = "esbuild"; rev = "v${version}"; <del> hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; </del> <ins> hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; </ins> }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; <del> wasm-bindgen-cli-2-92 = wasm-bindgen-cli.override { version = "0.2.92"; hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; }; </del> in stdenv.mkDerivation (finalAttrs: { pname = "surrealist"; <del> version = "1.11.7"; </del> <ins> version = "2.0.6"; </ins> src = fetchFromGitHub { <del> owner = "StarlaneStudios"; repo = "Surrealist"; rev = "v${finalAttrs.version}"; hash = "sha256-1jTvbr7jFo2GOB79ClwtBVVnNQlSEkqY2eqbiZxWG74="; </del> <ins> owner = "surrealdb"; repo = "surrealist"; rev = "surrealist-v${finalAttrs.version}"; hash = "sha256-5OiVqn+ujssxXZXC6pnGiG1Nw8cAhoDU5IIl9skywBw="; </ins> }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; <del> embed = stdenv.mkDerivation { inherit (finalAttrs) src version; pname = "${finalAttrs.pname}-embed"; sourceRoot = "${finalAttrs.src.name}/src-embed"; auditable = false; dontInstall = true; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/src-embed"; hash = "sha256-0cAhaeoP8EPcE1230CyznQZZIKRs0lrI8XOXECgb8pg="; }; nativeBuildInputs = [ cargo rustc llvmPackages_15.clangNoLibc llvmPackages_15.lld rustPlatform.cargoSetupHook wasm-bindgen-cli-2-92 ]; postBuild = '' CC=clang cargo build  --target wasm32-unknown-unknown  --release wasm-bindgen  target/wasm32-unknown-unknown/release/surrealist_embed.wasm  --out-dir $out  --out-name surrealist-embed  --target web ''; }; </del> ui = stdenvNoCC.mkDerivation { inherit (finalAttrs) src version; pname = "${finalAttrs.pname}-ui"; <del> dontFixup = true; </del> pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; <del> hash = "sha256-3x/GKgVX0mnxTZmINe/qTtr/vI0h5IqPYt9N0l/VGzg="; </del> <ins> hash = "sha256-apvU7nanzueaF7PEQL7EKjVT5z1M6I7PZpEIJxfKuCQ="; </ins> }; <del> ESBUILD_BINARY_PATH = "${lib.getExe esbuild-18-20}"; </del> <ins> ESBUILD_BINARY_PATH = "${lib.getExe esbuild-20-2}"; </ins> nativeBuildInputs = [ nodejs pnpm.configHook ]; <del> postPatch = '' ln -s ${finalAttrs.embed} src/generated ''; </del> <ins> buildPhase = '' runHook preBuild </ins> <del> postBuild = '' </del> pnpm build <ins> runHook postBuild </ins> ''; <del> postInstall = '' </del> <ins> installPhase = '' runHook preInstall </ins> cp -r dist $out <ins> runHook postInstall </ins> ''; }; <del> cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "tauri-plugin-localhost-0.1.0" = "sha256-7PJgz6t/jPEwX/2xaOe0SYawfPSZw/F1QtOrc6iPiP0="; }; </del> <ins> cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src sourceRoot version; name = "${finalAttrs.pname}-${finalAttrs.version}"; hash = "sha256-uE4r0smgSbl4l77/MsHtn1Ar5fqspsYcLC/u8TUrcu8="; </ins> }; nativeBuildInputs = [


]; preCheck = '' <del> # Scale default timeouts by a factor of 4 to avoid flaky builds # https://github.com/microsoft/debugpy/pull/1286 if merged would # allow us to disable the timeouts altogether export DEBUGPY_PROCESS_SPAWN_TIMEOUT=60 export DEBUGPY_PROCESS_EXIT_TIMEOUT=20 </del> <ins> export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0 export DEBUGPY_PROCESS_EXIT_TIMEOUT=0 </ins> '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*';


(lib.mesonEnable "installed_tests" true) (lib.mesonOption "installed_test_prefix" (placeholder "installedTests")) (lib.mesonOption "libjack-path" "${placeholder "jack"}/lib") <del> (lib.mesonEnable "libcamera" libcameraSupport) </del> <ins> (lib.mesonEnable "libcamera" true) </ins> (lib.mesonEnable "libffado" ffadoSupport) (lib.mesonEnable "roc" rocSupport) <del> (lib.mesonEnable "libpulse" pulseTunnelSupport) </del> <ins> (lib.mesonEnable "libpulse" true) </ins> (lib.mesonEnable "avahi" zeroconfSupport) <del> (lib.mesonEnable "gstreamer" gstreamerSupport) (lib.mesonEnable "systemd" enableSystemd) (lib.mesonEnable "systemd-system-service" enableSystemd) (lib.mesonEnable "udev" (!enableSystemd)) (lib.mesonEnable "ffmpeg" ffmpegSupport) (lib.mesonEnable "pw-cat-ffmpeg" ffmpegSupport) (lib.mesonEnable "bluez5" bluezSupport) (lib.mesonEnable "bluez5-backend-hsp-native" nativeHspSupport) (lib.mesonEnable "bluez5-backend-hfp-native" nativeHfpSupport) (lib.mesonEnable "bluez5-backend-native-mm" nativeModemManagerSupport) (lib.mesonEnable "bluez5-backend-ofono" ofonoSupport) (lib.mesonEnable "bluez5-backend-hsphfpd" hsphfpdSupport) </del> <ins> (lib.mesonEnable "gstreamer" true) (lib.mesonEnable "gstreamer-device-provider" true) (lib.mesonEnable "systemd" true) (lib.mesonEnable "systemd-system-service" true) (lib.mesonEnable "udev" false) (lib.mesonEnable "ffmpeg" true) (lib.mesonEnable "pw-cat-ffmpeg" true) (lib.mesonEnable "bluez5" true) (lib.mesonEnable "bluez5-backend-hsp-native" true) (lib.mesonEnable "bluez5-backend-hfp-native" true) (lib.mesonEnable "bluez5-backend-native-mm" true) (lib.mesonEnable "bluez5-backend-ofono" true) (lib.mesonEnable "bluez5-backend-hsphfpd" true) </ins> # source code is not easily obtainable (lib.mesonEnable "bluez5-codec-lc3plus" false) <del> (lib.mesonEnable "bluez5-codec-lc3" bluezSupport) (lib.mesonEnable "bluez5-codec-ldac" ldacbtSupport) (lib.mesonEnable "opus" opusSupport) </del> <ins> (lib.mesonEnable "bluez5-codec-lc3" true) (lib.mesonEnable "bluez5-codec-ldac" true) (lib.mesonEnable "opus" true) </ins> (lib.mesonOption "sysconfdir" "/etc") (lib.mesonEnable "raop" raopSupport) (lib.mesonOption "session-managers" "")


buildPythonPackage rec { pname = "dm-tree"; <del> # As of 2021-12-29, the latest stable version still builds with Bazel. version = "unstable-2021-12-20"; </del> <ins> version = "0.1.7"; </ins> src = fetchFromGitHub { owner = "deepmind"; repo = "tree"; <del> rev = "b452e5c2743e7489b4ba7f16ecd51c516d7cd8e3"; sha256 = "1r187xwpvnnj98lyasngcv3lbxz0ziihpl5dbnjbfbjr0kh6z0j9"; </del> <ins> rev = version; hash = "sha256-rg6dcGcbTGfK3h4WAyhwCjgM3o64Jj2SImxNsZXJHHM="; </ins> }; patches = [


<del> {lib, stdenv, fetchurl, libedit, automake, autoconf, libtool , # icu = null: use icu which comes with firebird # icu = pkgs.icu => you may have trouble sharing database files with windows # users if "Collation unicode" columns are being used # windows icu version is *30.dll, however neither the icu 3.0 nor the 3.6 # sources look close to what ships with this package. # Thus I think its best to trust firebird devs and use their version # icu version missmatch may cause such error when selecting from a table: # "Collation unicode for character set utf8 is not installed" # icu 3.0 can still be built easily by nix (by dropping the #elif case and # make | make) icu ? null , superServer ? false , port ? 3050 , serviceName ? "gds_db" }: /* there are 3 ways to use firebird: a) superserver - one process, one thread for each connection b) classic - is built by default - one process for each connection - on linux direct io operations (?) c) embedded. manual says that you usually don't notice the difference between a and b. I'm only interested in the embedder shared libary for now. So everything isn't tested yet */ stdenv.mkDerivation rec { version = "2.5.7.27050-0"; </del> <ins> { lib, stdenv, fetchFromGitHub, libedit, autoreconfHook, zlib, unzip, libtommath, libtomcrypt, icu, superServer ? false }: let base = { </ins> pname = "firebird"; <del> # enableParallelBuilding = false; build fails </del> <ins> meta = with lib; { description = "SQL relational database management system"; homepage = "https://firebirdsql.org/"; changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md"; license = [ "IDPL" "Interbase-1.0" ]; platforms = platforms.linux; maintainers = with maintainers; [ marcweber ]; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libedit icu ]; </ins> <del> # http://tracker.firebirdsql.org/browse/CORE-3246 preConfigure = '' makeFlags="$makeFlags CPU=$NIX_BUILD_CORES" </del> <ins> LD_LIBRARY_PATH = lib.makeLibraryPath [ icu ]; configureFlags = [ "--with-system-editline" ] ++ (lib.optional superServer "--enable-superserver"); installPhase = '' runHook preInstall mkdir -p $out cp -r gen/Release/firebird/* $out runHook postInstall </ins> ''; <del> configureFlags = [ "--with-serivec-port=${builtins.toString port}" "--with-service-name=${serviceName}" "--with-system-editline" "--with-fblog=/var/log/firebird" "--with-fbconf=/etc/firebird" "--with-fbsecure-db=/var/db/firebird/system" ] ++ (lib.optional  (icu != null) "--with-system-icu") ++ (lib.optional superServer "--enable-superserver"); src = fetchurl { url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2"; sha256 = "06hp6bq5irqvm3h03s79qjgcc3jsjpq150y9aq7anklx9v4nhfqa"; }; </del> <ins> }; in { </ins> <del> hardeningDisable = [ "format" ]; </del> <ins> firebird_2_5 = stdenv.mkDerivation (base // rec { version = "2.5.9"; </ins> <del> # configurePhase = '' #   sed -i 's@cp /usr/share/automake-.*@@' autogen.sh #   sh autogen.sh $configureFlags --prefix=$out # ''; buildInputs = [libedit icu automake autoconf libtool]; </del> <ins> src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "sha256-YyvlMeBux80OpVhsCv+6IVxKXFRsgdr+1siupMR13JM="; }; </ins> <del> # TODO: Probably this hase to be tidied up.. # make install requires beeing. disabling the root checks # dosen't work. Copying the files manually which can be found # in ubuntu -dev -classic, -example packages: # maybe some of those files can be removed again installPhase = "cp -r gen/firebird $out"; </del> <ins> configureFlags = base.configureFlags ++ [ "--with-system-icu" ]; </ins> <del> meta = { description = "SQL relational database management system"; homepage = "https://www.firebirdnews.org"; license = ["IDPL" "Interbase-1.0"]; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; broken = true; }; </del> <ins> installPhase = '' runHook preInstall mkdir -p $out cp -r gen/firebird/* $out runHook postInstall ''; meta = base.meta // { platforms = [ "x86_64-linux" ]; }; }); firebird_3 = stdenv.mkDerivation (base // rec { version = "3.0.7"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "sha256-8nGan10qjW8dFF89BL/tUWtwMGhahBiODbOqRrHSrbs="; }; buildInputs = base.buildInputs ++ [ zlib libtommath ]; meta = base.meta // { platforms = [ "x86_64-linux" ]; }; }); firebird_4 = stdenv.mkDerivation (base // rec { version = "4.0.0-rc1"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; rev = "T4_0_0_RC1"; sha256 = "sha256-FLaRePosF5dtJ+fmrfvzkE6wawC9Z9YLhT/ZWkwWXb4="; }; buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ]; }); </ins> }


enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; <del> nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] </del> <ins> nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ] </ins> ++ optional  (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional  (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency.


<ins> { lib , stdenv , fetchurl , installShellFiles , python3 }: stdenv.mkDerivation rec { pname = "flawfinder"; version = "2.0.15"; src = fetchurl { url = "https://dwheeler.com/flawfinder/flawfinder-${version}.tar.gz"; sha256 = "01j4szy8gwvikrfzfayfayjnc1za0jxsnxp5fsa6d06kn69wyr8a"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ python3 ]; installPhase = '' runHook preInstall mkdir -p $out/bin cp ${pname} $out/bin installManPage flawfinder.1 runHook postInstall ''; meta = with lib; { description = "Tool to examines C/C++ source code for security flaws"; homepage = "https://dwheeler.com/flawfinder/"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; }; } </ins>


buildGoModule rec { pname = "yq-go"; <del> version = "4.6.3"; </del> <ins> version = "4.11.2"; </ins> src = fetchFromGitHub { owner = "mikefarah"; <del> rev = "v${version}"; </del> repo = "yq"; <del> sha256 = "sha256-+qSGdskv8qUZRl7wYKn8WsgAcD8DYw1BwZnVKK6g/sI="; </del> <ins> rev = "v${version}"; sha256 = "sha256-IzsI0jS+chm/xOdL1O11qxQTstKcUeZ9YxL7RtKHBZw="; </ins> }; <del> vendorSha256 = "sha256-vpvIl1lfaziuoHs+oDEIztufH1somphiBAn6qTaQaZw="; </del> <ins> vendorSha256 = "sha256-X162NQ+NgOUbwEA6xdnuy0u18/GQLhR3zzi+TVgzMIc="; </ins> doCheck = false;


for i in *; do [ ! -e "/var/lib/cups/$i" ] && ln -s "${rootdir}/etc/cups/$i" "/var/lib/cups/$i" done <ins> #update path reference [ -L /var/lib/cups/path ] &&  rm /var/lib/cups/path [ ! -e /var/lib/cups/path ] &&  ln -s ${bindir} /var/lib/cups/path </ins> ${optionalString cfg.gutenprint '' if [ -d /var/lib/cups/ppd ]; then ${gutenprint}/bin/cups-genppdupdate -p /var/lib/cups/ppd


<del> { stdenv, fetchurl, perl, nettools, java, polyml }: </del> <ins> { stdenv, fetchurl, perl, nettools, java, polyml, z3 }: </ins> # nettools needed for hostname let <del> dirname = "Isabelle2016"; theories = ["HOL" "FOL" "ZF"]; </del> <ins> dirname = "Isabelle2016-1"; </ins> in stdenv.mkDerivation { <del> name = "isabelle-2016"; inherit dirname theories; </del> <ins> name = "isabelle-2016-1"; inherit dirname; </ins> src = if stdenv.isDarwin then fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg"; <del> sha256 = "0wawf0cjc52h8hif1867p33qhlh6qz0fy5i2kr1gbf7psickd6iw"; </del> <ins> sha256 = "0553l7m2z32ajmiv6sgg11rh16n490w8i4q9hr7vx4zzggr9nrlr"; </ins> } else fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; <del> sha256 = "0jh1qrsyib13fycymwvw7dq7xfy4iyplwq0s65ash842cdzkbxb4"; </del> <ins> sha256 = "1w1cgfmmi1sr43z6hczyc29lxlnlz7dd8fa88ai44wkc13y05b5r"; </ins> }; <del> buildInputs = [ perl polyml ] </del> <ins> buildInputs = [ perl polyml z3 ] </ins> ++ stdenv.lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname;


python3.pkgs.buildPythonApplication rec { pname = "apkid"; <del> version = "2.1.1"; </del> <ins> version = "2.1.3"; format = "setuptools"; </ins> src = fetchFromGitHub { owner = "rednaga"; repo = "APKiD"; rev = "v${version}"; <del> sha256 = "1p6kdjjw2jhwr875445w43k46n6zwpz0l0phkl8d3y1v4gi5l6dx"; </del> <ins> hash = "sha256-U4CsPTA0fXCzj5iLTbLFGudAvewVCzxe4xl0osoBy5A="; </ins> }; propagatedBuildInputs = with python3.pkgs; [


nativeBuildInputs = [ glib <ins> gobject-introspection </ins> pkg-config wrapGAppsHook ];


let isPy3k = (lib.versions.major pythonVersion) == "3"; <ins> isPy38OrNewer = lib.versionAtLeast pythonVersion "3.8"; </ins> isPy39OrNewer = lib.versionAtLeast pythonVersion "3.9"; <del> passthru = passthruFun { </del> <ins> passthru = passthruFun rec { </ins> inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; executable = "pypy${if isPy39OrNewer then lib.versions.majorMinor pythonVersion else lib.optionalString isPy3k "3"}"; <del> sitePackages = "site-packages"; </del> <ins> sitePackages = "${lib.optionalString isPy38OrNewer "lib/${libPrefix}/"}site-packages"; </ins> hasDistutilsCxxPatch = false; inherit pythonAttr;


buildInputs = [ cmake boost openssl ]; <del> # This can be removed when updating to 0.13, see https://github.com/cpp-netlib/cpp-netlib/issues/629 propagatedBuildInputs = [ asio ]; </del> cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" ]; enableParallelBuilding = true; <ins> # The test driver binary lacks an RPath to the library's libs preCheck = '' export LD_LIBRARY_PATH=$PWD/libs/network/src ''; # Most tests make network GET requests to various websites doCheck = false; </ins> meta = with stdenv.lib; { <del> description = "Collection of open-source libraries for high level network programming"; </del> <ins> description = "Collection of open-source libraries for high level network programming"; </ins> homepage    = https://cpp-netlib.org; license     = licenses.boost; platforms   = platforms.all;


Type = "notify"; ExecStart = '' ${getExe cfg.package}  <del> --cfg ${mkConfig name keyboard}  </del> <ins> --cfg ${keyboard.configFile}  </ins> --symlink-path ''${RUNTIME_DIRECTORY}/${name}  ${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"}  ${utils.escapeSystemdExecArgs keyboard.extraArgs}


"--disable-carbon_check" "--disable-gtktest" ] <ins> ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}" </ins> ++ lib.optional stdenv.isDarwin (if darwinSupport then "--enable-darwin" else "--disable-darwin") ++ lib.optionals luaSupport [


- [Envision](https://gitlab.com/gabmus/envision), a UI for building, configuring and running Monado, the open source OpenXR runtime. Available as [programs.envision](#opt-programs.envision.enable). <ins> - [realm](https://github.com/zhboner/realm), a simple, high performance relay server written in rust. Available as [services.realm.enable](#opt-services.realm.enable). </ins> - [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld). - [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance).


<del> { stdenv, fetchurl, gmp, pkgconfig }: </del> <ins> { stdenv, fetchurl, gmp, pkgconfig, python }: </ins> stdenv.mkDerivation rec { name = "strongswan-5.2.1";


rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; <del> version = "0.7.1"; </del> <ins> version = "0.7.3"; </ins> src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; <del> hash = "sha256-567/uJPQhrNqDqBF/PqklXm2avSjvtQsddjChwUKUCI="; </del> <ins> hash = "sha256-AKVNyuV9jwzmsy6tHkGkLj1fhVT8XYvEn2Ip2wCKDxI="; </ins> }; <del> cargoHash = "sha256-X7fLbih1s3sxn8vb2kQeFUKDK2DlC+sjm9ZTwj3FD1Y="; </del> <ins> cargoHash = "sha256-F3FLu/n57F8psk+d0Hf+HnqV/DvEFQwRefu/4C8A1sU="; # Prepare the Cargo.lock for offline use. # See https://github.com/NixOS/nixpkgs/issues/261412 postConfigure = '' cargo metadata --offline > /dev/null ''; buildNoDefaultFeatures = true; buildFeatures = [ "native-tls" "postgres" "sqlite" "mysql" "completions" ]; </ins> doCheck = false; <del> cargoBuildFlags = [ "--package sqlx-cli --no-default-features --features native-tls,postgres,sqlite,mysql,completions" ]; </del> <ins> cargoBuildFlags = [ "--package sqlx-cli" ]; </ins> nativeBuildInputs = [ installShellFiles


projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. dotnet-sdk = dotnetCorePackages.sdk_3_1; <del> dotnet-runtime = dotnetCorePackages.net_5_0; </del> <ins> dotnet-runtime = dotnetCorePackages.net_6_0; </ins> executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. executables = []; # Don't install any executables.


smallwm = callPackage ../applications/window-managers/smallwm { }; <ins> smooth = callPackage ../development/libraries/smooth { }; </ins> smos = callPackage ../applications/misc/smos { }; spectrwm = callPackage ../applications/window-managers/spectrwm { };


buildPackage = package: let <del> shims = final.callPackage shimsFn {inherit package redistArch;}; </del> <ins> shims = final.callPackage shimsFn {inherit package; inherit (package) redistArch; }; </ins> name = computeName package; drv = final.callPackage ./manifest.nix { inherit pname;


./generate-addons.sh ./generate-platforms.sh ./generate-sysimages.sh <ins> ./generate-sources.sh </ins>


, pkgsHostHost , callPackage , fetchgit <ins> , fetchpatch </ins> , ghcjsSrcJson ? null , ghcjsSrc ? fetchgit (lib.importJSON ghcjsSrcJson) , bootPkgs


<ins> { lib , stdenv , fetchFromGitLab , cmake , extra-cmake-modules , pkg-config , qtbase , qtquickcontrols2 , qtx11extras , kdelibs4support , kpipewire , wrapQtAppsHook }: stdenv.mkDerivation (finalAttrs: { pname = "xwaylandvideobridge"; version = "0.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "system"; repo = "xwaylandvideobridge"; rev = "v${finalAttrs.version}"; hash = "sha256-79Z4BH7C85ZF+1Zivs3bTey7IdUnaDKhvZxzL6sDqUs="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qtquickcontrols2 qtx11extras kdelibs4support kpipewire ]; meta = { description = "Utility to allow streaming Wayland windows to X applications"; homepage = "https://invent.kde.org/system/xwaylandvideobridge"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = lib.platforms.linux; mainProgram = "xwaylandvideobridge"; }; }) </ins>


hash = "sha256-M9AjV954H1w64YGCVxDEGGSnoEbmocG3zwltob6IW04="; }; <ins> patches = [ (fetchpatch { name = "no-deprecated-pkg_resources.patch"; url = "https://gitlab.com/woob/woob/-/commit/3283c4c1a935cc71acea98b2d8c88bc4bf28f643.patch"; hash = "sha256-3bRuv93ivKRxbGr52coO023DlxHZWwUeInXTPqQAeL8="; }) ]; </ins> nativeBuildInputs = [ setuptools pythonRelaxDepsHook


easyocr = with python3.pkgs; toPythonApplication easyocr; <del> EBTKS = callPackage ../development/libraries/science/biology/EBTKS { }; </del> ecasound = callPackage ../applications/audio/ecasound { }; edac-utils = callPackage ../os-specific/linux/edac-utils { };


{ stdenv, lib, fetchurl, runtimeShell , gettext, pkg-config, python3 , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp <del> , curl, systemd, libxml2, poppler </del> <ins> , curl, systemd, libxml2, poppler, gawk </ins> , sane-drivers # List of { src name backend } attibute sets - see installFirmware below:


done for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' 'n' | sort -u); do <del> for lib in "$d/"*.dylib; do </del> <ins> for lib in "$d/"*.{dylib,so}; do </ins> ln -s "$lib" "$dynamicLinksDir" done done


(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.34.0"; sha256 = "1jrs5fc8k99mh1kipvvlgwm0qlacrsh82bbpdclb84xz0h6nwwrh"; }) <ins> (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) </ins> (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })


''; */ <del> meta = { </del> <ins> meta = with stdenv.lib; { </ins> description = "GNU's decentralized anonymous and censorship-resistant P2P framework"; longDescription = ''


postPatch = '' patchShebangs . <del> # Cannot find ROCm device library, pointless substituteInPlace CMakeLists.txt  --replace "add_subdirectory(tests-v2)" ""  --replace "add_subdirectory(samples)" "" </del> <ins> substituteInPlace tests-v2/featuretests/profiler/CMakeLists.txt  --replace "--build-id=sha1" "--build-id=sha1 --rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" substituteInPlace test/CMakeLists.txt  --replace "''${ROCM_ROOT_DIR}/amdgcn/bitcode" "${rocm-device-libs}/amdgcn/bitcode" </ins> ''; <del> postBuild = '' # HSACO aren't being built for some reason substituteInPlace test/cmake_install.cmake  --replace "file(INSTALL DESTINATION "''${CMAKE_INSTALL_PREFIX}/share/rocprofiler/tests-v1" TYPE FILE FILES "" "message("" </del> <ins> postInstall = '' # Why do these not already have the executable bit set? chmod +x $out/lib/rocprofiler/librocprof-tool.so chmod +x $out/share/rocprofiler/tests-v1/test/ocl/SimpleConvolution # Why do these have the executable bit set? chmod -x $out/libexec/rocprofiler/counters/basic_counters.xml chmod -x $out/libexec/rocprofiler/counters/derived_counters.xml </ins> ''; passthru.updateScript = rocmUpdateScript {


config = mkIf cfg.enable { <del> assertions = lib.singleton { assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; message = "Option driSupport32Bit only makes sense on a 64-bit system."; }; </del> <ins> assertions = [ { assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; message = "Option driSupport32Bit only makes sense on a 64-bit system."; } { assertion = cfg.driSupport32Bit -> (config.boot.kernelPackages.kernel.features.ia32Emulation or false); message = "Option driSupport32Bit requires a kernel that supports 32bit emulation"; } ]; </ins> systemd.tmpfiles.rules = [ "L+ /run/opengl-driver - - - - ${package}"


stdenv.mkDerivation rec { pname = "rtl-sdr"; <del> version = "0.6.0"; </del> <ins> version = "0.8.0"; </ins> <del> src = fetchgit { url = "git://git.osmocom.org/rtl-sdr.git"; rev = "refs/tags/${version}"; sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k"; </del> <ins> src = fetchFromGitHub { owner = "librtlsdr"; repo = "librtlsdr"; rev = "v${version}"; sha256 = "1fgxlkgmdchbrf0nn98ivjr6css5hak3608nr4xrf2qzf7xy2kdk"; </ins> }; postPatch = ''


keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; <ins> keeweb = callPackage ../applications/misc/keeweb { }; </ins> inherit (gnome3) evince; evolution-data-server = gnome3.evolution-data-server; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };


, buildPythonApplication , fetchFromGitHub , gitMinimal <del> , arrow , click , sh , wheel </del> <ins> , python3 </ins> }: <ins> let py = python3.override { packageOverrides = self: super: { click = super.click.overridePythonAttrs (oldAttrs: rec { version = "7.1.2"; src = oldAttrs.src.override { inherit version; sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"; }; }); arrow = super.arrow.overridePythonAttrs (oldAttrs: rec { version = "1.0.3"; src = oldAttrs.src.override { inherit version; sha256 = "0793badh4hgbk2c5g70hmbl7n3d4g5d87bcflld0w9rjwy59r71r"; }; }); sh = super.sh.overridePythonAttrs (oldAttrs: rec { version = "1.14.1"; src = oldAttrs.src.override { inherit version; sha256 = "13hxgifab9ichla13qaa7sh8r0il7vs1r21js72s0n355zr9mair"; }; }); }; }; in with py.pkgs; </ins> buildPythonApplication rec { pname = "gitlint"; version = "0.15.1";


<ins> { lib , stdenv , fetchurl , pkgs , appimageTools }: let pname = "pinokio"; version = "1.3.4"; src = fetchurl { x86_64-darwin = { url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.dmg"; hash = "sha256-Il5zaVWu4icSsKmMjU9u1/Mih34fd+xNpF1nkFAFFGo="; }; x86_64-linux = { url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.AppImage"; hash = "sha256-/E/IAOUgxH9RWpE2/vLlQy92LOgwpHF79K/1XEtSpXI="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); appimageContents = appimageTools.extractType2 { inherit pname version src; }; meta = { homepage = "https://pinokio.computer"; description = "Browser to install, run, and programmatically control ANY application automatically"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ByteSudoer ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; mainProgram = "pinokio"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; in if stdenv.isDarwin then stdenv.mkDerivation { inherit pname version src meta; sourceRoot = "."; nativeBuildInputs = with pkgs; [ undmg ]; installPhase = '' runHook preInstall mkdir -p "$out/Applications" mv Pinokio.app $out/Applications/ runHook postInstall ''; } else appimageTools.wrapType2 { inherit pname version src meta; extraInstallCommands = '' mkdir -p $out/share/pinokio cp -a ${appimageContents}/{locales,resources} $out/share/pinokio cp -a ${appimageContents}/usr/share/icons $out/share/ install -Dm 444 ${appimageContents}/pinokio.desktop -t $out/share/applications ''; } </ins>


postInstall = '' install -Dm755 -t $client/bin $out/bin/tsh <del> wrapProgram $client/bin/tsh --prefix PATH : ${xdg-utils}/bin wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin </del> <ins> wrapProgram $client/bin/tsh --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} wrapProgram $out/bin/tsh --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} </ins> ''; doInstallCheck = true;


libsForQt5 = pkgs.plasma5Packages; inherit (libsForQt5) kdeGear kdeFrameworks plasma5; <del> inherit (pkgs) writeText; </del> inherit (lib) getBin optionalString literalExpression mkRemovedOptionModule mkRenamedOptionModule mkDefault mkIf mkMerge mkOption types; <del> ini = pkgs.formats.ini { }; gtkrc2 = writeText "gtkrc-2.0" '' # Default GTK+ 2 config for NixOS Plasma 5 include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" style "user-font" { font_name="Sans Serif Regular" } widget_class "*" style "user-font" gtk-font-name="Sans Serif Regular 10" gtk-theme-name="Breeze" gtk-icon-theme-name="breeze" gtk-fallback-icon-theme="hicolor" gtk-cursor-theme-name="breeze_cursors" gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-menu-images=1 gtk-button-images=1 ''; gtk3_settings = ini.generate "settings.ini" { Settings = { gtk-font-name = "Sans Serif Regular 10"; gtk-theme-name = "Breeze"; gtk-icon-theme-name = "breeze"; gtk-fallback-icon-theme = "hicolor"; gtk-cursor-theme-name = "breeze_cursors"; gtk-toolbar-style = "GTK_TOOLBAR_ICONS"; gtk-menu-images = 1; gtk-button-images = 1; }; }; kcminputrc = ini.generate "kcminputrc" { Mouse = { cursorTheme = "breeze_cursors"; cursorSize = 0; }; }; </del> activationScript = '' ${set_XDG_CONFIG_HOME}


, libsodium , cffi , hypothesis <ins> , six </ins> }: buildPythonPackage rec {


<del> #! @bash@/bin/bash set -eo pipefail PATH=@coreutils@/bin:$PATH export CLASSPATH=$(find @outFreenet@/deps/ -name "*.jar"|grep -v bcprov-jdk15on-1.48.jar|tr $'n' :) CLASSPATH=$CLASSPATH:@outFreenet@/share/freenet/freenet-ext.jar:@outFreenet@/share/freenet/freenet.jar export FREENET_HOME="$HOME/.local/share/freenet" if [ -n "$XDG_DATA_HOME" ] ; then FREENET_HOME="$XDG_DATA_HOME/freenet" fi mkdir -p -- $FREENET_HOME cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref chmod u+rw -- $FREENET_HOME/seednodes.fref cd -- $FREENET_HOME exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" </del>


inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; <ins> stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; </ins> }; emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec {


"CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}"  "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}"  "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}"  <del> cargo build  </del> <ins> cargo build -j $NIX_BUILD_CORES  </ins> ${stdenv.lib.optionalString (buildType == "release") "--release"}  --target ${rustTarget}  --frozen ${concatStringsSep " " cargoBuildFlags}


gitless = callPackage ../applications/version-management/gitless { python = python3; }; <ins> gitlint = python3Packages.callPackage ../tools/misc/gitlint { }; </ins> gitter = callPackage  ../applications/networking/instant-messengers/gitter { }; gjs = callPackage ../development/libraries/gjs { };


''; }; <ins> upsmon = mkOption { default = {}; description = lib.mdDoc '' Options for the `upsmon.conf` configuration file. ''; type = types.submodule upsmonOptions; }; upsd = mkOption { default = {}; description = lib.mdDoc '' Options for the `upsd.conf` configuration file. ''; type = types.submodule upsdOptions; }; </ins> ups = mkOption { default = {}; # see nut/etc/ups.conf.sample


, libiconv ? null, ncurses <del> , enableDwarf ? !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isWindows, elfutils # for DWARF support </del> , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a


owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; <del> sha256 = "sha256-yS0/Fy2dj8VIbwv2J9sehP0VN0f/YDxu1k9WkaeEz8M="; </del> <ins> fetchSubmodules = true; sha256 = "sha256-nK/Zk2zgIdrRtw3+VkUXQWfI9j29XFDOR95Dvbn07eA="; </ins> }; patches = [


<xi:include href="emacs.section.xml" /> <xi:include href="firefox.section.xml" /> <xi:include href="fish.section.xml" /> <del> <xi:include href="ibus.xml" /> </del> <ins> <xi:include href="ibus.section.xml" /> </ins> <xi:include href="kakoune.section.xml" /> <xi:include href="linux.section.xml" /> <xi:include href="locales.section.xml" />


})) ]; <del> postFixup = '' </del> <ins> postFixup = let libPath = lib.makeLibraryPath ([ libglvnd libxkbcommon xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ] ++ lib.optionals enableWayland [ wayland ]); in '' </ins> wrapProgram $out/bin/neovide  <del> --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd libxkbcommon wayland xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ]} </del> <ins> --prefix LD_LIBRARY_PATH : ${libPath} </ins> ''; postInstall = ''


checkInputs = [ chex cloudpickle <ins> dill </ins> dm-tree jaxlib pytest-xdist


# May fail due to parallelism, see: # https://github.com/astropy/astropy/issues/15441 "TestUnifiedOutputRegistry" <ins> # More flaky tests, see: https://github.com/NixOS/nixpkgs/issues/294392 "test_sidereal_lon_independent" "test_timedelta_full_precision_arithmetic" </ins> ]; meta = {


<del> {fetchzip}: { plugins.civicrm = fetchzip rec { name = "civicrm"; </del> <ins> {fetchzip, stdenv, lib}: { plugins.civicrm = stdenv.mkDerivation rec { pname = "civicrm"; </ins> version = "5.56.0"; <del> url = "https://storage.googleapis.com/${name}/${name}-stable/${version}/${name}-${version}-wordpress.zip"; hash = "sha256-XsNFxVL0LF+OHlsqjjTV41x9ERLwMDq9BnKKP3Px2aI="; </del> <ins> src = fetchzip { inherit version; name = pname; url = "https://storage.googleapis.com/${pname}/${pname}-stable/${version}/${pname}-${version}-wordpress.zip"; hash = "sha256-XsNFxVL0LF+OHlsqjjTV41x9ERLwMDq9BnKKP3Px2aI="; }; meta.license = lib.licenses.agpl3Only; </ins> }; <del> themes.geist = fetchzip rec { name = "geist"; </del> <ins> themes.geist = stdenv.mkDerivation rec { pname = "geist"; </ins> version = "2.0.3"; <del> url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; </del> <ins> src = fetchzip { inherit version; name = pname; url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; }; meta.license = lib.licenses.gpl2Only; </ins> }; }


# verifies: #   1. nginx generates config file with shared http context definitions above #      generated virtual hosts config. <ins> #   2. whether the ETag header is properly generated whenever we're serving #      files in Nix store paths </ins> <del> import ./make-test.nix ({ pkgs, ...} : { </del> <ins> import ./make-test.nix ({ pkgs, ... }: { </ins> name = "nginx"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ mbbx6spp ]; }; <del> nodes = { webserver = { ... }: { services.nginx.enable = true; services.nginx.commonHttpConfig = '' </del> <ins> nodes = let commonConfig = { pkgs, ... }: { services.nginx.enable = true; services.nginx.commonHttpConfig = '' </ins> log_format ceeformat '@cee: {"status":"$status",' '"request_time":$request_time,' '"upstream_response_time":$upstream_response_time,'


<ins> { lib , fetchFromGitHub , mkDerivation , breeze-icons , breeze-qt5 , cmake , extra-cmake-modules , kcodecs , kconfig , kcoreaddons , kfilemetadata , ki18n , kiconthemes , kio , kio-extras , kirigami2 , kxmlgui , mpv , pkg-config , qqc2-desktop-style , qtbase , qtquickcontrols2 , qtwayland , youtube-dl }: mkDerivation rec { pname = "haruna"; version = "0.6.1"; src = fetchFromGitHub { owner = "g-fb"; repo = "haruna"; rev = version; sha256 = "sha256-8MauKmvQUwzq4Ssmm6g7/y6ADkye+eg/zyR3v/Wu848="; }; buildInputs = [ breeze-icons breeze-qt5 kcodecs kconfig kcoreaddons kfilemetadata ki18n kiconthemes kio kio-extras kirigami2 kxmlgui mpv qqc2-desktop-style qtbase qtquickcontrols2 qtwayland youtube-dl ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; meta = with lib; { homepage = "https://github.com/g-fb/haruna"; description = "Open source video player built with Qt/QML and libmpv"; license = with licenses; [ bsd3 cc-by-40 gpl3Plus wtfpl ]; maintainers = with maintainers; [ jojosch ]; }; } </ins>


./services/networking/radicale.nix ./services/networking/radvd.nix ./services/networking/rdnssd.nix <ins> ./services/networking/realm.nix </ins> ./services/networking/redsocks.nix ./services/networking/resilio.nix ./services/networking/robustirc-bridge.nix


privateKey = testCerts.${domain}.key; httpPort = 80; tlsPort = 443; <del> ocspResponderURL = "http://0.0.0.0:4002"; </del> <ins> ocspResponderURL = "http://${domain}:4002"; </ins> strict = true; };


mirror://xorg/individual/util/makedepend-1.0.9.tar.xz mirror://xorg/individual/util/util-macros-1.20.0.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz <del> mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz </del> <ins> mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz </ins>


<del> { stdenv, fetchurl, pkgs, ... }: </del> <ins> { stdenv, fetchurl, pkgs, makeWrapper, mono, ffmpeg, ... }: </ins> stdenv.mkDerivation rec { name = "emby-${version}";


} ~~~ <del> This expression should fetch </del> <ins> This expression should fetch </ins> -  the *nix* vscode extension from whatever source defined in the default nixpkgs extensions set `vscodeExtensions`. <del> -  the *code-runner* vscode extension from the marketplace using the </del> <ins> -  the *code-runner* vscode extension from the marketplace using the </ins> following url: ~~~


(wm: pkgs.gnome.gnome-flashback.mkSessionForWm { inherit (wm) wmName wmLabel wmCommand enableGnomePanel; <ins> inherit (cfg.flashback) panelModulePackages; </ins> } ) flashbackWms;


rec { thunderbird = common rec { pname = "thunderbird"; <del> version = "91.5.1"; </del> <ins> version = "91.6.0"; </ins> application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; <del> sha512 = "5939e09b143e440efa906d95cda06826bd3a73b2edde5eed86229b8a0e4d1434519059f37d319d26978d7eea9b3906c5e1c1543a2bc2465625d5ab5438855717"; </del> <ins> sha512 = "a11eafe1390141ee3508eea06ba8ab135d0725513977a3b37b3b35f413a1f825dc14fef530b9ac961840804be59291c7f5cba3c93b12726605d4a7255660f749"; </ins> }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.


rm -f /tmp/.X0-lock ''; <del> script = "${cfg.displayManager.job.execCmd}"; </del> <ins> # TODO: move declaring the systemd service to its own mkIf script = mkIf (config.systemd.services.display-manager.enable == true) "${cfg.displayManager.job.execCmd}"; </ins> # Stop restarting if the display manager stops (crashes) 2 times # in one minute. Starting X typically takes 3-4s.


<ins> { lib , stdenv , fetchFromGitHub , appstream-glib , desktop-file-utils , gobject-introspection , libadwaita , meson , ninja , pkg-config , python3 , wrapGAppsHook4 , apx , gnome-console }: stdenv.mkDerivation (finalAttrs: { pname = "apx-gui"; version = "0.1.1"; src = fetchFromGitHub { owner  = "Vanilla-OS"; repo   = "apx-gui"; rev    = "v${finalAttrs.version}"; hash = "sha256-orP5kAsoXX0zyDskeIPKKHNt5c757eUm9un4Ws6uFYA="; }; strictDeps = true; nativeBuildInputs = [ appstream-glib desktop-file-utils gobject-introspection meson ninja pkg-config (python3.withPackages (ps: [ ps.pygobject3 ])) wrapGAppsHook4 ]; buildInputs = [ libadwaita ]; preFixup = '' gappsWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ apx gnome-console ]}" ) ''; meta = { description = "A GUI frontend for Apx in GTK 4 and Libadwaita"; homepage    = "https://github.com/Vanilla-OS/apx-gui"; license     = lib.licenses.gpl3Only; platforms   = lib.platforms.linux; maintainers = with lib.maintainers; [ chewblacka ]; mainProgram = "apx-gui"; }; }) </ins>


<del> { lib , stdenvNoCC , fetchFromGitHub , fetchurl , clickgen , attrs }: stdenvNoCC.mkDerivation rec { pname = "bibata-cursors"; version = "2.0.3"; src = fetchFromGitHub { owner = "ful1e5"; repo = "Bibata_Cursor"; rev = "v${version}"; sha256 = "zCk7qgPeae0BfzhxxU2Dk1SOWJQOxiWyJuzH/ri+Gq4="; }; buildInputs = [ clickgen attrs ]; buildPhase = '' ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Amber' -n 'Bibata-Modern-Amber' -c 'Yellowish and rounded edge bibata cursors.' ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Classic' -n 'Bibata-Modern-Classic' -c 'Black and rounded edge Bibata cursors.' ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Ice' -n 'Bibata-Modern-Ice' -c 'White and rounded edge Bibata cursors.' ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Amber' -n 'Bibata-Original-Amber' -c 'Yellowish and sharp edge Bibata cursors.' ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Classic' -n 'Bibata-Original-Classic' -c 'Black and sharp edge Bibata cursors.' ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Ice' -n 'Bibata-Original-Ice' -c 'White and sharp edge Bibata cursors.' ''; installPhase = '' install -dm 0755 $out/share/icons cp -rf themes/* $out/share/icons/ ''; meta = with lib; { description = "Material Based Cursor Theme"; homepage = "https://github.com/ful1e5/Bibata_Cursor"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ rawkode AdsonCicilioti ]; }; } </del>


test2.psk = "@PSK_SPECIAL@";            # should be replaced test3.psk = "@PSK_MISSING@";            # should not be replaced test4.psk = "P@ssowrdWithSome@tSymbol"; # should not be replaced <ins> test5.psk = "@PSK_AWK_REGEX@";          # should be replaced </ins> }; # secrets environmentFile = pkgs.writeText "wpa-secrets" '' PSK_VALID="S0m3BadP4ssw0rd"; # taken from https://github.com/minimaxir/big-list-of-naughty-strings <del> PSK_SPECIAL=",./;'[]-= <>?:"{}|_+ !@#$%^&*()`~"; </del> <ins> PSK_SPECIAL=",./;'[]/-= <>?:"{}|_+ !@#$%^&*()`~"; PSK_AWK_REGEX="PassowrdWith&symbol"; </ins> ''; }; };


broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; <del> buildInputs = [ hunspell qttools ]; </del> <ins> buildInputs = [ aspell qttools ]; </ins> propagatedBuildInputs = [ qtbase ]; }


buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update <del> version = "5.4.13.4"; </del> <ins> version = "5.5.0.11"; </ins> src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; <del> hash = "sha256-RQx+E/lxdSgB2ddNIeWOd/S2OMMiznXCbYUXdYKRvCM="; </del> <ins> hash = "sha256-VlJiTCdoH6hlVtQgECIlbsQvg3S58B5IIy1zRxh1eOg="; </ins> }; <del> dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; dotnet-sdk = dotnetCorePackages.sdk_7_0; </del> <ins> dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; dotnet-sdk = dotnetCorePackages.sdk_8_0; </ins> nugetDeps = ./deps.nix;


disabled = pythonOlder "3.8"; <del> src = fetchPypi { pname = "snowflake_connector_python"; inherit version; hash = "sha256-/ZvCqxv1OE0si2W8ALsEdVV9UvBHenESkzSqtT+Wef0="; </del> <ins> src = fetchFromGitHub { owner = "snowflakedb"; repo = "snowflake-connector-python"; rev = "refs/tags/v${version}"; hash = "sha256-A6QnKCROd1vJpFCTrLEoHVo43xojdjpgYS3qQm64gcY="; </ins> }; build-system = [ cython setuptools <del> wheel </del> ]; dependencies = [ asn1crypto certifi cffi charset-normalizer <ins> cryptography </ins> filelock idna <del> oscrypto </del> packaging platformdirs <del> pycryptodomex </del> pyjwt pyopenssl pytz


composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 <ins> cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 </ins> clash = throw "'clash' has been removed, upstream gone. Consider using 'clash-meta' instead."; # added 2023-11-10 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = claws-mail; # Added 2021-07-10


stdenv.mkDerivation rec { pname = "gmic"; <del> version = "3.1.6"; </del> <ins> version = "3.2.0"; </ins> outputs = [ "out" "lib" "dev" "man" ]; src = fetchFromGitHub { owner = "dtschump"; repo = "gmic"; <del> rev = "326ea9b7dc320b3624fe660d7b7d81669ca12e6d"; sha256 = "RRCzYMN/IXViiUNnacJV3DNpku3hIHQkHbIrtixExT0="; </del> <ins> rev = "v.${version}"; hash = "sha256-lrIlzxXWqv046G5uRkBQnjvysaIcv+iDKxjuUEJWqcs="; </ins> }; # TODO: build this from source


stdenv.mkDerivation rec { pname = "zotero"; <del> version = "5.0.96.3"; </del> <ins> version = "6.0"; </ins> src = fetchurl { <del> url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; sha256 = "sha256-eqSNzmkGNopGJ7VByvUffFEPJz3WHS7b5+jgUAW/hU4="; </del> <ins> url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; sha256 = "0zkgmmflcj6vbyv8rs51jf3vx1zq8pl7b5d5asgayhrdlwi0qgff"; </ins> }; nativeBuildInputs = [ wrapGAppsHook ]; <del> buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; </del> <ins> buildInputs = [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; </ins> dontConfigure = true; dontBuild = true; dontStrip = true; dontPatchELF = true; <del> libPath = lib.makeLibraryPath [ stdenv.cc.cc atk cairo curl cups dbus-glib dbus fontconfig freetype gdk-pixbuf glib glibc gtk3 libX11 libXScrnSaver libXcomposite libXcursor libxcb libXdamage libXext libXfixes libXi libXinerama libXrender libXt libnotify libGLU libGL nspr nss pango ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; </del> <ins> libPath = lib.makeLibraryPath [ stdenv.cc.cc atk cairo curl cups dbus-glib dbus fontconfig freetype gdk-pixbuf glib glibc gtk3 libX11 libXScrnSaver libXcomposite libXcursor libxcb libXdamage libXext libXfixes libXi libXinerama libXrender libXt libnotify libGLU libGL nspr nss pango ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; </ins> postPatch = '' sed -i '/pref("app.update.enabled", true);/cpref("app.update.enabled", false);' defaults/preferences/prefs.js


doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" doInstallCheck = doCheck; <del> preFixup = '' for f in $out/libexec/*; do wrapProgram $f  ${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome.dconf}/lib/gio/modules""}  --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" done ''; </del> passthru = { updateScript = gnome3.updateScript { packageName = pname;


git = gitMinimal; }; <ins> # Build summary for this flavor # - Build Octave Qt GUI:                  no (missing:QtCore QtGui QtNetwork QtHelp QtXml) # - JIT compiler for loops:               no # - Build Java interface:                 yes # - Build static libraries:               no # - Build shared libraries:               yes # - Dynamic Linking API:                  dlopen # - Include support for GNU readline:     yes # - 64-bit array dims and indexing:       yes # - 64-bit BLAS array dims and indexing:  yes # - OpenMP SMP multithreading:            yes # - Truncate intermediate FP results:     yes # - Build cross tools:                    no # - Build docs:                           yes </ins> octave = callPackage ../development/interpreters/octave { <del> qt = null; qscintilla = null; ghostscript = null; graphicsmagick = null; llvm = null; hdf5 = null; glpk = null; suitesparse = null; jdk = null; </del> <ins> python = python3; </ins> openblas = if stdenv.isDarwin then openblasCompat else openblas; }; <del> octaveFull = (lowPrio (octave.override { qt = qt4; inherit qscintilla; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; </del> <ins> # Build summary for this flavor # - Build Octave Qt GUI:                  no (missing:QtCore QtGui QtNetwork QtHelp QtXml) # - JIT compiler for loops:               yes # - Build Java interface:                 yes # - Build static libraries:               no # - Build shared libraries:               yes # - Dynamic Linking API:                  dlopen # - Include support for GNU readline:     yes # - 64-bit array dims and indexing:       yes # - 64-bit BLAS array dims and indexing:  yes # - OpenMP SMP multithreading:            yes # - Truncate intermediate FP results:     yes # - Build cross tools:                    no # - Build docs:                           yes octave-jit = callPackage ../development/interpreters/octave { python = python3; </ins> openblas = if stdenv.isDarwin then openblasCompat else openblas; <ins> enableJIT = true; }; # Build summary for this flavor # - Build Octave Qt GUI:                  yes # - JIT compiler for loops:               no # - Build Java interface:                 yes # - Build static libraries:               no # - Build shared libraries:               yes # - Dynamic Linking API:                  dlopen # - Include support for GNU readline:     yes # - 64-bit array dims and indexing:       yes # - 64-bit BLAS array dims and indexing:  yes # - OpenMP SMP multithreading:            yes # - Truncate intermediate FP results:     yes # - Build cross tools:                    no # - Build docs:                           yes # Build summary for this flavor octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { python = python3; openblas = if stdenv.isDarwin then openblasCompat else openblas; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; </ins> })); ocropus = callPackage ../applications/misc/ocropus { };


description = "Library for registering global key bindings"; homepage = "https://github.com/kupferlauncher/keybinder/"; license = licenses.mit; <del> platforms = platforms.linux; </del> <ins> platforms = platforms.unix; </ins> maintainers = [ maintainers.cstrahan ]; }; }


systemd libxml2 poppler <ins> gawk </ins> ]; enableParallelBuilding = true;


<del> { copyDesktopItems , fetchurl , jre , lib , makeDesktopItem , makeWrapper , stdenvNoCC </del> <ins> { copyDesktopItems, fetchurl, jre, lib, makeDesktopItem, makeWrapper, stdenvNoCC, </ins> <del> , gamemodeSupport ? stdenvNoCC.isLinux , textToSpeechSupport ? stdenvNoCC.isLinux , additionalLibs ? [ ] </del> <ins> gamemodeSupport ? stdenvNoCC.isLinux, textToSpeechSupport ? stdenvNoCC.isLinux, additionalLibs ? [ ], </ins> <del> , # dependencies flite , gamemode , libglvnd , libpulseaudio , udev , xorg </del> <ins> # dependencies flite, gamemode, libglvnd, libpulseaudio, udev, xorg, </ins> }: stdenvNoCC.mkDerivation (finalAttrs: {


</para> <xi:include href="images/appimagetools.xml" /> <xi:include href="images/dockertools.section.xml" /> <del> <xi:include href="images/ocitools.xml" /> </del> <ins> <xi:include href="images/ocitools.section.xml" /> </ins> <xi:include href="images/snaptools.xml" /> </chapter>


crossMesonFlags="--cross-file=@crossFile@/cross-file.conf" fi <ins> # See multiple-outputs.sh and meson’s coredata.py mesonFlags=" --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec  --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin  --includedir=${!outputInclude}/include  --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info  --localedir=${!outputLib}/share/locale  $mesonFlags" </ins> mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"


lcms2 librsync openssl.dev <ins> xxHash </ins> ] ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel


webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; <ins> webcord = callPackage ../applications/networking/instant-messengers/webcord {}; </ins> webex = callPackage ../applications/networking/instant-messengers/webex {}; webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};


netifaces octoprint-filecheck octoprint-firmwarecheck <del> octoprint-pisupport </del> passlib pathvalidate pkginfo


owner = "AzureAD"; repo = "microsoft-authentication-extensions-for-python"; rev = "refs/tags/${version}"; <del> hash = "sha256-ScInTvOgFxP5mgep5FRu6YZHPTtXhrcZGFE7Wdvcm4c="; </del> <ins> hash = "sha256-javYE1XDW1yrMZ/BLqIu/pUXChlBZlACctbD2RfWuis="; </ins> }; <del> nativeBuildInputs = [ setuptools ]; </del> <ins> build-system = [ setuptools ]; </ins> <del> propagatedBuildInputs = [ </del> <ins> dependencies = [ </ins> msal portalocker ];


config = mkIf cfg.enable { services.xserver = { exportConfiguration = true; <del> displayManager.job.execCmd = ""; displayManager.lightdm.enable = lib.mkForce false; </del> }; <del> systemd.services.display-manager.enable = false; </del> # Other displayManagers log to /dev/null because they're services and put # Xorg's stdout in the journal


<ins> { lib , stdenv , fetchFromGitLab , meson , vala , ninja , pkg-config , wrapGAppsHook , desktop-file-utils , appstream-glib , python3 , glib , gtk3 , libhandy , libtransmission , libb64 , libutp , miniupnpc , dht , libnatpmp , libevent , curl , openssl , zlib }: stdenv.mkDerivation rec { pname = "fragments"; version = "1.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Fragments"; rev = version; sha256 = "0x1kafhlgyi65l4w67c24r8mpvasg3q3c4wlgnjc9sxvp6ki7xbn"; }; patches = [ # Fix dependency resolution ./dependency-resolution.patch ]; nativeBuildInputs = [ meson vala ninja pkg-config wrapGAppsHook desktop-file-utils appstream-glib python3 ]; buildInputs = [ glib gtk3 libhandy libtransmission libb64 libutp miniupnpc dht libnatpmp libevent curl openssl zlib ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/Fragments"; description = "A GTK3 BitTorrent Client"; maintainers = with maintainers; [ angustrau ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; } </ins>


acme.wait_for_unit("default.target") acme.wait_for_unit("pebble.service") <del> client.succeed("curl https://acme.test:15000/roots/0 > /tmp/ca.crt") client.succeed("curl https://acme.test:15000/intermediate-keys/0 >> /tmp/ca.crt") </del> <ins> client.succeed("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt") client.succeed("curl https://${caDomain}:15000/intermediate-keys/0 >> /tmp/ca.crt") </ins> with subtest("Can request certificate with HTTPS-01 challenge"): webserver.wait_for_unit("acme-finished-a.example.test.target")


<ins> { lib , stdenvNoCC , fetchurl }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "softnet"; version = "0.7.1"; src = fetchurl { url = "https://github.com/cirruslabs/softnet/releases/download/${finalAttrs.version}/softnet.tar.gz"; sha256 = "1g274x524xc85hfzxi3vb4xp720bjgk740bp6hc92d1ikmp0b664"; }; sourceRoot = "."; installPhase = '' runHook preInstall install -D softnet $out/bin/softnet install -Dm444 -t $out/share/softnet README.md LICENSE runHook postInstall ''; meta = with lib; { description = "Software networking with isolation for Tart"; homepage = "https://github.com/cirruslabs/softnet"; license = licenses.agpl3Plus; maintainers = with maintainers; [ emilytrau ]; platforms = [ "aarch64-darwin" ]; # Source build will be possible after darwin SDK 12.0 bump # https://github.com/NixOS/nixpkgs/pull/229210 sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; }) </ins>


patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch; configureFlags = [ <del> "--enable-gui=${guiSupport}" </del> "--with-features=${features}" "--disable-xsmp"              # XSMP session management "--disable-xsmp_interact"     # XSMP interaction


passthru = { inherit targetPrefix; }; <ins> meta = { maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; priority = 10; }; </ins> }


--replace '$POLYML_HOME/$PLATFORM/polyml' ${polyml}/bin/poly substituteInPlace lib/scripts/run-polyml* lib/scripts/polyml-version  --replace '$ML_HOME/poly' ${polyml}/bin/poly <del> ''; </del> <ins> substituteInPlace contrib/z3*/etc/settings  --replace '$Z3_HOME/z3' '${z3}/bin/z3' '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" done ''); </ins> installPhase = '' mkdir -p $out/bin


{ lib , stdenv <ins> , fetchpatch2 </ins> , cmake , ninja , python


dontWrapGApps = true; installPhase = '' <ins> runHook preInstall </ins> mkdir -p $out/bin mv opt/BlueMail/* $out ln -s $out/bluemail $out/bin/bluemail <ins> mkdir -p $out/share/icons mv usr/share/icons/hicolor $out/share/icons/ runHook postInstall </ins> ''; makeWrapperArgs = [


<del> { pcre, pcre2, libXinerama, picom, lib, fetchFromGitHub }: </del> <ins> { lib , fetchFromGitHub , libXinerama , pcre , pcre2 , picom , xcbutil }: </ins> <del> picom.overrideAttrs (oldAttrs: rec { </del> <ins> picom.overrideAttrs (oldAttrs: { </ins> pname = "picom-next"; <del> version = "unstable-2023-01-29"; buildInputs = [ pcre2 ] ++ lib.remove libXinerama (lib.remove pcre oldAttrs.buildInputs); </del> <ins> version = "unstable-2023-08-03"; buildInputs = [ pcre2 xcbutil ] # remove dependencies that are not used anymore ++ (lib.subtractLists [ libXinerama pcre ] oldAttrs.buildInputs); </ins> src = fetchFromGitHub { owner = "yshui"; repo = "picom"; <del> rev = "cee12875625465292bc11bf09dc8ab117cae75f4"; sha256 = "sha256-lVwBwOvzn4ro1jInRuNvn1vQuwUHUp4MYrDaFRmW9pc="; </del> <ins> rev = "5d6957d3da1bf99311a676eab94c69ef4276bedf"; hash = "sha256-Mzf0533roLSODjMCPKyGSMbP7lIbT+PoLTZfoIBAI6g="; </ins> }; meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; })


enableParallelBuilding = true; <del> installPhase = '' runHook preInstall DESTDIR=$out PREFIX= pkgconfigdir=lib/pkgconfig make install $installFlags runHook postInstall ''; </del> <ins> makeFlags = [ "PREFIX=${placeholder "out"}" ]; </ins> FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf"; FONTCONFIG_PATH="${fontconfig.out}/etc/fonts/";


runHook postInstall ''; <del> # Electron version is set to 22 in order to match upstream </del> postFixup = '' <del> makeWrapper ${electron_22}/bin/electron $out/bin/${pname}  </del> <ins> makeWrapper ${electron}/bin/electron $out/bin/${pname}  </ins> --add-flags $out/share/${pname}/resources/app.asar '';


wrapt zeroconf zipstream-new <del> ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; </del> <ins> ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; </ins> <del> checkInputs = with super; [ pytestCheckHook mock ddt ]; </del> <ins> checkInputs = with super; [ ddt mock pytestCheckHook ]; </ins> patches = [ # substitute pip and let it find out, that it can't write anywhere