jiebi/CodeConvo huggingface dataset:
path = registry_info["path"] packageToml = toml.load(registry_path / path / "Package.toml") <del> all_versions = toml.load(registry_path / path / "Versions.toml") </del> <ins> versions_toml = registry_path / path / "Versions.toml" all_versions = toml.load(versions_toml) </ins> if not pkg["version"] in all_versions: continue version_to_use = all_versions[pkg["version"]] <ins> if not "nix-sha256" in version_to_use: raise KeyError(f"""Couldn't find nix-sha256 hash for {pkg["name"]} {pkg["version"]} in {versions_toml}. This might indicate that we failed to prefetch the hash when computing the augmented registry. Was there a relevant failure in {registry_path / "failures.yml"}?""") </ins> repo = packageToml["repo"] f.write(f"""  "{uuid}" = {{ src = fetchgit {{
fetchFromGitHub { owner = "CodeDownIO"; repo = "General"; <del> rev = "baf9e22ecdf97b6424a611ac4a565c6ee60d3f44"; sha256 = "1nd3x2z8r6578149pbpkx9qw2ajln1kfy7w5kjsnv56v180h0ddf"; # date = "2023-12-14T12:20:00+00:00"; </del> <ins> rev = "de80ad56e87f222ca6a7a517c69039d35437ab42"; sha256 = "0pz1jmmcb2vn854w8w0zlpnihi470649cd8djh1wzgq2i2fy83bl"; # date = "2023-12-22T03:28:12+00:00"; </ins> }
<ins> { stdenv , fetchFromGitHub , cmake , zlib , gmp , cryptominisat , boost , arjun-cnf , louvain-community , lib }: stdenv.mkDerivation (finalAttrs: { pname = "approxmc"; version = "4.1.23"; src = fetchFromGitHub { owner = "meelgroup"; repo = "approxmc"; rev = finalAttrs.version; hash = "sha256-pE2m6Cc2u53H/5CM+2JuQxZOhjhHUZOi0kn23CJmALM="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib gmp cryptominisat boost arjun-cnf louvain-community ]; meta = with lib; { description = "Approximate Model Counter"; homepage = "https://github.com/meelgroup/approxmc"; license = licenses.mit; maintainers = with maintainers; [ t4ccer ]; platforms = platforms.linux; mainProgram = "approxmc"; }; }) </ins>
<ins> diff --git a/src/arjun.cpp b/src/arjun.cpp index d6ad786..119a267 100644 --- a/src/arjun.cpp +++ b/src/arjun.cpp @@ -98,6 +98,11 @@ DLL_PUBLIC bool Arjun::add_clause(const vector<CMSat::Lit>& lits) return arjdata->common.solver->add_clause(lits); } +DLL_PUBLIC bool Arjun::add_red_clause(const vector<CMSat::Lit>& lits) +{ +    return arjdata->common.solver->add_red_clause(lits); +} + DLL_PUBLIC bool Arjun::add_xor_clause(const vector<uint32_t>& vars, bool rhs) { assert(false && "Funnily enough this does NOT work. The XORs would generate a BVA variable, and that would then not be returned as part of the simplified CNF. We could calculate a smaller independent set, but that's all."); diff --git a/src/arjun.h b/src/arjun.h index a39070c..907472a 100644 --- a/src/arjun.h +++ b/src/arjun.h @@ -61,6 +61,7 @@ namespace ArjunNS { void new_var(); bool add_xor_clause(const std::vector<uint32_t>& vars, bool rhs); bool add_clause(const std::vector<CMSat::Lit>& lits); +        bool add_red_clause(const std::vector<CMSat::Lit>& lits); bool add_bnn_clause( const std::vector<CMSat::Lit>& lits, signed cutoff, </ins>
<ins> { stdenv , fetchFromGitHub , fetchpatch , cmake , cryptominisat , boost , louvain-community , lib }: stdenv.mkDerivation (finalAttrs: { pname = "arjun-cnf"; version = "2.5.2"; src = fetchFromGitHub { owner = "meelgroup"; repo = "arjun"; rev = finalAttrs.version; hash = "sha256-5duc05s654HLjbf+dPgyMn6QUVvB0vLji3M4S2o/QYU="; }; # Can be removed after next release patches = [ (fetchpatch { url = "https://github.com/meelgroup/arjun/commit/34188760f1ab4b1b557c45ccaee8d2b9b6f0b901.patch"; hash = "sha256-E/yk2ohHP2BAFg353r8EU01bZCqeEjvpJCrBsxPiOWM="; }) # Based on https://github.com/meelgroup/arjun/commit/99c4ed4ad820674632c5d9bbcc98c001f8cac98f ./fix-red-clause.patch ]; nativeBuildInputs = [ cmake ]; buildInputs = [ boost cryptominisat louvain-community ]; meta = with lib; { description = "CNF minimizer and minimal independent set calculator"; homepage = "https://github.com/meelgroup/arjun"; license = licenses.mit; maintainers = with maintainers; [ t4ccer ]; platforms = platforms.linux; mainProgram = "arjun"; }; }) </ins>
<ins> { stdenv , fetchFromGitHub , cmake , lib }: stdenv.mkDerivation (finalAttrs: { pname = "louvain-community"; version = "unstable-2021-03-18"; src = fetchFromGitHub { owner = "meelgroup"; repo = "louvain-community"; rev = "8cc5382d4844af127b1c1257373740d7e6b76f1e"; hash = "sha256-0i3wrDdOyleOPv5iVO1YzPfTPnIdljLabCvl3SYEQOs="; }; nativeBuildInputs = [ cmake ]; meta = with lib; { description = "Louvain Community Detection Library"; homepage = "https://github.com/meelgroup/louvain-community"; license = licenses.lgpl3Only; maintainers = with maintainers; [ t4ccer ]; platforms = platforms.unix; }; }) </ins>
odin = callPackage ../development/compilers/odin { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; <ins> llvmPackages = llvmPackages_18; </ins> }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
them, it undoes the --set-rpath.  this prevents that. */ dontPatchELF = true; <ins> # fortify hardening makes the filter crash # https://github.com/NixOS/nixpkgs/issues/276125 hardeningDisable = [ "fortify3" ]; </ins> meta = with lib; { description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series.  (MP520 drivers also work for MX700.)"; homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html";
<p align="center"> <del> <a href="https://nixos.org#gh-light-mode-only"> <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/master/logo/nixos-hires.png" width="500px" alt="NixOS logo"/> </a> <a href="https://nixos.org#gh-dark-mode-only"> <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png" width="500px" alt="NixOS logo"/> </del> <ins> <a href="https://nixos.org"> <picture> <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/master/logo/nixos-hires.png"> <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png"> <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/master/logo/nixos-hires.png" width="500px" alt="NixOS logo"> </picture> </ins> </a> </p>
<ins> { lib, stdenv, fetchFromGitHub, makeWrapper, nodejs, overrideSDK, pnpm_9, python3, renovate, testers, xcbuild, }: let # fix build error, `no member named 'aligned_alloc'` on x86_64-darwin # https://github.com/NixOS/nixpkgs/issues/272156#issuecomment-1839904283 stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; version = "37.393.0"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-YgxcGNMgmwrausdR7kvG1NiyQPn0FcCq/isf9qUDCFY="; }; postPatch = '' substituteInPlace package.json  --replace-fail "0.0.0-semantic-release" "${finalAttrs.version}" ''; nativeBuildInputs = [ makeWrapper nodejs pnpm_9.configHook python3 ] ++ lib.optional stdenv'.hostPlatform.isDarwin xcbuild; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-Zbe561q6xDKDIN+E/2eyQMz2GtpPvJEv2pAauMa+8pE="; }; env.COREPACK_ENABLE_STRICT = 0; buildPhase = '' runHook preBuild pnpm build pnpm prune --prod --ignore-scripts '' # The optional dependency re2 is not built by pnpm and needs to be built manually. # If re2 is not built, you will get an annoying warning when you run renovate. + '' pushd node_modules/.pnpm/re2*/node_modules/re2 mkdir -p $HOME/.node-gyp/${nodejs.version} echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} export npm_config_nodedir=${nodejs} npm run rebuild popd runHook postBuild ''; # TODO: replace with `pnpm deploy` # now it fails to build with ERR_PNPM_NO_OFFLINE_META # see https://github.com/pnpm/pnpm/issues/5315 installPhase = '' runHook preInstall mkdir -p $out/{bin,lib/node_modules/renovate} cp -r dist node_modules package.json $out/lib/node_modules/renovate makeWrapper "${lib.getExe nodejs}" "$out/bin/renovate"  --add-flags "$out/lib/node_modules/renovate/dist/renovate.js" makeWrapper "${lib.getExe nodejs}" "$out/bin/config-validator"  --add-flags "$out/lib/node_modules/renovate/dist/config-validator.js" runHook postInstall ''; passthru.tests = { version = testers.testVersion { package = renovate; }; }; meta = { description = "Cross-platform Dependency Automation by Mend.io"; homepage = "https://github.com/renovatebot/renovate"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ marie natsukium ]; mainProgram = "renovate"; platforms = nodejs.meta.platforms; }; }) </ins>
buildPythonApplication rec { pname = "nixops"; <del> version = "unstable-2023-10-26"; </del> <ins> version = "unstable-2023-12-17"; </ins> pyproject = true; src = fetchFromGitHub { owner = "NixOS"; repo = "nixops"; <del> rev = "2cfc2cb4fa9ecb89a4274574ff7f63ea61782498"; hash = "sha256-4uvQQkERZFEeRJjMAcyLYJzNvH0rNiiJ+5BDQmD58gI="; </del> <ins> rev = "053668e849bb369973cf265b7e8f38e66ef70138"; hash = "sha256-Kus1Ls1tT8fVGLX0NakRXmjuz5/J/tfqU4TLOkiZqvo="; </ins> }; postPatch = ''
}: buildPythonApplication rec { pname = "visidata"; <del> version = "2.11.1"; </del> <ins> version = "3.0"; </ins> src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; <del> hash = "sha256-A8iYFdW30Em5pjGn3DRpaV0A7ixwfSzmIp8AgtPkBCI="; </del> <ins> hash = "sha256-LALWQu7BgMbAEyOXUE3p6bXhdx8h6jPEvjs/TEtf/wU=="; </ins> }; propagatedBuildInputs = [
checkPhase = '' runHook preCheck # disable some tests which require access to the network rm -f tests/load-http.vd            # http rm -f tests/graph-cursor-nosave.vd  # http rm -f tests/messenger-nosave.vd     # dns <ins> # tests to disable because we don't have a package to load such files rm -f tests/load-conllu.vdj         # no 'pyconll' rm -f tests/load-sav.vd             # no 'savReaderWriter' </ins> # tests use git to compare outputs to references git init -b "test-reference" git config user.name "nobody"
}) (disableCabalFlag "fixity-th" super.fourmolu); # https://github.com/NixOS/nixpkgs/issues/149692 <del> Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; </del> <ins> Agda = disableCabalFlag "optimise-heavily" super.Agda; </ins> } // lib.optionalAttrs pkgs.stdenv.isx86_64 {  # x86_64-darwin
preCheck = "export CI=true"; }) super.aeson-typescript; <del> # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. # Flag added in Agda 2.6.2 Agda = appendConfigureFlag "-foptimise-heavily" super.Agda; </del> <ins> Agda = lib.pipe super.Agda [ # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. # Flag added in Agda 2.6.2 (enableCabalFlag "optimise-heavily") # Enable debug printing, which worsens performance slightly but is # very useful. # Flag added in Agda 2.6.4.1, was always enabled before (enableCabalFlag "debug") ]; </ins> # ats-format uses cli-setup in Setup.hs which is quite happy to write # to arbitrary files in $HOME. This doesn't either not achieve anything
hash = "sha256-0U6s6sXdynk2IWRBDXBJCf7Gc+gE8AhR1PXZl0DS4yU="; }; <del> # We don't need anything in support; avoid installing LICENSE.agda </del> postPatch = '' <ins> # We don't need anything in support; avoid installing LICENSE.agda </ins> rm -rf support <ins> # Remove verbosity options as they make Agda take longer and use more memory. shopt -s globstar extglob sed -Ei '/OPTIONS/s/ -v ?[^ #]+//g' src/**/*.@(agda|lagda.md) </ins> ''; libraryName = "1lab";
stdenv.mkDerivation rec { pname = "brlcad"; <del> version = "7.34.2"; </del> <ins> version = "7.38.2"; </ins> src = fetchFromGitHub { owner = "BRL-CAD"; <del> repo = pname; </del> <ins> repo = "brlcad"; </ins> rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; <del> hash = "sha256-oafu255xElEIk8p4yvNyR2maykUfxQui/L5MkicA+JA="; </del> <ins> hash = "sha256-23UTeH4gY2x/QGYZ64glAkf6LmsXBAppIOHgoUdxgpo="; </ins> }; <ins> patches = [ # This commit was bringing an impurity in the rpath resulting in: # RPATH of binary /nix/store/rq2hjvfgq2nvh5zxch51ij34rqqdpark-brlcad-7.38.0/bin/tclsh contains a forbidden reference to /build/ (fetchpatch { url = "https://github.com/BRL-CAD/brlcad/commit/fbdbf042b2db4c7d46839a17bbf4985cdb81f0ae.patch"; revert = true; hash = "sha256-Wfihd7TLkE8aOpLdDtYmhhd7nZijiVGh1nbUjWr/BjQ="; }) ]; </ins> nativeBuildInputs = [ cmake ];
"-DBRLCAD_ENABLE_STRICT=OFF" ]; <ins> env.NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=array-bounds" ]; </ins> meta = with lib; { homepage = "https://brlcad.org"; description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system"; <ins> changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${src.rev}"; </ins> license = with licenses; [ lgpl21 bsd2 ]; maintainers = with maintainers; [ GaetanLepage ]; platforms = platforms.linux; <ins> # error Exactly one of ON_LITTLE_ENDIAN or ON_BIG_ENDIAN should be defined. broken = stdenv.system == "aarch64-linux"; </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> - `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information. </ins> - `k3s` was updated to [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2). See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information. - `k9s` was updated to v0.31. There have been various breaking changes in the config file format,
<ins> { lib , stdenv , fetchzip }: stdenv.mkDerivation (finalAttrs: { pname = "unrar"; version = "7.0.7"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; hash = "sha256-S7BMywydetDh1GINcK3k3fN9ciDoKTCAe/1tkgykoAQ="; }; sourceRoot = finalAttrs.src.name; postPatch = '' substituteInPlace unrar/makefile  --replace "CXX=" "#CXX="  --replace "STRIP=" "#STRIP="  --replace "AR=" "#AR=" ''; outputs = [ "out" "dev" ]; # `make {unrar,lib}` call `make clean` implicitly # separate build into different dirs to avoid deleting them buildPhase = '' runHook preBuild cp -a unrar libunrar make -C libunrar lib make -C unrar -j1 runHook postBuild ''; installPhase = '' runHook preInstall install -Dm755 unrar/unrar -t $out/bin/ install -Dm644 unrar/{acknow.txt,license.txt} -t $out/share/doc/unrar/ install -Dm755 libunrar/libunrar.so -t $out/lib/ install -Dm644 libunrar/dll.hpp -t $dev/include/unrar/ runHook postInstall ''; setupHook = ./setup-hook.sh; meta = with lib; { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; mainProgram = "unrar"; maintainers = with maintainers; [ wegank ]; platforms = platforms.all; }; }) </ins>
<ins> { unrar , fetchzip }: unrar.overrideAttrs (finalAttrs: _: { version = "6.2.12"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; hash = "sha256-VAL3o9JGmkAcEssa/P/SL9nyxnigb7dX9YZBHrG9f0A="; }; sourceRoot = finalAttrs.src.name; }) </ins>
<del> { lib , stdenv , fetchzip }: stdenv.mkDerivation (finalAttrs: { pname = "unrar"; version = "6.2.12"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; hash = "sha256-VAL3o9JGmkAcEssa/P/SL9nyxnigb7dX9YZBHrG9f0A="; }; sourceRoot = finalAttrs.src.name; postPatch = '' substituteInPlace unrar/makefile  --replace "CXX=" "#CXX="  --replace "STRIP=" "#STRIP="  --replace "AR=" "#AR=" ''; outputs = [ "out" "dev" ]; # `make {unrar,lib}` call `make clean` implicitly # separate build into different dirs to avoid deleting them buildPhase = '' runHook preBuild cp -a unrar libunrar make -C libunrar lib make -C unrar -j1 runHook postBuild ''; installPhase = '' runHook preInstall install -Dm755 unrar/unrar -t $out/bin/ install -Dm644 unrar/{acknow.txt,license.txt} -t $out/share/doc/unrar/ install -Dm755 libunrar/libunrar.so -t $out/lib/ install -Dm644 libunrar/dll.hpp -t $dev/include/unrar/ runHook postInstall ''; setupHook = ./setup-hook.sh; meta = with lib; { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; mainProgram = "unrar"; maintainers = with maintainers; [ wegank ]; platforms = platforms.all; }; }) </del>
''; nativeBuildInputs = [ autoreconfHook ]; <del> buildInputs = [ fuse unrar ]; </del> <ins> buildInputs = [ fuse unrar_6 ]; </ins> configureFlags = [ <del> "--with-unrar=${unrar.src}/unrar" </del> <ins> "--with-unrar=${unrar_6.src}/unrar" </ins> "--disable-static-unrar" ];
unnaturalscrollwheels = callPackage ../tools/inputmethods/unnaturalscrollwheels { }; <del> unrar = callPackage ../tools/archivers/unrar { }; </del> unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; uptime-kuma = callPackage ../servers/monitoring/uptime-kuma { };
<del> { lib , stdenv , clangStdenv , darwin , xcbuild , openssl , pkg-config , rustPlatform , fetchFromGitHub }: rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "crunchy-cli"; version = "3.0.0-dev.10"; src = fetchFromGitHub { owner = "crunchy-labs"; repo = pname; rev = "v${version}"; hash = "sha256-uc19SmVfa5BZYDidlEgV6GNvcm9Dj0mSjdwHP5S+O4A="; }; cargoHash = "sha256-H3D55qMUAF6t45mRbGZl+DORAl1H1a7AOe+lQP0WUUQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "A pure Rust written Crunchyroll cli client and downloader"; homepage = "https://github.com/crunchy-labs/crunchy-cli"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ stepbrobd ]; mainProgram = "crunchy-cli"; }; } </del>
<ins> { lib , stdenv , darwin , fetchFromGitHub , openssl , pkg-config , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "crunchy-cli"; version = "3.2.5"; src = fetchFromGitHub { owner = "crunchy-labs"; repo = "crunchy-cli"; rev = "v${version}"; hash = "sha256-hzmTwUd+bQwr+5UtXKMalJZUDxOC5nhXNTXbYZN8xtA="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "native-tls-0.2.11" = "sha256-+NeXsxuThKNOzVLBItKcuTAM/0zR/BzJGMKkuq99gBM="; }; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { OPENSSL_NO_VENDOR = true; }; meta = with lib; { description = "Command-line downloader for Crunchyroll"; homepage = "https://github.com/crunchy-labs/crunchy-cli"; license = licenses.mit; maintainers = with maintainers; [ stepbrobd ]; mainProgram = "crunchy-cli"; }; } </ins>
''; }; <ins> fixedRandomDelay = mkOption { default = false; type = types.bool; example = true; description = lib.mdDoc '' Make the randomized delay consistent between runs. This reduces the jitter between automatic upgrades. See {option}`randomizedDelaySec` for configuring the randomized delay. ''; }; </ins> rebootWindow = mkOption { description = lib.mdDoc '' Define a lower and upper time value (in HH:MM format) which
stdenv.mkDerivation rec { pname = "limesurvey"; <del> version = "6.1.2+230606"; </del> <ins> version = "6.4.1+240108"; </ins> src = fetchFromGitHub { owner = "LimeSurvey"; repo = "LimeSurvey"; rev = version; <del> hash = "sha256-a89Kdr9XV1TSCoWxYrU0j8ec7rAcIlU/bgLtRjdzqbg="; </del> <ins> hash = "sha256-Cpf8X6igF7LdRbFihGudFmx/8aY0Kf0BE7jHnEF1DYA="; </ins> }; phpConfig = writeText "config.php" ''
# around it, we force the path to the cfgFile. # # https://github.com/NixOS/nixpkgs/issues/121088 <del> serviceConfig.ExecStart = [ "" "${getBin package}/bin/pcscd -f -x -c ${cfgFile}" ]; </del> <ins> serviceConfig.ExecStart = [ "" "${package}/bin/pcscd -f -x -c ${cfgFile}" ]; </ins> }; }; }
cp tool/target/gp.jar "$out/share/java" makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp"  --add-flags "-jar '$out/share/java/gp.jar'"  <del> --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" </del> <ins> --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib" </ins> ''; meta = with lib; {
(lib.enableFeature polkitSupport "polkit") ] ++ lib.optionals stdenv.isLinux [ "--enable-ipcdir=/run/pcscd" <del> "--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system" </del> <ins> "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" </ins> ]; makeFlags = [
<ins> { lib , buildGo122Module , fetchFromGitHub , openssl }: buildGo122Module rec { pname = "ssh-tpm-agent"; version = "0.3.1"; src = fetchFromGitHub { owner = "Foxboron"; repo = "ssh-tpm-agent"; rev = "v${version}"; hash = "sha256-8CGSiCOcns4cWkYWqibs6hAFRipYabKPCpkhxF4OE8w="; }; proxyVendor = true; vendorHash = "sha256-zUAIesBeuh1zlxXcjKSNmMawZGgUr9z3NzT0XKn/YCQ="; buildInputs = [ openssl ]; meta = with lib; { description = "SSH agent with support for TPM sealed keys for public key authentication"; homepage = "https://github.com/Foxboron/ssh-agent-tpm"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ sgo ]; mainProgram = "ssh-tpm-agent"; }; } </ins>
, withVoAmrwbenc ? withFullDeps # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding <del> , withVulkan ? withFullDeps && !stdenv.isDarwin </del> <ins> , withVulkan ? withSmallDeps && !stdenv.isDarwin </ins> , withWebp ? withFullDeps # WebP encoder , withX264 ? withHeadlessDeps # H.264/AVC encoder , withX265 ? withHeadlessDeps # H.265/HEVC encoder
postFixup = optionalString (stdenv.isLinux && withLib) '' addOpenGLRunpath ${placeholder "lib"}/lib/libavcodec.so addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so <ins> '' # https://trac.ffmpeg.org/ticket/10809 + optionalString (versionAtLeast version "5.0" && withVulkan) '' patchelf $lib/lib/libavcodec.so --add-needed libvulkan.so --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} </ins> ''; enableParallelBuilding = true;
<del> { lowPrio, newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: </del> <ins> { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun , darwin }: </ins> let callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
extraPackages = [ self.libcxx self.libcxxabi ]; }; <del> stdenv = overrideCC stdenv self.clang; </del> <ins> stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; # Use the gcc libstdc++ when targeting linux. extraBuildInputs = if stdenv.cc.isGNU then [ libstdcxxHook ] else drv.extraBuildInputs; }); </ins> libcxxStdenv = overrideCC stdenv self.libcxxClang;
gccApple = throw "gccApple is no longer supported"; <ins> libstdcxxHook = makeSetupHook { substitutions = { gcc = gcc-unwrapped; }; } ../development/compilers/gcc/libstdc++-hook.sh; </ins> # Can't just overrideCC, because then the stdenv-cross mkDerivation will be # thrown away. TODO: find a better solution for this. crossLibcStdenv = buildPackages.makeStdenvCross {