From 5b41b1dc80dfcb6e300da55c14c8faf549506f8f Mon Sep 17 00:00:00 2001 From: Rachel Lambda Samuelsson Date: Wed, 16 Oct 2024 14:33:47 +0200 Subject: [PATCH] -slippi netplay --- flake.lock | 20 +++++++++++++++++--- flake.nix | 8 +------- home-manager/applications.nix | 1 - 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 2ee23da..0ac6cf5 100644 --- a/flake.lock +++ b/flake.lock @@ -194,6 +194,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixprof": { "inputs": { "flake-utils": "flake-utils_3", @@ -270,9 +286,7 @@ }, "ssbm-nix": { "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ], + "nixpkgs": "nixpkgs_2", "slippi-desktop": "slippi-desktop" }, "locked": { diff --git a/flake.nix b/flake.nix index 397ff48..38c9245 100644 --- a/flake.nix +++ b/flake.nix @@ -18,10 +18,6 @@ url = "github:isovector/cornelis/"; inputs.nixpkgs.follows = "nixpkgs"; }; - ssbm-nix = { - url = "github:lytedev/ssbm-nix"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; nixprof = { url = "github:Kha/nixprof"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -33,7 +29,7 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, agda, cornelis, ssbm-nix, plasma-manager, flake-utils, nixprof }: + outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, agda, cornelis, plasma-manager, flake-utils, nixprof }: let nix-config-module = { nix.registry.nixpkgs.flake = nixpkgs; @@ -59,7 +55,6 @@ agda = agda.packages.${system}.default; cornelis = cornelis.packages.${system}.cornelis; cornelis-vim = cornelis.packages.${system}.cornelis-vim; - slippi-netplay = ssbm-nix.packages.${system}.slippi-netplay; rc2nix = plasma-manager.packages.${system}.rc2nix; nixprof = nixprof.packages.${system}.nixprof; sax2nf = self.packages.${system}.sax2nf; @@ -78,7 +73,6 @@ }; base-modules = [ nix-config-module - ssbm-nix.nixosModule home-manager.nixosModules.home-manager ]; in { diff --git a/home-manager/applications.nix b/home-manager/applications.nix index d16ff51..a482aaf 100644 --- a/home-manager/applications.nix +++ b/home-manager/applications.nix @@ -73,7 +73,6 @@ unstable.zoom-us extra.sax2nf extra.cornelis - extra.slippi-netplay unstable.kicad extra.renoise extra.nixprof