From e9fde8a82b5fb124ce78f176717ef71bed7e0f1c Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 3 Jun 2024 19:14:07 +0100 Subject: [PATCH] removed sqlfmt --- flake.lock | 161 ++++++++++++++++++++++++++++++----------------- flake.nix | 4 -- pkgs/default.nix | 1 - pkgs/sqlfmt.nix | 25 -------- 4 files changed, 104 insertions(+), 87 deletions(-) delete mode 100644 pkgs/sqlfmt.nix diff --git a/flake.lock b/flake.lock index 118224c..a4d0caf 100644 --- a/flake.lock +++ b/flake.lock @@ -18,7 +18,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixvim", "nixpkgs" @@ -125,12 +125,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -141,14 +144,14 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -262,26 +265,6 @@ "type": "github" } }, - "mach-nix": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "pypi-deps-db": "pypi-deps-db" - }, - "locked": { - "lastModified": 1654084003, - "narHash": "sha256-j/XrVVistvM+Ua+0tNFvO5z83isL+LBgmBi9XppxuKA=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "7e14360bde07dcae32e5e24f366c83272f52923f", - "type": "github" - }, - "original": { - "id": "mach-nix", - "ref": "3.5.0", - "type": "indirect" - } - }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -322,6 +305,27 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703863825, + "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-secrets": { "flake": false, "locked": { @@ -340,16 +344,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643805626, - "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", "type": "indirect" } }, @@ -400,20 +403,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -442,19 +431,27 @@ "type": "github" } }, - "pypi-deps-db": { - "flake": false, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_3", + "treefmt-nix": "treefmt-nix_2" + }, "locked": { - "lastModified": 1643877077, - "narHash": "sha256-jv8pIvRFTP919GybOxXE5TfOkrjTbdo9QiCO1TD3ZaY=", - "owner": "DavHau", - "repo": "pypi-deps-db", - "rev": "da53397f0b782b0b18deb72ef8e0fb5aa7c98aa3", + "lastModified": 1717250109, + "narHash": "sha256-MTivB5fsfaPtWwcibBhs20hHYEUe9o9bTRXsGJjQRso=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "11e97e742da5b4e43c27cfe13fca904e82fd4e56", "type": "github" }, "original": { - "owner": "DavHau", - "repo": "pypi-deps-db", + "owner": "nix-community", + "repo": "poetry2nix", "type": "github" } }, @@ -463,12 +460,12 @@ "disko": "disko", "home-manager": "home-manager", "impermanence": "impermanence", - "mach-nix": "mach-nix", "nix-colors": "nix-colors", "nix-secrets": "nix-secrets", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", + "poetry2nix": "poetry2nix", "sops-nix": "sops-nix" } }, @@ -508,6 +505,35 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -528,6 +554,27 @@ "repo": "treefmt-nix", "type": "github" } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717182148, + "narHash": "sha256-Hi09/RoizxubRf3PHToT2Nm7TL8B/abSVa6q82uEgNI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "03b982b77df58d5974c61c6022085bafe780c1cf", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 212e550..7d08100 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,6 @@ # Nixpkgs nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - mach-nix.url = "mach-nix/3.5.0"; - # Home manager home-manager = { url = "github:nix-community/home-manager"; @@ -51,8 +49,6 @@ self, nixpkgs, home-manager, - disko, - #impermanence, ... } @ inputs: let diff --git a/pkgs/default.nix b/pkgs/default.nix index b8a775a..591d772 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,5 +2,4 @@ # You can build them using 'nix build .#example' pkgs: { sddm-theme = pkgs.callPackage ./sddm-theme { }; - sqlfmt = pkgs.callPackage ./sqlfmt.nix { }; } diff --git a/pkgs/sqlfmt.nix b/pkgs/sqlfmt.nix deleted file mode 100644 index 74238d2..0000000 --- a/pkgs/sqlfmt.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, fetchFromGitHub, }: - -pkgs.stdenv.mkDerivation { - name = "sqlfmt-v0.21.3"; - src = fetchFromGitHub { - owner = "tconbeer"; - repo = "sqlfmt"; - rev = "v0.21.3"; - sha256 = "1sx8gf13pwsw63v5hfnml18fs2lnb2piigc1d4q8hmiywzmhzf85"; - }; - -#buildInputs = [ pkgs.python3 pkgs.isort pkgs.black pkgs.python311Packages.pytest pkgs.python311Packages.flake8 pkgs.python311Packages.mypy ]; - buildInputs = [ pkgs.python3 pkgs.python311Packages.pip pkgs.isort pkgs.black pkgs.python311Packages.pytest pkgs.python311Packages.flake8 pkgs.python311Packages.mypy ]; - - installPhase = '' - export PYTHONPATH="$\{python.sitePackages}:$PYTHONPATH" - $\{python}/bin/pip install --prefix $out . - ''; - - meta = { - description = "sqlfmt is a tool that autoformats your SQL queries."; - homepage = "https://github.com/tconbeer/sqlfmt"; - license = "Apache 2.0"; - }; -}