From dcce419f3a69521ac0cbb50c35cd6bb9a1956628 Mon Sep 17 00:00:00 2001 From: chaos Date: Wed, 9 Aug 2023 23:11:55 +0100 Subject: [PATCH] update flake deps but not piped (it broke frontend again) --- flake.lock | 49 ++++++++++++++++--------------------------------- flake.nix | 11 ++++------- 2 files changed, 20 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index d6b543b..3592b54 100644 --- a/flake.lock +++ b/flake.lock @@ -6,7 +6,7 @@ "flake-compat" ], "nixpkgs": [ - "nixpkgs-fixed" + "nixpkgs-unstable" ], "utils": [ "flake-utils" @@ -66,7 +66,7 @@ "flake-compat" ], "nixpkgs": [ - "nixpkgs-fixed" + "nixpkgs-unstable" ], "utils": [ "flake-utils" @@ -92,7 +92,7 @@ "flake-compat" ], "nixpkgs": [ - "nixpkgs-fixed" + "nixpkgs-unstable" ], "utils": [ "flake-utils" @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1690476848, - "narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=", + "lastModified": 1691599243, + "narHash": "sha256-Lw3VRCFFbjQLxZu37rL/o2RBb95VG8iThEhEkqo3SV8=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da", + "rev": "a8f8f48320c64bd4e3a266a850bbfde2c6fe3a04", "type": "github" }, "original": { @@ -138,18 +138,18 @@ "flake-compat" ], "nixpkgs": [ - "nixpkgs-fixed" + "nixpkgs-unstable" ], "utils": [ "flake-utils" ] }, "locked": { - "lastModified": 1674038300, - "narHash": "sha256-nvnvjugb+wMEcCkw5WGtyHEjth9mPJLhuXYmIxxR8f0=", + "lastModified": 1690576148, + "narHash": "sha256-7silSX+pkyHFPyimrXGsevUkgdwOqy93pBvJCVpAsmA=", "owner": "ChaotiCryptidz", "repo": "musicutil", - "rev": "f67a9ebc3bfdc44d596397fb381e392eee8e6e06", + "rev": "5eca86a4705fb1218629b62d76dafe8e1c9665d8", "type": "gitlab" }, "original": { @@ -158,29 +158,13 @@ "type": "gitlab" } }, - "nixpkgs-fixed": { - "locked": { - "lastModified": 1690367991, - "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1690367991, - "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", + "lastModified": 1691472822, + "narHash": "sha256-XVfYZ2oB3lNPVq6sHCY9WkdQ8lHoIDzzbpg8bB6oBxA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", + "rev": "41c7605718399dcfa53dd7083793b6ae3bc969ff", "type": "github" }, "original": { @@ -192,11 +176,11 @@ }, "nur": { "locked": { - "lastModified": 1690572022, - "narHash": "sha256-Lebw839hLqDgL+Nq0SgoLgxI4QQ+F+jyqxa1rlF07JA=", + "lastModified": 1691615229, + "narHash": "sha256-MdNFFmNAIM3kV3gQrui3RLcq8L6lbaj5JKBMFsphS38=", "owner": "nix-community", "repo": "NUR", - "rev": "c7fd6c107945e7bb4f98fcd8292c9737cc9aaad9", + "rev": "2366bfc7cf3caa0cbd6a05bb6f2c9befc30e80b8", "type": "github" }, "original": { @@ -214,7 +198,6 @@ "gitlab_artifacts_sync": "gitlab_artifacts_sync", "home-manager-unstable": "home-manager-unstable", "musicutil": "musicutil", - "nixpkgs-fixed": "nixpkgs-fixed", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "tree-input": "tree-input" diff --git a/flake.nix b/flake.nix index 056d4b6..0bd00b2 100644 --- a/flake.nix +++ b/flake.nix @@ -21,28 +21,25 @@ tree-input.url = "github:kittywitch/tree"; tree-input.inputs.nixpkgs.follows = "nixpkgs-unstable"; - # update whenever - nixpkgs-fixed.url = "github:nixos/nixpkgs/?branch=nixos-unstable&rev=c9cf0708f00fbe553319258e48ca89ff9a413703"; - nur.url = "github:nix-community/NUR"; deploy-rs.url = "github:serokell/deploy-rs"; - deploy-rs.inputs.nixpkgs.follows = "nixpkgs-fixed"; + deploy-rs.inputs.nixpkgs.follows = "nixpkgs-unstable"; deploy-rs.inputs.utils.follows = "flake-utils"; deploy-rs.inputs.flake-compat.follows = "flake-compat"; musicutil.url = "gitlab:ChaotiCryptidz/musicutil"; - musicutil.inputs.nixpkgs.follows = "nixpkgs-fixed"; + musicutil.inputs.nixpkgs.follows = "nixpkgs-unstable"; musicutil.inputs.utils.follows = "flake-utils"; musicutil.inputs.flake-compat.follows = "flake-compat"; gitlab_archiver.url = "gitlab:ChaotiCryptidz/gitlab_archiver"; - gitlab_archiver.inputs.nixpkgs.follows = "nixpkgs-fixed"; + gitlab_archiver.inputs.nixpkgs.follows = "nixpkgs-unstable"; gitlab_archiver.inputs.utils.follows = "flake-utils"; gitlab_archiver.inputs.flake-compat.follows = "flake-compat"; gitlab_artifacts_sync.url = "gitlab:ChaotiCryptidz/gitlab_artifacts_sync"; - gitlab_artifacts_sync.inputs.nixpkgs.follows = "nixpkgs-fixed"; + gitlab_artifacts_sync.inputs.nixpkgs.follows = "nixpkgs-unstable"; gitlab_artifacts_sync.inputs.utils.follows = "flake-utils"; gitlab_artifacts_sync.inputs.flake-compat.follows = "flake-compat"; };