use = builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; <ins> mkRenamedOptionModuleWith = { /* Old option path as list of strings. */ from, /* New option path as list of strings. */ to, /* Release number of the first release that contains the rename, ignoring backports. Set it to the upcoming release, matching the nixpkgs/.version file. */ sinceRelease, }: doRename { inherit from to; visible = false; warn = lib.isInOldestRelease sinceRelease; use = lib.warnIf (lib.isInOldestRelease sinceRelease) "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; </ins> /* Return a module that causes a warning to be shown if any of the "from" option is defined; the defined values can be used in the "mergeFn" to set the "to" value.


, protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jre <ins> , pipewire_0_2 </ins> # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport


, makeWrapper , autoreconfHook , gtk-doc <ins> , graphviz </ins> }: let python = python2.withPackages (pp: [ pp.pygtk ]);


doCheck = false; postPatch = '' <del> substituteInPlace CMakeLists.txt --replace $'{SoQt_INCLUDE_DIRS}'  </del> <ins> substituteInPlace distutils_cmake/CMakeLists.txt --replace $'{SoQt_INCLUDE_DIRS}'  </ins> $'{Coin_INCLUDE_DIR}';$'{SoQt_INCLUDE_DIRS}' '';


"-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" (lib.optionalString usePython "-DUSE_PYTHON=true") <ins> ] ++ lib.optionals (usePython && stdenv.isDarwin) [ # Fix python lookup on Darwin. Not necessary after # https://github.com/NixOS/nixpkgs/pull/94090 lands in master "-DPython_ROOT_DIR=${python}" </ins> ]; # by default, it will query the python interpreter for it's sitepackages location


# ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ libsoup gcr <ins> glib-networking # TLS support </ins> gnome-online-accounts libsecret libgdata ]);


<del> { lib , stdenv , fetchFromGitHub , buildNpmPackage , nix-update-script , electron , writeShellScriptBin , makeWrapper , copyDesktopItems , giflib , makeDesktopItem , pkg-config , pixman , cairo , pango , npm-lockfile-fix , overrideSDK , darwin </del> <ins> { lib, stdenv, fetchFromGitHub, buildNpmPackage, nix-update-script, electron, writeShellScriptBin, makeWrapper, copyDesktopItems, makeDesktopItem, pkg-config, pixman, cairo, pango, npm-lockfile-fix, overrideSDK, darwin, </ins> }: let # fix for: https://github.com/NixOS/nixpkgs/issues/272156 <del> buildNpmPackage' = buildNpmPackage.override { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; </del> <ins> buildNpmPackage' = buildNpmPackage.override { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; </ins> in buildNpmPackage' rec { pname = "bruno";


buildNpmPackage rec { pname = "bitwarden-cli"; <del> version = "2023.10.0"; </del> <ins> version = "2023.12.0"; </ins> src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; <del> hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; </del> <ins> hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo="; </ins> }; nodejs = nodejs_18; <del> npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; </del> <ins> npmDepsHash = "sha256-bnYpvHO9Pnob+MbrSshv03mSwXCADH/2xw33nLVKMdg="; </ins> nativeBuildInputs = [ python3


<ins> #! @bash@/bin/bash set -eo pipefail PATH=@coreutils@/bin:$PATH export CLASSPATH=@CLASSPATH@ 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@/seednodes.fref $FREENET_HOME/seednodes.fref chmod u+rw -- $FREENET_HOME/seednodes.fref cd -- $FREENET_HOME exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" </ins>


<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> <ins> - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS. </ins> - `mkosi` was updated to v19. Parts of the user interface have changed. Consult the [release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.


with lib; let cfg = config.services.networkd-dispatcher; in { options = { services.networkd-dispatcher = {


nlohmann_json ]; <del> NIX_LDFLAGS = lib.optionals (!atLeast24) [ # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba (lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto") # https://github.com/NixOS/nix/commits/74b4737d8f0e1922ef5314a158271acf81cd79f8 (lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic") ]; </del> postPatch = '' patchShebangs --build tests '';


desktop-file-utils glib wrapGAppsHook <ins> python3Packages.pip </ins> ]; buildInputs = [


doCheck = (!stdenv.isDarwin); <ins> # examples.complex.xss_scanner doesn't import correctly with pytest5 </ins> checkPhase = '' export HOME=$(mktemp -d) export LC_CTYPE=en_US.UTF-8 <del> pytest -k 'not test_find_unclaimed_URLs and not test_tcp' </del> <ins> pytest --ignore test/examples  -k 'not test_find_unclaimed_URLs and not test_tcp' </ins> ''; propagatedBuildInputs = [


${optionalString cfg.caching.apcu "'memcache.local' => 'OCMemcacheAPCu',"} 'log_type' => 'syslog', 'log_level' => '${builtins.toString cfg.logLevel}', <del> ${optionalString (cfg.config.overwriteProtocol != null) "'overwriteprotocol' => '${cfg.config.overwriteProtocol}',"} </del> <ins> ${optionalString (c.overwriteProtocol != null) "'overwriteprotocol' => '${c.overwriteProtocol}',"} ${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"} ${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"} ${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"} ${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"} ${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"} ${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"} ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_pwd(),"} 'dbtype' => '${c.dbtype}', 'trusted_domains' => ${writePhpArrary c.extraTrustedDomains}, </ins> ]; ''; occInstallCmd = let <del> c = cfg.config; adminpass = if c.adminpassFile != null then ''"$(<"${toString c.adminpassFile}")"'' else ''"${toString c.adminpass}"''; </del> dbpass = if c.dbpassFile != null then ''"$(<"${toString c.dbpassFile}")"'' else if c.dbpass != null then ''"${toString c.dbpass}"'' else null; <ins> adminpass = if c.adminpassFile != null then ''"$(<"${toString c.adminpassFile}")"'' else ''"${toString c.adminpass}"''; </ins> installFlags = concatStringsSep " n    " (mapAttrsToList (k: v: "${k} ${toString v}") { "--database" = ''"${c.dbtype}"'';


# luarocks only looks for rockspecs in the default/system tree instead of all # configured trees) luarocks_config = "luarocks-config.lua"; <del> luarocks_content = '' </del> <ins> luarocks_content = let extraVariablesStr = lib.concatStringsSep "n " (lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables); in '' </ins> local_cache = "" -- To prevent collisions when creating environments, we install the rock -- files into per-package subdirectories


}; }; <ins> # Test OCSP Stapling specialisation.ocsp-stapling.configuration = { pkgs, ... }: { security.acme.certs."a.example.test" = { ocspMustStaple = true; }; services.nginx.virtualHosts."a.example.com" = { extraConfig = '' ssl_stapling on; ssl_stapling_verify on; ''; }; }; </ins> # Test using Apache HTTPD specialisation.httpd-aliases.configuration = { pkgs, config, lib, ... }: { services.nginx.enable = lib.mkForce false;


"test_album_from_string" "test_album_from_url" "test_album_length" <del> "test_artist_from_url" </del> "test_artist_from_string" <ins> "test_artist_from_url" </ins> "test_convert" "test_download_ffmpeg" "test_download_song"


, awscli }: <del> python3.pkgs.buildPythonApplication rec { pname = "awscli"; version = "1.32.101"; # N.B: if you change this, change botocore and boto3 to a matching version too pyproject = true; </del> <ins> let botocoreVersion = python3.pkgs.botocore.version; # awscli.version should be pinned to 2 minor versions less than the botocoreVersion versionMinor = toString (lib.toInt (lib.versions.minor botocoreVersion) - 2); versionPatch = lib.versions.patch botocoreVersion; self = python3.pkgs.buildPythonApplication rec { pname = "awscli"; version = "1.${versionMinor}.${versionPatch}"; # N.B: if you change this, change botocore and boto3 to a matching version too pyproject = true; </ins> <del> src = fetchPypi { inherit pname version; hash = "sha256-M4KzuQ+srPfk85P5QeQfVMorSKWhmNhdX4AY0AeRDTQ="; }; </del> <ins> src = fetchPypi { inherit pname version; hash = "sha256-GPcXkl2H0XNaeqt2/qD5+KvW23dRB0X+zLWo9hLigQM="; }; </ins> <del> nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; </del> <ins> nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; </ins> <del> pythonRelaxDeps = [ "botocore" "colorama" "docutils" "rsa" ]; </del> <ins> pythonRelaxDeps = [ # botocore must not be relaxed "colorama" "docutils" "rsa" ]; </ins> <del> build-system = [ python3.pkgs.setuptools ]; </del> <ins> build-system = [ python3.pkgs.setuptools ]; </ins> <del> propagatedBuildInputs = with python3.pkgs; [ botocore s3transfer colorama docutils rsa pyyaml groff less ]; </del> <ins> propagatedBuildInputs = with python3.pkgs; [ botocore s3transfer colorama docutils rsa pyyaml groff less ]; </ins> <del> postInstall = '' mkdir -p $out/share/bash-completion/completions echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli </del> <ins> postInstall = '' mkdir -p $out/share/bash-completion/completions echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli </ins> <del> mkdir -p $out/share/zsh/site-functions mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions </del> <ins> mkdir -p $out/share/zsh/site-functions mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions </ins> <del> rm $out/bin/aws.cmd ''; </del> <ins> rm $out/bin/aws.cmd ''; </ins> <del> doInstallCheck = true; </del> <ins> doInstallCheck = true; </ins> <del> installCheckPhase = '' runHook preInstallCheck </del> <ins> installCheckPhase = '' runHook preInstallCheck </ins> <del> $out/bin/aws --version | grep "${python3.pkgs.botocore.version}" $out/bin/aws --version | grep "${version}" </del> <ins> $out/bin/aws --version | grep "${botocoreVersion}" $out/bin/aws --version | grep "${version}" </ins> <del> runHook postInstallCheck ''; </del> <ins> runHook postInstallCheck ''; </ins> <del> passthru = { python = python3; # for aws_shell updateScript = nix-update-script { # Excludes 1.x versions from the Github tags list extraArgs = [ "--version-regex" "^(1.(.*))" ]; }; tests.version = testers.testVersion { package = awscli; command = "aws --version"; inherit version; </del> <ins> passthru = { python = python3; # for aws_shell updateScript = nix-update-script { extraArgs = [ "--version=skip" ]; }; tests.version = testers.testVersion { package = awscli; command = "aws --version"; inherit version; }; </ins> }; <del> }; meta = with lib; { homepage = "https://aws.amazon.com/cli/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; mainProgram = "aws"; maintainers = with maintainers; [ anthonyroussel ]; </del> <ins> meta = with lib; { homepage = "https://aws.amazon.com/cli/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; mainProgram = "aws"; maintainers = with maintainers; [ anthonyroussel ]; }; </ins> }; <del> } </del> <ins> in assert self ? pythonRelaxDeps -> !(lib.elem "botocore" self.pythonRelaxDeps); self </ins>


* Full encryption, DHT, and PEX support ''; homepage = "http://www.transmissionbt.com/"; <del> license = lib.licenses.gpl2; # parts are under MIT </del> <ins> license = lib.licenses.gpl2Plus; # parts are under MIT </ins> maintainers = with lib.maintainers; [ astsmtl vcunat wizeman ]; platforms = lib.platforms.unix; };


<ins> { lib , stdenv , fetchurl , pkg-config , lua , readline , ncurses , lz4 , tbox , xmake-core-sv }: stdenv.mkDerivation rec { pname = "xmake"; version = "2.7.9"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; hash = "sha256-m0LYY0gz9IhbBbiUKd1gBE3KmSMvYJYyC42Ff7M9Ku8="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua lua.pkgs.cjson readline ncurses lz4 tbox xmake-core-sv ]; configureFlags = [ "--external=y" ]; meta = with lib; { description = "A cross-platform build utility based on Lua"; homepage = "https://xmake.io"; license = licenses.asl20; platforms = lua.meta.platforms; maintainers = with maintainers; [ rewine ]; }; } </ins>


are used internally to configure an HTTP server using <literal><link xlink:href="https://php-fpm.org/">PHP-FPM</link></literal> and <literal>nginx</literal>. The <literal>config</literal> attribute set is <del> used for the <literal>config.php</literal> which is used for the application's configuration. <emphasis>Beware: this isn't entirely pure since the config is modified by the application's runtime!</emphasis> </del> <ins> used by the imperative installer and all values are written to an additional file to ensure that changes can be applied by changing the module's options. </ins> </para> <para> <del> In case the application serves multiple hosts (those are checked with </del> <ins> In case the application serves multiple domains (those are checked with </ins> <literal><link xlink:href="http://php.net/manual/en/reserved.variables.server.php">$_SERVER['HTTP_HOST']</link></literal>) <del> those can be added using </del> <ins> it's needed to add them to </ins> <literal><link linkend="opt-services.nextcloud.config.extraTrustedDomains">services.nextcloud.config.extraTrustedDomains</link></literal>. </para> <ins> <para> Auto updates for Nextcloud apps can be enabled using <literal><link linkend="opt-services.nextcloud.autoUpdateApps.enable">services.nextcloud.autoUpdateApps</link></literal>. </para> </ins> </section> <section xml:id="module-services-nextcloud-pitfalls-during-upgrade"> <title>Pitfalls</title>


libsoup gnome3.gnome-settings-daemon gnome3.nautilus gnome3.mutter gnome3.gnome-desktop gobjectIntrospection gnome3.nautilus <ins> # Makes it possible to select user themes through the `user-theme` extension gnome3.gnome-shell-extensions </ins> ]; postPatch = ''


EOF cat ${certdata2pem} > certdata2pem.py <del> patch -p1 < ${./fix-unicode-ca-names.patch} ${optionalString includeEmail '' # Disable CAs used for mail signing substituteInPlace certdata2pem.py --replace ['CKA_TRUST_EMAIL_PROTECTION'] ''' ''} </del> ''; buildPhase = ''


# For backwards compatibility with removed pkgs/development/interpreters/hy # Example usage: #   hy.withPackages (ps: with ps; [ hyrule requests ]) <del> withPackages = python-packages: python.withPackages (ps: (python-packages ps) ++ [ ps.hy ]); </del> <ins> withPackages = python-packages: (python.withPackages (ps: (python-packages ps) ++ [ ps.hy ])).overrideAttrs (old: { name = "${hy.name}-env"; meta = lib.mergeAttrs (builtins.removeAttrs hy.meta [ "license" ]) { mainProgram = "hy"; }; }); </ins> }; meta = with lib; {


# badPlatformsConditions :: AttrSet Bool # Sets `meta.badPlatforms = meta.platforms` if any of the conditions are true. # Example: Broken on a specific architecture when some condition is met (like targeting Jetson). <del> badPlatformsConditions = { }; </del> <ins> badPlatformsConditions = { "No source" = !sourceMatchesHost; }; </ins> # src :: Optional Derivation src = trivial.pipe redistArch [


nativeBuildInputs = [ cmake ninja curl git pandoc wrapQtAppsHook copyDesktopItems pkg-config unzip zip ]; buildInputs = [ libGL libGLU xorg.libXxf86vm xorg.libSM <del> freeimage freetype qtbase catch2 fmt </del> <ins> freeimage freetype qtbase qtwayland catch2 fmt </ins> glew miniz tinyxml-2 assimp ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";


cmakeFlags = '' -DSC_WII=OFF <del> -DSC_EL=${if useSCEL then "ON" else "OFF"} </del> <ins> -DSC_EL=${if useSCEL then "ON" else "OFF"} </ins> ''; nativeBuildInputs = [ cmake pkgconfig ]; <del> buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qt readline ] </del> <ins> buildInputs = [ gcc ljack2 libsndfile fftw curl libXt qt readline ] </ins> ++ optional useSCEL emacs; }


# A target remains active. Use this to probe the fact that # a service fired eventhough it is not RemainAfterExit <del> systemd.targets."acme-finished-a.example.test" = {}; systemd.services."acme-a.example.test" = { wants = [ "acme-finished-a.example.test.target" ]; before = [ "acme-finished-a.example.test.target" ]; after = [ "nginx.service" ]; </del> <ins> systemd.targets."acme-finished-a.example.test" = { after = [ "acme-a.example.test.service" ]; wantedBy = [ "acme-a.example.test.service" ]; </ins> }; services.nginx.enable = true;


patches = [ ./fedora-fixes.patch ]; <ins> # Fix for #40213, probably permanent, because upstream doesn't seem to be # developed anymore. Alternatively, gcc7Stdenv could be used. NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; </ins> meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/omxil/; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";


<del> { lib, stdenv, pixie, fetchFromGitHub }: </del> <ins> { lib, stdenv, fetchFromGitHub , pixie, rlwrap }: </ins> stdenv.mkDerivation rec { pname = "dust";


rich-rst = callPackage ../development/python-modules/rich-rst { }; <ins> rich-theme-manager = callPackage ../development/python-modules/rich-theme-manager { }; </ins> ring-doorbell = callPackage ../development/python-modules/ring-doorbell { }; rio-tiler = callPackage ../development/python-modules/rio-tiler { };


./programs/nm-applet.nix ./programs/npm.nix ./programs/oblogout.nix <ins> ./programs/partition-manager.nix </ins> ./programs/plotinus.nix ./programs/proxychains.nix ./programs/qt5ct.nix


<ins> diff --git a/meson.build b/meson.build index 5030d0c..6de7a20 100644 --- a/meson.build +++ b/meson.build @@ -32,10 +32,11 @@ transmission_dep = declare_dependency( meson.get_compiler('c').find_library('dht'), meson.get_compiler('c').find_library('natpmp'), meson.get_compiler('c').find_library('event'), -				meson.get_compiler('c').find_library('libcurl'), -				meson.get_compiler('c').find_library('libcrypto'), +				meson.get_compiler('c').find_library('curl'), +				meson.get_compiler('c').find_library('crypto'), +				meson.get_compiler('c').find_library('ssl'), meson.get_compiler('c').find_library('libpthread'), -				meson.get_compiler('c').find_library('libz'), +				meson.get_compiler('c').find_library('z'), transmission_vapi, transmission_lib ]) @@ -45,4 +46,4 @@ subdir('data') subdir('po') subdir('src') -meson.add_install_script('build-aux/postinstall.py') +meson.add_install_script('python3', '../build-aux/postinstall.py') </ins>


+ +case $1 in +    ""|"repl") <del> +        rlwrap_cmd="" +        if [ -n "`which rlwrap`" ]; then +            rlwrap_cmd="rlwrap -aignored -n" +        fi +        $rlwrap_cmd $pixie_path $load_path </del> <ins> +        $rlwrap_cmd -aignored -n $pixie_path $load_path </ins> +        ;; +    "run") +        shift


--replace /usr/bin/perl "${perl}/bin/perl" substituteInPlace src/lib/Gitolite/Hooks/Update.pm  --replace /usr/bin/perl "${perl}/bin/perl" <ins> substituteInPlace src/lib/Gitolite/Setup.pm  --replace hostname "${nettools}/bin/hostname" </ins> ''; installPhase = ''


environment.systemPackages = [ alsaUtils ]; <del> environment.etc = mkIf (config.sound.extraConfig != "") </del> <ins> environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "") </ins> [ { source = pkgs.writeText "asound.conf" config.sound.extraConfig; target = "asound.conf";


<ins> diff --git a/setup.py b/setup.py index 62db8af..4a980c1 100755 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ setuptools.setup( 'ruamel.yaml>0.15.69', 'jsonschema>=4.1.2', 'rfc3987', -        'pylibfdt', +        'libfdt', ], classifiers=[ </ins>


enableExtraPlugins = true; }; <del> asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; </del> <ins> asciidoctor = callPackage ../tools/typesetting/asciidoctor { bundlerApp = bundlerApp.override { # asciidoc supports both ruby 2 and 3, # but we don't want to be stuck on it: ruby = ruby_3_1; }; }; </ins> asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };


sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5"; }; <del> pythonPath = with python3.pkgs; [ </del> <ins> nativeBuildInputs = with python3.pkgs; [ setuptools_scm docutils ]; propagatedBuildInputs = with python3.pkgs; [ </ins> musicbrainzngs mutagen pycdio pygobject3 <del> requests </del> ruamel_yaml <del> setuptools setuptools_scm </del> <ins> discid pillow </ins> ]; buildInputs = [ libsndfile ]; checkInputs = with python3.pkgs; [ twisted <del> ]; patches = [ (substituteAll { src = ./paths.patch; inherit cdparanoia; }) ]; </del> <ins> ] ++ bins; </ins> makeWrapperArgs = [ <del> "--prefix" "PATH" ":" (lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ]) </del> <ins> "--prefix" "PATH" ":" (lib.makeBinPath bins) </ins> ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; <del> # some tests require internet access # https://github.com/JoeLametta/whipper/issues/291 doCheck = false; preCheck = '' HOME=$TMPDIR </del> <ins> checkPhase = '' runHook preCheck # disable tests that require internet access # https://github.com/JoeLametta/whipper/issues/291 substituteInPlace whipper/test/test_common_accurip.py  --replace "test_AccurateRipResponse" "dont_test_AccurateRipResponse" HOME=$TMPDIR ${python3.interpreter} -m unittest discover runHook postCheck </ins> ''; meta = with lib; {


<del> { stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, makeWrapper, allegro5, libGL }: </del> <ins> { stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, allegro5, libGL, wrapGAppsHook }: </ins> stdenv.mkDerivation rec { pname = "liberation-circuit"; <del> version = "unstable-2022-01-02"; </del> <ins> version = "1.3-unstable-2022-01-02"; </ins> src = fetchFromGitHub { owner = "linleyh"; <del> repo = pname; </del> <ins> repo = "liberation-circuit"; </ins> rev = "19e3363547793e931fd9419b61ebc2cd8e257714"; <del> sha256 = "zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY="; </del> <ins> hash = "sha256-zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY="; </ins> }; <del> nativeBuildInputs = [ pkg-config makeWrapper ]; </del> <ins> nativeBuildInputs = [ pkg-config wrapGAppsHook ]; </ins> buildInputs = [ allegro5 libGL ]; <ins> dontWrapGApps = true; </ins> installPhase = '' runHook preInstall mkdir -p $out/opt cp -r bin $out/opt/liberation-circuit chmod +x $out/opt/liberation-circuit/launcher.sh <del> makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit </del> install -D linux-packaging/liberation-circuit.desktop $out/share/applications/liberation-circuit.desktop install -D linux-packaging/liberation-circuit.appdata.xml $out/share/metainfo/liberation-circuit.appdata.xml


makeWrapper ${python3Packages.python.interpreter} $out/bin/onedrivegui  --prefix PATH : ${lib.makeBinPath [ onedrive ]}  <del> --prefix PYTHONPATH : ${python3Packages.makePythonPath (propagatedBuildInputs ++ [(placeholder "out")])}  </del> <ins> --prefix PYTHONPATH : ${ python3Packages.makePythonPath (propagatedBuildInputs ++ [ (placeholder "out") ]) }  </ins> --add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py '';


] ++ lib.optionals stdenv.targetPlatform.isiOS [ autoreconfHook ]; <del> buildInputs = [ zlib ]; </del> <ins> buildInputs = [ zlib gettext ]; </ins> inherit noSysDirs;


<del> { lib, stdenv, fetchFromGitHub </del> <ins> { lib, stdenv, fetchFromGitHub, fetchpatch </ins> , doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which , systemd }: <del> let version = "2019-12-08"; in stdenv.mkDerivation { </del> <ins> stdenv.mkDerivation rec { </ins> pname = "openzwave"; <del> inherit version; </del> <ins> version = "1.6"; </ins> <del> # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw. # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference. </del> src = fetchFromGitHub { <del> owner = "home-assistant"; </del> <ins> owner = "OpenZWave"; </ins> repo = "open-zwave"; <del> rev = "2cd2137025c529835e4893a7b87c3d56605b2681"; sha256 = "04g8fb4f4ihakvvsmzcnncgfdd2ikmki7s22i9c6layzdwavbwf1"; </del> <ins> rev = "v${version}"; sha256 = "0xgs4mmr0480c269wx9xkk67ikjzxkh8xcssrdx0f5xcl1lyd333"; </ins> }; <ins> patches = [ (fetchpatch { name = "fix-strncat-build-failure.patch"; url = "https://github.com/OpenZWave/open-zwave/commit/601e5fb16232a7984885e67fdddaf5b9c9dd8105.patch"; sha256 = "1n1k5arwk1dyc12xz6xl4n8yw28vghzhv27j65z1nca4zqsxgza1"; }) (fetchpatch { name = "fix-text-uninitialized.patch"; url = "https://github.com/OpenZWave/open-zwave/commit/3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f.patch"; sha256 = "183mrzjh1zx2b2wzkj4jisiw8br7g7bbs167afls4li0fm01d638"; }) ]; outputs = [ "out" "doc" ]; </ins> nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ]; buildInputs = [ systemd ];


<del> { lib, buildGoModule, fetchFromGitHub }: </del> <ins> { lib, buildGoModule, fetchFromGitHub, fetchzip }: </ins> buildGoModule rec { pname = "mutagen";


, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand <ins> , libunity </ins> , wayland , branch , common-updater-scripts, withOpenASAR ? false }:


hackage = [ http://hackage.haskell.org/package/ http://hdiff.luite.com/packages/archive/package/ <ins> http://hackage.fpcomplete.com/package/ http://objects-us-east-1.dream.io/hackage-mirror/package/ </ins> ]; # Roy marples mirrors


substituteInPlace variety_lib/varietyconfig.py  --replace "__variety_data_directory__ = "../data""  "__variety_data_directory__ = "$out/share/variety"" <del> substituteInPlace data/scripts/set_wallpaper  --replace /bin/bash ${runtimeShell} substituteInPlace data/scripts/get_wallpaper  --replace /bin/bash ${runtimeShell} </del> <ins> substituteInPlace variety/VarietyWindow.py  --replace '[script,' '["${runtimeShell}", script,'  --replace 'check_output(script)' 'check_output(["${runtimeShell}", script])' </ins> ''; meta = with lib; {


type = types.attrsOf types.str; description = "Extra environment variables to pass to the Garage server."; default = { }; <del> example = { RUST_BACKTRACE = "yes"; }; </del> <ins> example = { RUST_BACKTRACE = "yes"; }; </ins> }; environmentFile = mkOption {


hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs="; }; <ins> patches = [ # Load modules from path in `NIX_GNOME_PANEL_MODULESDIR` environment variable # instead of gnome-panel’s libdir so that the NixOS module can make gnome-panel # load modules from other packages as well. ./modulesdir-env-var.patch ]; </ins> # make .desktop Exec absolute postPatch = '' patch -p0 <<END_PATCH


buildInputs = [ dbus <ins> systemd </ins> dconf gdk-pixbuf gobject-introspection python3.pkgs.pygobject3 # for pygobject overrides gtk2 gtk3 <ins> gtk4 </ins> isocodes json-glib libnotify


}; nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; <del> buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; </del> <ins> buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; </ins> # to generate makefile.in autoreconfPhase = ''