From 13a26eb5f01413f575a71bc051fecda4b8182088 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sat, 21 Oct 2023 13:04:56 +0200 Subject: [PATCH] Update --- .forgejo/workflows/build.yml | 1 - flake.lock | 12 ++++++------ flake.nix | 1 - packages/anonymous-overflow.nix | 4 ++-- packages/q.nix | 8 ++++---- packages/vuetorrent.nix | 4 ++-- packages/website-docs-nifoc-pw.nix | 25 ------------------------- 7 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 packages/website-docs-nifoc-pw.nix diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index f0383f5..c76b2ba 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -35,7 +35,6 @@ jobs: - run: nix build '.#rexit' - run: nix build '.#vuetorrent' - run: nix build '.#bdfr-browser' - - run: nix build '.#website-docs-nifoc-pw' build-arm64-linux: runs-on: ubuntu-latest-arm64 diff --git a/flake.lock b/flake.lock index c4a2a0c..d1d65a0 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1697814176, - "narHash": "sha256-JUQ4K3aaN0x1NCzlUYTa1QwrYEzfwgJaduXbAFm0Lvg=", + "lastModified": 1697885212, + "narHash": "sha256-83q5JMrXKhWwplIT7PYJ3VOvb41RY63tCGEOle5JhnY=", "owner": "neovim", "repo": "neovim", - "rev": "ad2fad9a3b07d84e24c189b6a5773e979e8c0afd", + "rev": "9971bea6f1380c15c22f5035d1d33d994f8a6ed7", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697756275, - "narHash": "sha256-KAZ2F9He5oH2NPxhWDLmtGAsiBjPi7yps1OGZu6peMM=", + "lastModified": 1697838558, + "narHash": "sha256-/peGlfsdb4DkhASQ1b4SnDUB4NkNK6+GnqgTuNgRAyQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d042a296139c6a111be3e3d5dc9ef6783b5e7c16", + "rev": "5c78e5b4aa516bd7c34718e219abfefe6bc62e55", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 86880cb..90a2651 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,6 @@ bdfr-browser = import ./packages/bdfr-browser.nix { inherit pkgs lib; }; weewx-proxy = import ./packages/weewx-proxy.nix { inherit pkgs lib; }; - website-docs-nifoc-pw = import ./packages/website-docs-nifoc-pw.nix { inherit pkgs; }; } // darwinPackages; overlayAttrs = config.packages; diff --git a/packages/anonymous-overflow.nix b/packages/anonymous-overflow.nix index 35a47b1..d0f79bd 100644 --- a/packages/anonymous-overflow.nix +++ b/packages/anonymous-overflow.nix @@ -2,13 +2,13 @@ pkgs.buildGoModule rec { pname = "anonymous-overflow"; - version = "1.9.0"; + version = "1.10.1"; src = pkgs.fetchFromGitHub { owner = "httpjamesm"; repo = "AnonymousOverflow"; rev = "v${version}"; - sha256 = "sha256-7em/F2+VSM4kE7Hd2Aw0ka2+gWSxG3VMBs5iQnYwEqw="; + hash = "sha256-g4/C2L+ZTb+oJ9+vfMP4PxyBKRF30VCTvEQCuIALInE="; }; vendorSha256 = "sha256-dIzK8r3pPmV8B2xhpSK7Vg82RnsZ2kptEYOkYPZrPik="; diff --git a/packages/q.nix b/packages/q.nix index 2904107..3f91f23 100644 --- a/packages/q.nix +++ b/packages/q.nix @@ -1,17 +1,17 @@ { pkgs, lib }: -pkgs.buildGoModule rec { +pkgs.buildGo121Module rec { pname = "q"; - version = "0.12.0"; + version = "0.15.1"; src = pkgs.fetchFromGitHub { owner = "natesales"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z62xxmbzouuP0ol0sJxlh3bQr/sysFSqo7Y5b26IJ1g="; + sha256 = "sha256-yItgytsPR/FkiERHhLTq1vNJbZ204DckEc3xK3PaPKM="; }; - vendorSha256 = "sha256-uWPvUz8H9e/deZ3JmpRBNEG6UXAQa1068fZwQoeiKkc="; + vendorSha256 = "sha256-xLv2F/rOSjMTnTrLck/1E8Y0fTbpUutQIJGmqetqYjg="; ldflags = "-s -w -X main.version=release"; doCheck = false; diff --git a/packages/vuetorrent.nix b/packages/vuetorrent.nix index e1b6f6a..f574edc 100644 --- a/packages/vuetorrent.nix +++ b/packages/vuetorrent.nix @@ -2,11 +2,11 @@ pkgs.stdenv.mkDerivation rec { pname = "vuetorrent"; - version = "1.7.4"; + version = "1.8.0"; src = pkgs.fetchurl { url = "https://github.com/WDaan/VueTorrent/releases/download/v${version}/vuetorrent.zip"; - sha256 = "sha256-07MZkJisZ9h8rUm2t60KRVXCuFROMa7cVyCNzik7VqE="; + sha256 = "sha256-A8hQ8a2BiJBPvSYz4B/GKbmCn2xVpbmYdPTYz3HJ7ss="; }; buildInputs = with pkgs; [ unzip ]; diff --git a/packages/website-docs-nifoc-pw.nix b/packages/website-docs-nifoc-pw.nix deleted file mode 100644 index c02eb44..0000000 --- a/packages/website-docs-nifoc-pw.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs }: - -pkgs.stdenv.mkDerivation { - pname = "website-docs-nifoc-pw"; - version = "2021-08-30"; - - src = pkgs.fetchFromGitHub { - owner = "nifoc"; - repo = "nifoc.pw-docs"; - rev = "24034da912e3d7fddc447734ca4c9a5951a0fa32"; - sha256 = "sha256-GwVwbLUbxpFidOU1CTHFbYs/MscHpsqiYmnyvLtnYjM="; - fetchSubmodules = false; - }; - - installPhase = '' - mkdir $out - mv site $out/ - ''; - - meta = { - description = "Static documentation files for some older projects"; - homepage = "https://github.com/nifoc/nifoc.pw-docs"; - platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" ]; - }; -}