From e6d8aa552275fa10136ea58b9e18f97a02770849 Mon Sep 17 00:00:00 2001 From: xinyangli Date: Thu, 7 Nov 2024 14:37:52 +0800 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/b3690ec13c5fe8dba550b1f6f4c3f0acc0f86cee?narHash=sha256-94IqaCMuMtLcdPabzzwyDOCEebt9LFqvgznDnVtsq7c%3D' (2024-11-06) → 'github:nix-community/nix-vscode-extensions/0a959b25ff573f079ed032f88d8c988561b96a96?narHash=sha256-DIYTHa57pQQc9ARiMpJWYkaoiTaQPLH7Y4qK0J10Khk%3D' (2024-11-07) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/12ad8c1bf13ff15ffa6afe82c59b4af0b9226035?narHash=sha256-VK7LkfdcpUi8tqcgMIYY2jejDh4O3MNw9An0FcKveRQ%3D' (2024-11-06) → 'github:NixOS/nixos-hardware/e1cc1f6483393634aee94514186d21a4871e78d7?narHash=sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg%3D' (2024-11-06) • Updated input 'nixpkgs': 'github:xinyangli/nixpkgs/bb79ee9b6d87561bdbc8cedffc9969c7dd6a1eb0?narHash=sha256-CEWpfRT1kF6YjNsHEnF33mbz5wtWlzn4eKzEYsdx%2B5A%3D' (2024-11-06) → 'github:xinyangli/nixpkgs/82596c07592c14102071f72488ace046aa8e93a9?narHash=sha256-WrHPXxaPWDqu5r/546jf1pdfvEEuf0CIPuo7HjRLDdU%3D' (2024-11-07) • Updated input 'nur': 'github:nix-community/NUR/c0d8828600ef47d475e6ec33513bf9af6eb6b991?narHash=sha256-UPrBEY0No1O3ULb67xYjRh2r3u7MnZovfo1oYSPCIxI%3D' (2024-11-06) → 'github:nix-community/NUR/bc4d2a3b71c75d81cc247b1bf991b63f75358004?narHash=sha256-UZ6oSptjE04ooORHvvR%2BkiGnr/nhzWgYwGryxUkKAv0%3D' (2024-11-07) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 8a83374..b7e6d97 100644 --- a/flake.lock +++ b/flake.lock @@ -594,11 +594,11 @@ ] }, "locked": { - "lastModified": 1730857608, - "narHash": "sha256-94IqaCMuMtLcdPabzzwyDOCEebt9LFqvgznDnVtsq7c=", + "lastModified": 1730944043, + "narHash": "sha256-DIYTHa57pQQc9ARiMpJWYkaoiTaQPLH7Y4qK0J10Khk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b3690ec13c5fe8dba550b1f6f4c3f0acc0f86cee", + "rev": "0a959b25ff573f079ed032f88d8c988561b96a96", "type": "github" }, "original": { @@ -609,11 +609,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730874081, - "narHash": "sha256-VK7LkfdcpUi8tqcgMIYY2jejDh4O3MNw9An0FcKveRQ=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "12ad8c1bf13ff15ffa6afe82c59b4af0b9226035", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -685,11 +685,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730886641, - "narHash": "sha256-CEWpfRT1kF6YjNsHEnF33mbz5wtWlzn4eKzEYsdx+5A=", + "lastModified": 1730961289, + "narHash": "sha256-WrHPXxaPWDqu5r/546jf1pdfvEEuf0CIPuo7HjRLDdU=", "owner": "xinyangli", "repo": "nixpkgs", - "rev": "bb79ee9b6d87561bdbc8cedffc9969c7dd6a1eb0", + "rev": "82596c07592c14102071f72488ace046aa8e93a9", "type": "github" }, "original": { @@ -743,11 +743,11 @@ }, "nur": { "locked": { - "lastModified": 1730885145, - "narHash": "sha256-UPrBEY0No1O3ULb67xYjRh2r3u7MnZovfo1oYSPCIxI=", + "lastModified": 1730959878, + "narHash": "sha256-UZ6oSptjE04ooORHvvR+kiGnr/nhzWgYwGryxUkKAv0=", "owner": "nix-community", "repo": "NUR", - "rev": "c0d8828600ef47d475e6ec33513bf9af6eb6b991", + "rev": "bc4d2a3b71c75d81cc247b1bf991b63f75358004", "type": "github" }, "original": { From 2864fe9f87980109fe0ddb32d9ac997450363312 Mon Sep 17 00:00:00 2001 From: xinyangli Date: Thu, 7 Nov 2024 14:38:35 +0800 Subject: [PATCH 2/2] fixup! flake.lock: Update --- overlays/add-pkgs.nix | 1 - overlays/pkgs/ocis/default.nix | 85 ---------------------------------- overlays/pkgs/ocis/package.nix | 85 ---------------------------------- overlays/pkgs/ocis/web.nix | 40 ---------------- 4 files changed, 211 deletions(-) delete mode 100644 overlays/pkgs/ocis/default.nix delete mode 100644 overlays/pkgs/ocis/package.nix delete mode 100644 overlays/pkgs/ocis/web.nix diff --git a/overlays/add-pkgs.nix b/overlays/add-pkgs.nix index 65b2131..35b6981 100644 --- a/overlays/add-pkgs.nix +++ b/overlays/add-pkgs.nix @@ -1,4 +1,3 @@ (final: prev: { oidc-agent = prev.callPackage ./pkgs/oidc-agent { }; - ocis = prev.callPackage ./pkgs/ocis { }; }) diff --git a/overlays/pkgs/ocis/default.nix b/overlays/pkgs/ocis/default.nix deleted file mode 100644 index 1f1aade..0000000 --- a/overlays/pkgs/ocis/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - stdenvNoCC, - callPackage, - fetchFromGitHub, - buildGoModule, - gnumake, - pnpm, - nodejs, -}: -let - web = callPackage ./web.nix { }; - idp-assets = stdenvNoCC.mkDerivation { - pname = "idp-assets"; - version = "0-unstable-2020-10-14"; - src = fetchFromGitHub { - owner = "owncloud"; - repo = "assets"; - rev = "e8b6aeadbcee1865b9df682e9bd78083842d2b5c"; - hash = "sha256-PzGff2Zx8xmvPYQa4lS4yz2h+y/lerKvUZkYI7XvAUw="; - }; - installPhase = '' - mkdir -p $out/share - cp logo.svg favicon.ico $out/share/ - ''; - dontConfigure = true; - dontBuild = true; - dontFixup = true; - }; -in -buildGoModule rec { - pname = "ocis"; - version = "v5.0.7"; - - vendorHash = null; - - src = fetchFromGitHub { - owner = "owncloud"; - repo = "ocis"; - rev = version; - hash = "sha256-vCEr7UCGEPm0x04U8DpsUNz9c64ZSEIK4SDcitCIDCw="; - }; - - nativeBuildInputs = [ - gnumake - nodejs - pnpm.configHook - ]; - - pnpmDeps = pnpm.fetchDeps { - inherit pname version src; - sourceRoot = "${src.name}/services/idp"; - hash = "sha256-ojrgoyl+xBsgEsx3d3gv5Wf6ziabHoFkEpAoDZcYavo="; - }; - pnpmRoot = "services/idp"; - - buildPhase = '' - runHook preBuild - cp -r ${web}/share/* services/web/assets/ - pnpm -C services/idp build - - mkdir -p services/idp/assets/identifier/static - cp -r ${idp-assets}/share/* services/idp/assets/identifier/static/ - - make -C ocis VERSION=${version} DATE=${version} build - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out/bin/ - cp ocis/bin/ocis $out/bin/ - ''; - - passthru = { - inherit web; - }; - - meta = with lib; { - homepage = "https://github.com/owncloud/ocis"; - description = "ownCloud Infinite Scale Stack"; - mainProgram = "ocis"; - license = licenses.asl20; - maintainers = with maintainers; [ xinyangli ]; - }; -} diff --git a/overlays/pkgs/ocis/package.nix b/overlays/pkgs/ocis/package.nix deleted file mode 100644 index 5ead795..0000000 --- a/overlays/pkgs/ocis/package.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - stdenvNoCC, - callPackage, - fetchFromGitHub, - buildGoModule, - gnumake, - pnpm, - nodejs, -}: -let - web = callPackage ./web.nix { }; - idp-assets = stdenvNoCC.mkDerivation { - pname = "idp-assets"; - version = "0-unstable-2020-10-14"; - src = fetchFromGitHub { - owner = "owncloud"; - repo = "assets"; - rev = "e8b6aeadbcee1865b9df682e9bd78083842d2b5c"; - hash = "sha256-PzGff2Zx8xmvPYQa4lS4yz2h+y/lerKvUZkYI7XvAUw="; - }; - installPhase = '' - mkdir -p $out/share - cp logo.svg favicon.ico $out/share/ - ''; - dontConfigure = true; - dontBuild = true; - dontFixup = true; - }; -in -buildGoModule rec { - pname = "ocis"; - version = "v5.0.7"; - - vendorHash = null; - - src = fetchFromGitHub { - owner = "owncloud"; - repo = "ocis"; - rev = version; - hash = "sha256-vCEr7UCGEPm0x04U8DpsUNz9c64ZSEIK4SDcitCIDCw="; - }; - - nativeBuildInputs = [ - gnumake - nodejs - pnpm.configHook - ]; - - pnpmDeps = pnpm.fetchDeps { - inherit pname version src; - sourceRoot = "${src.name}/services/idp"; - hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs="; - }; - pnpmRoot = "services/idp"; - - buildPhase = '' - runHook preBuild - cp -r ${web}/share/* services/web/assets/ - pnpm -C services/idp build - - mkdir -p services/idp/assets/identifier/static - cp -r ${idp-assets}/share/* services/idp/assets/identifier/static/ - - make -C ocis VERSION=${version} DATE=${version} build - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out/bin/ - cp ocis/bin/ocis $out/bin/ - ''; - - passthru = { - inherit web; - }; - - meta = with lib; { - homepage = "https://github.com/owncloud/ocis"; - description = "ownCloud Infinite Scale Stack"; - mainProgram = "ocis"; - license = licenses.asl20; - maintainers = with maintainers; [ xinyangli ]; - }; -} diff --git a/overlays/pkgs/ocis/web.nix b/overlays/pkgs/ocis/web.nix deleted file mode 100644 index 1b44901..0000000 --- a/overlays/pkgs/ocis/web.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenvNoCC, - nodejs, - pnpm, - fetchFromGitHub, -}: -stdenvNoCC.mkDerivation rec { - pname = "ocis-web"; - version = "v8.0.5"; - - src = fetchFromGitHub { - owner = "owncloud"; - repo = "web"; - rev = version; - hash = "sha256-hupdtK/V74+X7/eXoDmUjFvSKuhnoOtNQz7o6TLJXG4="; - }; - - nativeBuildInputs = [ pnpm.configHook ]; - - buildInputs = [ nodejs ]; - - buildPhase = '' - pnpm build - ''; - - installPhase = '' - mkdir -p $out/share - cp -r dist/* $out/share/ - ''; - - pnpmDeps = pnpm.fetchDeps { - inherit pname version src; - hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M="; - }; - - meta = with lib; { - license = [ licenses.agpl3Only ]; - }; -}