Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tiiuae/ghaf-infra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 464261be5c304053eca2595179b70cc8cc66a3ef
Choose a base ref
..
head repository: tiiuae/ghaf-infra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ed01c529c186223b4350baf2cbcdff9215a8a516
Choose a head ref
Showing with 15 additions and 14 deletions.
  1. +3 −2 hosts/azure/jenkins-controller/configuration.nix
  2. +9 −11 pkgs/rclone/default.nix
  3. +3 −1 services/rclone-http/default.nix
5 changes: 3 additions & 2 deletions hosts/azure/jenkins-controller/configuration.nix
Original file line number Diff line number Diff line change
@@ -69,7 +69,8 @@ let
s = client.get_secret(secret_name)
print(s.value)
'';
rclone = pkgs.callPackage ../../../pkgs/rclone { };
old-pkgs = (import inputs.nixpkgs-24-05 { inherit (pkgs) system; });
rclone = old-pkgs.callPackage ../../../pkgs/rclone { };
in
{
imports = [
@@ -107,7 +108,7 @@ in
# Needs to be an overlay so that it propagates to service.jenkins.jobBuilder
nixpkgs.overlays = [
(_: _: {
inherit ((import inputs.nixpkgs-24-05 { inherit (pkgs) system; })) jenkins-job-builder;
inherit (old-pkgs) jenkins-job-builder;
})
];

20 changes: 9 additions & 11 deletions pkgs/rclone/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
# SPDX-License-Identifier: Apache-2.0
{ pkgs, fetchFromGitHub, ... }:
pkgs.rclone.overrideAttrs (_: rec {
version = "1.68.0";
{ pkgs, ... }:
pkgs.rclone.overrideAttrs (oldAttrs: {
# These will be included in rclone v1.68.0
patches = (oldAttrs.patches or [ ]) ++ [
# https://github.com/rclone/rclone/pull/7801
./http-socket-activation.patch

src = fetchFromGitHub {
owner = "rclone";
repo = "rclone";
rev = "v${version}";
hash = "sha256-xLTzfS3/9XBqh0B7/VeRKYEHAgc4rY3QcIUS3f1/e0M=";
};

vendorHash = "sha256-vZxdayoKTo/fs5PgEdT4gepNq0kNNmLQhlybWY5kpx0=";
# https://github.com/rclone/rclone/pull/7865
./webdav-introduce-unix_socket_path.patch
];
})
4 changes: 3 additions & 1 deletion services/rclone-http/default.nix
Original file line number Diff line number Diff line change
@@ -4,12 +4,14 @@
pkgs,
lib,
config,
inputs,
...
}:
with lib;
let
cfg = config.services.rclone-http;
rclone = pkgs.callPackage ../../pkgs/rclone { };
old-pkgs = (import inputs.nixpkgs-24-05 { inherit (pkgs) system; });
rclone = old-pkgs.callPackage ../../pkgs/rclone { };
in
{
options.services.rclone-http = {