jiebi/CodeConvo huggingface dataset:
<ins> { lib, stdenv, fetchFromGitHub, substituteAll, gradle_7, perl, makeWrapper, jre, }: stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; version = "0.22.3"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; hash = "sha256-8zXTapFAXw4+KLLirxBeEBmqNw6ILFHtbsaBSP3Ehyg="; }; patches = [ # disable spotless because it tries to fetch files not in the FOD # and also because it slows down the build process ./disable-spotless.patch # remove timestamp from the header of a generated .properties file ./remove-props-file-timestamp.patch # use gradle's built-in method of zeroing out timestamps, # because stripJavaArchivesHook can't patch signed JAR files ./fix-jar-timestamp.patch # set the FOD as the only repository gradle can resolve from (substituteAll { src = ./use-fod-maven-repo.patch; inherit (finalAttrs) deps; }) ]; # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { name = "${finalAttrs.pname}-${finalAttrs.version}-deps"; inherit (finalAttrs) src; patches = [ ./disable-spotless.patch ]; nativeBuildInputs = [ gradle_7 perl ]; buildPhase = '' runHook preBuild export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon --console=plain build runHook postBuild ''; # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) installPhase = '' runHook preInstall find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*.(jar|pom)'  | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/s]+))$# ($x = $2) =~ tr|.|/|; "install -Dm444 $1 $out/$x/$3/$4/$5" #e'  | sh # Mimic existence of okio-3.6.0.jar, originally known as okio-jvm-3.6.0 (and renamed). # Gradle doesn't detect such renames and only fetches the latter. # Whenever this package gets updated, please check if this hack is obsolete. ln -s $out/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar $out/com/squareup/okio/okio/3.6.0/okio-3.6.0.jar runHook postInstall ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = "sha256-zUzKSa7zuIoXE77Hk/Xr5iMF4CEumV9horW2BTFRdtE="; }; nativeBuildInputs = [ gradle_7 makeWrapper ]; buildPhase = '' runHook preBuild export GRADLE_USER_HOME=$(mktemp -d) gradle --offline --no-daemon --console=plain build runHook postBuild ''; installPhase = '' runHook preInstall install -Dm644 build/libs/Stirling-PDF-*.jar $out/share/stirling-pdf/Stirling-PDF.jar makeWrapper ${jre}/bin/java $out/bin/Stirling-PDF  --add-flags "-jar $out/share/stirling-pdf/Stirling-PDF.jar" runHook postInstall ''; meta = { changelog = "https://github.com/Stirling-Tools/Stirling-PDF/releases/tag/${finalAttrs.src.rev}"; description = "A locally hosted web application that allows you to perform various operations on PDF files"; homepage = "https://github.com/Stirling-Tools/Stirling-PDF"; license = lib.licenses.gpl3Only; mainProgram = "Stirling-PDF"; maintainers = with lib.maintainers; [ tomasajt ]; platforms = jre.meta.platforms; sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode # deps ]; }; }) </ins>
<ins> diff --git a/build.gradle b/build.gradle index e12cbd3..094a219 100644 --- a/build.gradle +++ b/build.gradle @@ -173,6 +173,7 @@ task writeVersion { def props = new Properties() props.setProperty('version', version) props.store(propsFile.newWriter(), null) +    propsFile.text = propsFile.readLines().tail().join('n') } swaggerhubUpload { </ins>
<ins> diff --git a/build.gradle b/build.gradle index c206e2f..cdaddf7 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ version = '0.22.3' sourceCompatibility = '17' repositories { -    mavenCentral() +    maven { url '@deps@' } } diff --git a/settings.gradle b/settings.gradle index f813993..2c87f3c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,7 @@ +pluginManagement { +    repositories { +        maven { url '@deps@' } +    } +} + rootProject.name = 'Stirling-PDF' </ins>
# MKL: , mklSupport ? true <del> }: </del> <ins> }@inputs: </ins> let <del> inherit (cudaPackagesGoogle) backendStdenv cudatoolkit cudaFlags cudnn nccl; </del> <ins> inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaFlags cudaVersion cudnn nccl; </ins> pname = "jaxlib"; version = "0.4.24"; <ins> # It's necessary to consistently use backendStdenv when building with CUDA # support, otherwise we get libstdc++ errors downstream stdenv = throw "Use effectiveStdenv instead"; effectiveStdenv = if cudaSupport then cudaPackagesGoogle.backendStdenv else inputs.stdenv; </ins> meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; homepage = "https://github.com/google/jax";
# however even with that fix applied, it doesn't work for everyone: # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129 # NOTE: We always build with NCCL; if it is unsupported, then our build is broken. <del> broken = stdenv.isDarwin || nccl.meta.unsupported; </del> <ins> broken = effectiveStdenv.isDarwin || nccl.meta.unsupported; </ins> }; <del> cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-merged"; paths = [ cudatoolkit.lib cudatoolkit.out ] ++ lib.optionals (lib.versionOlder cudatoolkit.version "11") [ # for some reason some of the required libs are in the targets/x86_64-linux # directory; not sure why but this works around it "${cudatoolkit}/targets/${stdenv.system}" </del> <ins> # These are necessary at build time and run time. cuda_libs_joined = symlinkJoin { name = "cuda-joined"; paths = with cudaPackagesGoogle; [ cuda_cudart.lib # libcudart.so cuda_cudart.static # libcudart_static.a cuda_cupti.lib # libcupti.so libcublas.lib # libcublas.so libcufft.lib # libcufft.so libcurand.lib # libcurand.so libcusolver.lib # libcusolver.so libcusparse.lib # libcusparse.so ]; }; # These are only necessary at build time. cuda_build_deps_joined = symlinkJoin { name = "cuda-build-deps-joined"; paths = with cudaPackagesGoogle; [ cuda_libs_joined # Binaries cudaPackagesGoogle.cuda_nvcc.bin # nvcc # Headers cuda_cccl.dev # block_load.cuh cuda_cudart.dev # cuda.h cuda_cupti.dev # cupti.h cuda_nvcc.dev # See https://github.com/google/jax/issues/19811 cuda_nvml_dev # nvml.h cuda_nvtx.dev # nvToolsExt.h libcublas.dev # cublas_api.h libcufft.dev # cufft.h libcurand.dev # curand.h libcusolver.dev # cusolver_common.h libcusparse.dev # cusparse.h </ins> ]; }; <del> cudatoolkit_cc_joined = symlinkJoin { name = "${cudatoolkit.cc.name}-merged"; </del> <ins> backend_cc_joined = symlinkJoin { name = "cuda-cc-joined"; </ins> paths = [ <del> backendStdenv.cc </del> <ins> effectiveStdenv.cc </ins> binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip ]; };
arch = # KeyError: ('Linux', 'arm64') <del> if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.linuxArch == "arm64" then "aarch64" else stdenv.hostPlatform.linuxArch; </del> <ins> if effectiveStdenv.hostPlatform.isLinux && effectiveStdenv.hostPlatform.linuxArch == "arm64" then "aarch64" else effectiveStdenv.hostPlatform.linuxArch; xla = effectiveStdenv.mkDerivation { pname = "xla-src"; version = "unstable"; src = fetchFromGitHub { owner = "openxla"; repo = "xla"; # Update this according to https://github.com/google/jax/blob/jaxlib-v${version}/third_party/xla/workspace.bzl. rev = "12eee889e1f2ad41e27d7b0e970cb92d282d3ec5"; hash = "sha256-68kjjgwYjRlcT0TVJo9BN6s+WTkdu5UMJqQcfHpBT90="; }; patches = [ # Resolves "could not convert ‘result’ from ‘SmallVector<[...],6>’ to # ‘SmallVector<[...],4>’" compilation error. See https://github.com/google/jax/issues/19814#issuecomment-1945141259. (fetchpatch { url = "https://github.com/openxla/xla/commit/7a614cd346594fc7ea2fe75570c9c53a4a444f60.patch"; hash = "sha256-RtuQTH8wzNiJcOtISLhf+gMlH1gg8hekvxEB+4wX6BM="; }) ]; dontBuild = true; # This is necessary for patchShebangs to know the right path to use. nativeBuildInputs = [ python ]; # Main culprits we're targeting are third_party/tsl/third_party/gpus/crosstool/clang/bin/*.tpl postPatch = '' patchShebangs . ''; installPhase = '' cp -r . $out ''; }; </ins> bazel-build = buildBazelPackage rec { name = "bazel-build-${pname}-${version}";
six snappy zlib <del> ] ++ lib.optionals cudaSupport [ cudatoolkit cudnn ] ++ lib.optionals stdenv.isDarwin [ </del> <ins> ] ++ lib.optionals effectiveStdenv.isDarwin [ </ins> IOKit <del> ] ++ lib.optionals (!stdenv.isDarwin) [ </del> <ins> ] ++ lib.optionals (!effectiveStdenv.isDarwin) [ </ins> nsync ]; <ins> # We don't want to be quite so picky regarding bazel version </ins> postPatch = '' rm -f .bazelversion '';
bazelTargets = [ bazelRunTarget "@mkl_dnn_v1//:mkl_dnn" ]; bazelFlags = bazelFlags ++ [ "--config=avx_posix" <ins> "--config=mkl_open_source_only" </ins> ] ++ lib.optionals cudaSupport [ # ideally we'd add this unconditionally too, but it doesn't work on darwin # we make this conditional on `cudaSupport` instead of the system, so that the hash for both # the cuda and the non-cuda deps can be computed on linux, since a lot of contributors don't # have access to darwin machines "--config=cuda" <del> ] ++ [ "--config=mkl_open_source_only" </del> ]; sha256 = (if cudaSupport then { <del> x86_64-linux = "sha256-c0avcURLAYNiLASjIeu5phXX3ze5TR812SW5SCG/iwk="; </del> <ins> x86_64-linux = "sha256-IEKoHjCOtKZKvU/DUUjbvXldORFJuyO1R3F6CZZDXxM="; </ins> } else { <del> x86_64-linux = "sha256-1hrQ9ehFy3vBJxKNUzi/T0l+eZxo26Th7i5VRd/9U+0="; aarch64-linux = "sha256-3QVYJOj1lNHgYVV9rOzVdfhq5q6GDwpcWCjKNrSZ4aU="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); </del> <ins> x86_64-linux = "sha256-IE4+Tk4llo85u3NjakvY04tPw4R1bidyecPpQ4gknR8="; aarch64-linux = "sha256-NehnpA4m+Fynvh0S6WKy/v9ab81487NE9ahvbS70wjY="; }).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); </ins> }; buildAttrs = { outputs = [ "out" ]; <del> TF_SYSTEM_LIBS = lib.concatStringsSep "," (tf_system_libs ++ lib.optionals (!stdenv.isDarwin) [ </del> <ins> TF_SYSTEM_LIBS = lib.concatStringsSep "," (tf_system_libs ++ lib.optionals (!effectiveStdenv.isDarwin) [ </ins> "nsync" # fails to build on darwin ]); <del> # Note: we cannot do most of this patching at `patch` phase as the deps are not available yet. # 1) Link protobuf from nixpkgs (through TF_SYSTEM_LIBS when using gcc) to prevent crashes on #    loading multiple extensions in the same python program due to duplicate protobuf DBs. # 2) Patch python path in the compiler driver. preBuild = lib.optionalString cudaSupport '' patchShebangs ../output/external/xla/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl '' + lib.optionalString stdenv.isDarwin '' # Framework search paths aren't added by bintools hook # https://github.com/NixOS/nixpkgs/pull/41914 </del> <ins> # Note: we cannot do most of this patching at `patch` phase as the deps # are not available yet. Framework search paths aren't added by bintools # hook. See https://github.com/NixOS/nixpkgs/pull/41914. preBuild = lib.optionalString effectiveStdenv.isDarwin '' </ins> export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl  --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool"
inherit meta; }; platformTag = <del> if stdenv.hostPlatform.isLinux then </del> <ins> if effectiveStdenv.hostPlatform.isLinux then </ins> "manylinux2014_${arch}" <del> else if stdenv.system == "x86_64-darwin" then </del> <ins> else if effectiveStdenv.system == "x86_64-darwin" then </ins> "macosx_10_9_${arch}" <del> else if stdenv.system == "aarch64-darwin" then </del> <ins> else if effectiveStdenv.system == "aarch64-darwin" then </ins> "macosx_11_0_${arch}" <del> else throw "Unsupported target platform: ${stdenv.hostPlatform}"; </del> <ins> else throw "Unsupported target platform: ${effectiveStdenv.hostPlatform}"; </ins> in buildPythonPackage {
let cp = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; in "${bazel-build}/jaxlib-${version}-${cp}-${cp}-${platformTag}.whl"; <del> # Note that cudatoolkit is necessary since jaxlib looks for "ptxas" in $PATH. # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for # more info. </del> <ins> # Note that jaxlib looks for "ptxas" in $PATH. See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 # for more info. </ins> postInstall = lib.optionalString cudaSupport '' mkdir -p $out/bin <del> ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas </del> <ins> ln -s ${cudaPackagesGoogle.cuda_nvcc.bin}/bin/ptxas $out/bin/ptxas </ins> find $out -type f ( -name '*.so' -or -name '*.so.*' ) | while read lib; do <del> addOpenGLRunpath "$lib" patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnn}/lib:${nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" </del> <ins> patchelf --add-rpath "${lib.makeLibraryPath [cuda_libs_joined cudnn nccl]}" "$lib" </ins> done ''; <del> nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; </del> <ins> nativeBuildInputs = lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ]; </ins> propagatedBuildInputs = [ absl-py
sha256 = "sha256-CS1A9udt47bhgnYJqqkCG3z4XaPVHmz417VTsY2ccOA="; }; <del> nativeBuildInputs = [ makeWrapper ]; buildInputs = [ which xdg-utils ]; </del> <ins> nativeBuildInputs = [ makeWrapper which xdg-utils ]; </ins> unpackPhase = '' mkdir -p phony-home $out/share/applications
rustPlatform.buildRustPackage rec { pname = "obs-livesplit-one"; <del> version = "0.2.0"; </del> <ins> version = "0.3.4"; </ins> src = fetchFromGitHub { <del> owner = "CryZe"; </del> <ins> owner = "LiveSplit"; </ins> repo = pname; rev = "v${version}"; <del> sha256 = "sha256-C1u4z7iQUETM84kf6S6obw+C0ox8J9gMJoVP3/3ZoYw="; </del> <ins> sha256 = "sha256-3B3P1PlzIlpVqHJMKWpEnWXGgD/IaiWM1FVKn0BtRj0="; </ins> }; <del> cargoHash = "sha256-mQ0TR4DL4bA5u4IL3RY9aLxU5G6qQ5W5xuNadiXGeB0="; </del> <ins> cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "livesplit-auto-splitting-0.1.0" = "sha256-/xQEVJH6m6nH5Z1kuOPEElOcOqJmiG9Q8cOx0e6p3Wc="; }; }; </ins> nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fontconfig obs-studio ];
meta = with lib; { description = "OBS Studio plugin for adding LiveSplit One as a source"; <del> homepage = "https://github.com/CryZe/obs-livesplit-one"; </del> <ins> homepage = "https://github.com/LiveSplit/obs-livesplit-one"; </ins> license = with licenses; [ asl20 mit ]; maintainers = [ maintainers.Bauke ]; platforms = obs-studio.meta.platforms;
Rosalie's Mupen GUI is a free and open-source mupen64plus front-end written in C++. It offers a simple-to-use user interface. ''; <del> license = licenses.gpl3; </del> <ins> license = if withAngrylionRdpPlus then licenses.unfree else licenses.gpl3Only; </ins> platforms = platforms.linux; mainProgram = "RMG"; maintainers = with maintainers; [ slam-bert ];
, enableSdl2 ? false, SDL2, SDL2_image, SDL2_sound, SDL2_mixer, SDL2_ttf }: <del> stdenv.mkDerivation rec { </del> <ins> stdenv.mkDerivation (finalAttrs: { </ins> pname = "angband"; version = "4.2.5"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; <del> rev = version; sha256 = "sha256-XH2FUTJJaH5TqV2UD1CKKAXE4CRAb6zfg1UQ79a15k0="; </del> <ins> rev = finalAttrs.version; hash = "sha256-XH2FUTJJaH5TqV2UD1CKKAXE4CRAb6zfg1UQ79a15k0="; </ins> }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses5 ] ++ lib.optionals enableSdl2 [
, gitUpdater }: <del> let </del> <ins> mkDerivation rec { </ins> pname = "gitqlient"; <del> version = "1.5.0"; </del> <ins> version = "1.6.2"; </ins> <del> main_src = fetchFromGitHub { </del> <ins> src = fetchFromGitHub { </ins> owner = "francescmm"; <del> repo = pname; </del> <ins> repo = "gitqlient"; </ins> rev = "v${version}"; <del> sha256 = "sha256-Mq29HbmPABrRIJjWC5AAKIOKbGngeJdkZkWeJw8BFuw="; }; aux_src = fetchFromGitHub rec { owner = "francescmm"; repo = "AuxiliarCustomWidgets"; rev = "835f538b4a79e4d6bb70eef37a32103e7b2a1fd1"; sha256 = "sha256-b1gb/7UcLS6lI92dBfTenGXA064t4dZufs3S9lu/lQA="; name = repo; }; qlogger_src = fetchFromGitHub rec { owner = "francescmm"; repo = "QLogger"; rev = "d1ed24e080521a239d5d5e2c2347fe211f0f3e4f"; sha256 = "sha256-NVlFYmm7IIkf8LhQrAYXil9kH6DFq1XjOEHQiIWmER4="; name = repo; }; qpinnabletab_src = fetchFromGitHub rec { owner = "francescmm"; repo = "QPinnableTabWidget"; rev = "cc937794e910d0452f0c07b4961c6014a7358831"; sha256 = "sha256-2KzzBv/s2t665axeBxWrn8aCMQQArQLlUBOAlVhU+wE="; name = repo; </del> <ins> fetchSubmodules = true; hash = "sha256-fHrsDEHEUgQYkZdnSzJ/+gTsV0eX8tOqSlr7vNH6LVs="; </ins> }; <del> git_src = fetchFromGitHub rec { owner = "francescmm"; repo = "git"; rev = "b62750f4da4b133faff49e6f53950d659b18c948"; sha256 = "sha256-4FqA+kkHd0TqD6ZuB4CbJ+IhOtQG9uWN+qhSAT0dXGs="; name = repo; }; in mkDerivation rec { inherit pname version; srcs = [ main_src aux_src qlogger_src qpinnabletab_src git_src ]; sourceRoot = main_src.name; </del> nativeBuildInputs = [ qmake
<ins> { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "await"; version = "0.999"; src = fetchFromGitHub { owner = "slavaGanzin"; repo = "await"; rev = "v${version}"; hash = "sha256-z178TKA0x6UnpBQaA8dig2FLeJKGxPndfvwtmylAD90="; }; buildPhase = '' runHook preBuild $CC await.c -o await -l pthread runHook postBuild ''; installPhase = '' runHook preInstall install -Dm755 await -t $out/bin install -Dm444 LICENSE -t $out/share/licenses/await install -Dm444 README.md -t $out/share/doc/await runHook postInstall ''; meta = with lib; { description = "Small binary that runs a list of commands in parallel and awaits termination"; homepage = "https://await-cli.app"; license = licenses.mit; maintainers = with maintainers; [ chewblacka ]; platforms = platforms.all; mainProgram = "await"; }; } </ins>
<ins> { lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "golink"; version = "0-unstable-2024-01-26"; src = fetchFromGitHub { owner = "tailscale"; repo = "golink"; # https://github.com/tailscale/golink/issues/104 rev = "d9de913fb174ec2569a15b6e2dbe5cb6e4a0a853"; hash = "sha256-w6jRbajEQkOrBqxDnQreSmSB5DNL9flWjloShiIBM+M="; }; vendorHash = "sha256-R/o3csZC/M9nm0k5STL7AhbG5J4LtdxqKaVjM/9ggW8="; ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A private shortlink service for tailnets"; homepage = "https://github.com/tailscale/golink"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; mainProgram = "golink"; }; } </ins>
# > The following imported targets are referenced, but are missing: # > SPIRV-Tools-opt ./cmakelists.patch <ins> # Remove on next release # https://github.com/cemu-project/Cemu/pull/1076 (fetchpatch { url = "https://github.com/cemu-project/Cemu/commit/72aacbdcecc064ea7c3b158c433e4803496ac296.patch"; hash = "sha256-x+ZVqXgGRSv0VYwJAX35C1p7PnmCHS7iEO+4k8j0/ug="; }) </ins> ]; nativeBuildInputs = [
clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; <del> clang_34 = wrapCC llvmPackages_34.clang; </del> <ins> clang_34 = (wrapCC llvmPackages_34.clang).override { # Default cc-wrapper's hardening flags don't work with clang-3.4, # so just remove it entirely for this wrapper. extraBuildCommands = '' :> $out/nix-support/add-hardening.sh ''; }; </ins> clang-tools = callPackage ../development/tools/clang-tools { };
systemd.services.gitlab-db-config = { after = [ "gitlab-config.service" "gitlab-postgresql.service" "postgresql.service" ]; <del> bindsTo = [ "gitlab-config.service" ] ++ optional (cfg.databaseHost == "") "postgresql.service" ++ optional databaseActuallyCreateLocally "gitlab-postgresql.service"; </del> <ins> wants = optional (cfg.databaseHost == "") "postgresql.service" ++ optional databaseActuallyCreateLocally "gitlab-postgresql.service"; bindsTo = [ "gitlab-config.service" ]; </ins> wantedBy = [ "gitlab.target" ]; partOf = [ "gitlab.target" ]; serviceConfig = {
"gitlab-db-config.service" ]; bindsTo = [ <del> "redis-gitlab.service" </del> "gitlab-config.service" "gitlab-db-config.service" <del> ] ++ optional (cfg.databaseHost == "") "postgresql.service"; </del> <ins> ]; wants = [ "redis-gitlab.service" ] ++ optional (cfg.databaseHost == "") "postgresql.service"; </ins> wantedBy = [ "gitlab.target" ]; partOf = [ "gitlab.target" ]; environment = gitlabEnv // (optionalAttrs cfg.sidekiq.memoryKiller.enable {
"gitlab-db-config.service" ]; bindsTo = [ <del> "redis-gitlab.service" </del> "gitlab-config.service" "gitlab-db-config.service" <del> ] ++ optional (cfg.databaseHost == "") "postgresql.service"; </del> <ins> ]; wants = [ "redis-gitlab.service" ] ++ optional (cfg.databaseHost == "") "postgresql.service"; </ins> requiredBy = [ "gitlab.target" ]; partOf = [ "gitlab.target" ]; environment = gitlabEnv;
gitlab.systemctl("start gitlab-backup.service") gitlab.wait_for_unit("gitlab-backup.service") gitlab.wait_for_file("${nodes.gitlab.services.gitlab.statePath}/backup/dump_gitlab_backup.tar") <del> gitlab.systemctl("stop postgresql.service gitlab.target") </del> <ins> gitlab.systemctl("stop postgresql.service gitlab-config.service gitlab.target") </ins> gitlab.succeed( "find ${nodes.gitlab.services.gitlab.statePath} -mindepth 1 -maxdepth 1 -not -name backup -execdir rm -r {} +" )
# this should not run because /etc is mounted via a systemd mount unit # instead. To a large extent this mimics what composefs does. Because # it's relatively simple, however, we avoid the composefs dependency. <del> if [[ ! $IN_NIXOS_SYSTEMD_STAGE1 ]]; then </del> <ins> # Since this script is not idempotent, it should not run when etc hasn't # changed. if [[ ! $IN_NIXOS_SYSTEMD_STAGE1 ]] && [[ "${config.system.build.etc}/etc" != "$(readlink -f /run/current-system/etc)" ]]; then </ins> echo "remounting /etc..." tmpMetadataMount=$(mktemp --directory)
}; testScript = '' <del> machine.succeed("findmnt --kernel --type overlay /etc") machine.fail("stat /etc/newgen") </del> <ins> with subtest("/etc is mounted as an overlay"): machine.succeed("findmnt --kernel --type overlay /etc") </ins> <del> machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") </del> <ins> with subtest("switching to the same generation"): machine.succeed("/run/current-system/bin/switch-to-configuration test") </ins> <del> assert machine.succeed("cat /etc/newgen") == "newgen" </del> <ins> with subtest("switching to a new generation"): machine.fail("stat /etc/newgen") machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") assert machine.succeed("cat /etc/newgen") == "newgen" </ins> ''; }
}; testScript = '' <del> machine.succeed("findmnt --kernel --type overlay /etc") machine.fail("stat /etc/newgen") machine.succeed("echo -n 'mutable' > /etc/mutable") </del> <ins> with subtest("/etc is mounted as an overlay"): machine.succeed("findmnt --kernel --type overlay /etc") </ins> <del> machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") </del> <ins> with subtest("switching to the same generation"): machine.succeed("/run/current-system/bin/switch-to-configuration test") </ins> <del> assert machine.succeed("cat /etc/newgen") == "newgen" assert machine.succeed("cat /etc/mutable") == "mutable" </del> <ins> with subtest("switching to a new generation"): machine.fail("stat /etc/newgen") machine.succeed("echo -n 'mutable' > /etc/mutable") machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") assert machine.succeed("cat /etc/newgen") == "newgen" assert machine.succeed("cat /etc/mutable") == "mutable" </ins> ''; }
buildPythonPackage rec { pname = "google-auth-oauthlib"; <del> version = "1.1.0"; format = "setuptools"; </del> <ins> version = "1.2.0"; pyproject = true; </ins> disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; <del> hash = "sha256-g+qMOwiB5FN5C6/0RI6KYRKsh3jR3p2gtoAQuEOTevs="; </del> <ins> hash = "sha256-KS0tN4M0nysHNKCgIHseHjIqwZPCwJ2PfGE/t8xQHqg="; </ins> }; <ins> nativeBuildInputs = [ setuptools ]; </ins> propagatedBuildInputs = [ google-auth requests-oauthlib ]; <ins> passthru.optional-dependencies = { tool = [ click ]; }; </ins> nativeCheckInputs = [ <del> click </del> mock pytestCheckHook <del> ]; </del> <ins> ] ++ passthru.optional-dependencies.tool; </ins> disabledTests = lib.optionals stdenv.isDarwin [ # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`).