From 84ab7ac926ec1dd91693cc1fd4221bee2c1f5de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Fri, 2 Jul 2021 17:43:02 +0100
Subject: [PATCH] move to nixpkgs bisq, updat

---
 flake.lock                         | 47 ++++++++++--------------------
 flake.nix                          |  9 +-----
 nixos/boxes/foureighty/default.nix |  2 +-
 3 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/flake.lock b/flake.lock
index ff4b8180..d5e51b72 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,22 +19,6 @@
         "type": "github"
       }
     },
-    "bisq": {
-      "locked": {
-        "lastModified": 1622536247,
-        "narHash": "sha256-3W7x9x+ZFJ3D9N2S4qrMLX2U/ciAeh/n7594u4wFLx4=",
-        "owner": "emmanuelrosa",
-        "repo": "nixpkgs",
-        "rev": "39d42b8e83726c2fec873c023d4e1d6c37f4a187",
-        "type": "github"
-      },
-      "original": {
-        "owner": "emmanuelrosa",
-        "ref": "39d42b8e83726c2fec873c023d4e1d6c37f4a187",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -110,11 +94,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1624582311,
-        "narHash": "sha256-c4OqZDdU2ghygwh/ZmR8AWSK5hl7DUC9MoIICvJeNCU=",
+        "lastModified": 1625096064,
+        "narHash": "sha256-JWn75ysLA3TbA/HLk6NcT646UVwzRLxizIMMPS9G4mU=",
         "owner": "srid",
         "repo": "neuron",
-        "rev": "3707423425b27c95756cc69d08344928c0eb4a30",
+        "rev": "6a1387113e56f4885933b10bd671e9eb25786dd2",
         "type": "github"
       },
       "original": {
@@ -126,11 +110,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1623569835,
-        "narHash": "sha256-Mg+FN1JkEQ91Zff0+ot/ndRgD9BB+uDBLN12AcBYkSA=",
+        "lastModified": 1625127528,
+        "narHash": "sha256-NDD8BuY8UjAs7VfeiRck7JkpsUyUWJYg1/RqdEJ0PgE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7305b276c90cfd3ad0a2452101a49c0b52c784c0",
+        "rev": "eb889532fef2cb73071436842ae2ca0ed2d011aa",
         "type": "github"
       },
       "original": {
@@ -155,11 +139,11 @@
     },
     "nixpkgs-nixos-unstable": {
       "locked": {
-        "lastModified": 1624447853,
-        "narHash": "sha256-Zn+vTEa3NE9q6z6ytpcNXrr8jV7HvrKRxMYoD2E6DpE=",
+        "lastModified": 1625098247,
+        "narHash": "sha256-R6ja2P/RdDGCcfC5FYCY6wa8EsHjJLV1jztlcK3xsi0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1905f5f2e55e0db0bb6244cfe62cb6c0dbda391d",
+        "rev": "59ef8087a3d95bf6c69767c126bbc0b7ced89e32",
         "type": "github"
       },
       "original": {
@@ -171,11 +155,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1624583608,
-        "narHash": "sha256-KJ5VB90FXmQAp0B2jNptu9g9rzrZBQFMVqJuoeKMRIg=",
+        "lastModified": 1625176478,
+        "narHash": "sha256-s1RTYNKw7ySyqrZjns9Cq+Nnjpp75ePgL06pgcbIpoA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8112fbe212f6086151acb19fe464b00c8ac1aebd",
+        "rev": "21b696caf392ad6fa513caf3327d0aa0430ffb72",
         "type": "github"
       },
       "original": {
@@ -203,11 +187,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1624691897,
-        "narHash": "sha256-isyBxkiUSQhEmXsnd66fUt/o5jPP9xkkmqfhQS9V2Ok=",
+        "lastModified": 1625231804,
+        "narHash": "sha256-qimr19k3G7uy4Sr+OXgHl4w4CnJ1ykrpLUUYzalilVQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "145823f81f53f0d4712bc764777ac57638b552a0",
+        "rev": "d7fdf23eec6d5d1907b6977936da5088d9cd0332",
         "type": "github"
       },
       "original": {
@@ -220,7 +204,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "bisq": "bisq",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "neuron": "neuron",
diff --git a/flake.nix b/flake.nix
index 3ec0e9f7..55b52be1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   description = "NixOS configuration with flakes";
-  outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, bisq, agenix, neuron } @ inputs:
+  outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron } @ inputs:
 
   let
     mkServer = pkgs: system: hostname:
@@ -92,13 +92,6 @@
       ref = "master";
     };
 
-    bisq = {
-      type = "github";
-      owner = "emmanuelrosa";
-      repo = "nixpkgs";
-      ref = "39d42b8e83726c2fec873c023d4e1d6c37f4a187";
-    };
-
     agenix = {
       type = "github";
       owner = "ryantm";
diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix
index f47c5339..bda75113 100644
--- a/nixos/boxes/foureighty/default.nix
+++ b/nixos/boxes/foureighty/default.nix
@@ -42,6 +42,6 @@
   programs.steam.enable = true;
 
   home-manager.users.cyryl = {...}: {
-    home.packages = [ inputs.bisq.legacyPackages."x86_64-linux".bisq-desktop ];
+    home.packages = [ inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".bisq-desktop ];
   };
 }