From e21f69439a64cda67aaf53e30dd21e1d3407a8df Mon Sep 17 00:00:00 2001
From: Asmir A <asmir@archlinux>
Date: Sat, 30 Sep 2023 20:13:43 +0200
Subject: [PATCH] flake: nix-xilinx follows nixpkgs

---
 flake.lock | 48 ++++++++++++++++++------------------------------
 flake.nix  |  5 ++++-
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index a6c1c90..42a5026 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,11 +57,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695984718,
-        "narHash": "sha256-LQwKgaaaFOkIcxarf0xQXeDJFwZ5BZWcgmPeo3xp2CM=",
+        "lastModified": 1696063111,
+        "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4f02e35f9d150573e1a710afa338846c2f6d850c",
+        "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01",
         "type": "github"
       },
       "original": {
@@ -73,14 +73,16 @@
     "nix-xilinx": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1685780173,
-        "narHash": "sha256-K18JYyCHrnb05Odb7N9FpU30az7QOV8uL9ch0RgU7i0=",
+        "lastModified": 1696069591,
+        "narHash": "sha256-YFPEWMV6XRi7CgDB1qJ67dIYPnrOETuxQO4mnPmxbQs=",
         "owner": "asmir.abdulahovic",
         "repo": "nix-xilinx",
-        "rev": "cc5ab958d31c58481b1f7f3a2c0a4db7c22006e9",
+        "rev": "a20ac5924afa24d45227df7d7d54574a9409a4a6",
         "type": "gitlab"
       },
       "original": {
@@ -91,16 +93,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695806987,
-        "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
-        "owner": "NixOS",
+        "lastModified": 1695830400,
+        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57",
+        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-stable": {
@@ -119,22 +123,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1695830400,
-        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "peerix": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -161,7 +149,7 @@
       "inputs": {
         "home-manager": "home-manager",
         "nix-xilinx": "nix-xilinx",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "peerix": "peerix",
         "sops-nix": "sops-nix",
         "zremap": "zremap"
diff --git a/flake.nix b/flake.nix
index a377a42..e0656f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,10 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    nix-xilinx.url = "gitlab:asmir.abdulahovic/nix-xilinx";
+    nix-xilinx = {
+      url = "gitlab:asmir.abdulahovic/nix-xilinx";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     peerix = {
       url = "gitlab:asmir.abdulahovic/peerix";