Merge branch 'develop' into mtv-auto-pos

hmxmilohax · Dec 29, 2024 · 715f01d · 715f01d
2 parents 143236a + cba335a
commit 715f01d
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 1 deletion.
diff --git a/_ark/dx/song_updates/metadata_updates.dta b/_ark/dx/song_updates/metadata_updates.dta
@@ -890,7 +890,6 @@
 (brickhouse (genre rbsoulfunk))
 (broken3 (genre popdanceelectronic))
 (cannedheat (genre rbsoulfunk))
-(celebration (genre disco))
 (cheapthrills (genre popdanceelectronic))
 (cityofangels (genre hiphoprap))
 (comeandgo (genre hiphoprap))

diff --git a/scripts/flake.lock b/scripts/flake.lock
diff --git a/scripts/flake.nix b/scripts/flake.nix
@@ -0,0 +1,27 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+  };
+
+  outputs =
+    { self, nixpkgs }:
+    {
+      devShells.x86_64-linux.default =
+        let
+          pkgs = import nixpkgs { system = "x86_64-linux"; };
+        in
+        (pkgs.buildFHSEnv {
+          name = "rb3dx-build-env";
+          targetPkgs =
+            pkgs: with pkgs; [
+              gmp
+              icu
+              python3
+              ninja
+              fish
+              zlib
+            ];
+          runScript = "fish";
+        }).env;
+    };
+}