diff --git a/flake.lock b/flake.lock index 004bc88..53eeeac 100644 --- a/flake.lock +++ b/flake.lock @@ -133,33 +133,6 @@ "url": "https://git.dayl.in/daylin/hyprman.git" } }, - "jj": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1738805560, - "narHash": "sha256-jGy+0VDxQrgNhj+eX06FRhPP31V8QZVAM4j4yBosAGE=", - "owner": "martinvonz", - "repo": "jj", - "rev": "613742dfbbd89324b25672a75ef8ce9e671ae0d3", - "type": "github" - }, - "original": { - "owner": "martinvonz", - "ref": "v0.26.0", - "repo": "jj", - "type": "github" - } - }, "lib-aggregate": { "inputs": { "flake-utils": [ @@ -451,7 +424,6 @@ "flake-utils": "flake-utils", "hyprland-contrib": "hyprland-contrib", "hyprman": "hyprman", - "jj": "jj", "lib-aggregate": "lib-aggregate", "lix": "lix", "lix-module": "lix-module", diff --git a/modules/storage/restic.nix b/modules/storage/restic.nix index 50c0f7a..f1e2a91 100644 --- a/modules/storage/restic.nix +++ b/modules/storage/restic.nix @@ -2,12 +2,10 @@ config, pkgs, mkOizysModule, - flake, ... }: mkOizysModule config "backups" { - # environment.systemPackages = with pkgs; [ rclone ]; - environment.systemPackages = [ (flake.pkgs "self").rclone ]; + environment.systemPackages = with pkgs; [ rclone ]; services.restic.backups.gdrive = { # BUG: if .conda/environments.txt doesn't exist then this won't work diff --git a/pkgs/default.nix b/pkgs/default.nix index dd7509d..e8c9e1a 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -11,10 +11,6 @@ in distrobox = pkgs.callPackage ./distrobox { }; llm-with-plugins = pkgs.callPackage ./llm/llm-with-plugins { }; - # added for access to https://github.com/rclone/rclone/issues/8351 - # can remove when rclone v1.70 hits nixpkgs - rclone = pkgs.callPackage ./rclone { }; - nimlangserver = pkgs.callPackage ./nim/nimlangserver { }; procs = pkgs.callPackage ./nim/procs { }; nimble = pkgs.callPackage ./nim/nimble { }; diff --git a/pkgs/rclone/default.nix b/pkgs/rclone/default.nix deleted file mode 100644 index 0bfd7f9..0000000 --- a/pkgs/rclone/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitHub, - buildPackages, - installShellFiles, - makeWrapper, - enableCmount ? true, - fuse, - fuse3, - macfuse-stubs, - librclone, -}: - -buildGoModule rec { - pname = "rclone"; - version = "1.69.0-unstable"; - - outputs = [ - "out" - "man" - ]; - - src = fetchFromGitHub { - owner = "rclone"; - repo = "rclone"; - rev = "dc9c87279b989d4c9c8baec9adb259aba8b1da08"; - hash = "sha256-mH9Bi77cpRY6+LuozJ0efx71rJjp2tR3DBHKLtfMO30="; - }; - - vendorHash = "sha256-99keix8Phs0IZb+kJcpR72hk0Uicy7h9/aoyZoG3X5w="; - - subPackages = [ "." ]; - - nativeBuildInputs = [ - installShellFiles - makeWrapper - ]; - - buildInputs = lib.optional enableCmount ( - if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse - ); - - tags = lib.optionals enableCmount [ "cmount" ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/rclone/rclone/fs.Version=${version}" - ]; - - postConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - substituteInPlace vendor/github.com/winfsp/cgofuse/fuse/host_cgo.go \ - --replace-fail '"libfuse.so.2"' '"${lib.getLib fuse}/lib/libfuse.so.2"' - ''; - - postInstall = - let - rcloneBin = - if stdenv.buildPlatform.canExecute stdenv.hostPlatform then - "$out" - else - lib.getBin buildPackages.rclone; - in - '' - installManPage rclone.1 - for shell in bash zsh fish; do - ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell - installShellCompletion rclone.$shell - done - - # filesystem helpers - ln -s $out/bin/rclone $out/bin/rclonefs - ln -s $out/bin/rclone $out/bin/mount.rclone - '' - + - lib.optionalString (enableCmount && !stdenv.hostPlatform.isDarwin) - # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount3, - # as the setuid wrapper is required as non-root on NixOS. - '' - wrapProgram $out/bin/rclone \ - --suffix PATH : "${lib.makeBinPath [ fuse3 ]}" - ''; - - passthru.tests = { - inherit librclone; - }; - - meta = with lib; { - description = "Command line program to sync files and directories to and from major cloud storage"; - homepage = "https://rclone.org"; - changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md"; - license = licenses.mit; - mainProgram = "rclone"; - maintainers = with maintainers; [ - SuperSandro2000 - tomfitzhenry - ]; - }; -}