diff --git a/flake.lock b/flake.lock index e3836a2..a27981e 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712192574, - "narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=", + "lastModified": 1712420723, + "narHash": "sha256-VnG0Eu394Ga2FCe8Q66m6OEQF8iAqjDYsjmtl+N2omk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f480f9d09e4b4cf87ee6151eba068197125714de", + "rev": "9e7f26f82acb057498335362905fde6fea4ca50a", "type": "github" }, "original": { @@ -96,11 +96,11 @@ "syncplay-src": { "flake": false, "locked": { - "lastModified": 1709314949, - "narHash": "sha256-emGFzfJ1xmHiLvQ3gwp/Wt2QNqzaTslz5MCmxuk2hrE=", + "lastModified": 1712356708, + "narHash": "sha256-WKJHe2bhC2MgsiSZcyW0n1gxO6YdulFHoGf7dqX+AI0=", "owner": "odrling", "repo": "syncplay", - "rev": "41d0d952d1ed2b51994d3b9a64665540fdffb91d", + "rev": "c27fdce190829c14a3dcdbe17080e53bcedc9d88", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 52f23de..cff5df0 100644 --- a/flake.nix +++ b/flake.nix @@ -16,16 +16,51 @@ }; }; - outputs = inputs@{ flake-parts, dakara_check-src, ffmpegaacsucks-src, syncplay-src, ... }: + outputs = + { flake-parts + , dakara_check-src + , ffmpegaacsucks-src + , syncplay-src + , ... + }@inputs: flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ]; - perSystem = { pkgs, ... }: { + perSystem = { self', pkgs, ... }: { packages = rec { dakara_check = pkgs.callPackage ./packages/dakara_check.nix { inherit dakara_check-src ffmpegaacsucks; }; ffmpegaacsucks = pkgs.callPackage ./packages/ffmpegaacsucks.nix { inherit ffmpegaacsucks-src; }; syncplay = pkgs.callPackage ./packages/syncplay.nix { inherit syncplay-src; }; }; + + devShells = { + karaberus = pkgs.mkShell { + packages = with pkgs; [ + go + go-tools + gopls + pkg-config + self'.packages.dakara_check + ]; + }; + nanachan = pkgs.mkShell { + packages = with pkgs; [ + ffmpeg + libopus + poetry + python312 + redis + ]; + }; + nanapi = pkgs.mkShell { + packages = with pkgs; [ + edgedb + meilisearch + poetry + python312 + ]; + }; + }; }; }; } diff --git a/packages/ffmpegaacsucks.nix b/packages/ffmpegaacsucks.nix index 572c823..c27cb5f 100644 --- a/packages/ffmpegaacsucks.nix +++ b/packages/ffmpegaacsucks.nix @@ -1,6 +1,6 @@ { stdenv -, ffmpeg , ffmpegaacsucks-src +, ffmpeg , meson , ninja , pkg-config diff --git a/packages/syncplay.nix b/packages/syncplay.nix index be3d850..1f866f0 100644 --- a/packages/syncplay.nix +++ b/packages/syncplay.nix @@ -1,5 +1,5 @@ -{ syncplay -, syncplay-src +{ syncplay-src +, syncplay }: syncplay.overrideAttrs (oldAttrs: rec { name = "${pname}-${version}";