diff --git a/default.nix b/default.nix index 43b5e80..81bdf96 100644 --- a/default.nix +++ b/default.nix @@ -10,11 +10,6 @@ { pkgs ? import { } , system ? builtins.currentSystem -, mach-nixpkgs ? import (builtins.fetchTarball { url = "https://github.com/nixos/nixpkgs/archive/9fd0585f7dc9b85eb5d426396004cc649261e60d.tar.gz"; sha256 = "sha256:0xl9mc0p63jr490hnrmlky7rm13f7zmp2hp1d9bjfyrbwafsg4dv"; }) {} -, mach-nix ? import (builtins.fetchTarball { url = "https://github.com/davhau/mach-nix/archive/6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1.tar.gz"; sha256 = "sha256:1a0gny4nlq39nyhgn94kl4rhmzax3h8xyh0jl7wrv0rzg38zf705"; }) { - pkgs = mach-nixpkgs; - pypiData = builtins.fetchTarball { url = "https://github.com/davhau/pypi-deps-db/archive/e9571cac25d2f509e44fec9dc94a3703a40126ff.tar.gz"; sha256 = "sha256:1rbb0yx5kjn0j6lk0ml163227swji8abvq0krynqyi759ixirxd5"; }; - } }: { # The `lib`, `modules`, and `overlay` names are special lib = import ./lib { inherit pkgs; }; # functions @@ -25,6 +20,6 @@ gitea-nyx = import ./pkgs/gitea-nyx { inherit pkgs; }; emacsPackages = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs/emacs-packages { }); pythonPackages = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs/python-packages { }); - rec-mono-nyx = pkgs.callPackage ./pkgs/rec-mono-nyx { inherit mach-nix mach-nixpkgs system; }; + rec-mono-nyx = pkgs.callPackage ./pkgs/rec-mono-nyx { inherit system; }; libspectre = pkgs.callPackage ./pkgs/libspectre { }; } diff --git a/flake.lock b/flake.lock index d36724a..c80d9d8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,66 +1,12 @@ { "nodes": { - "flake-utils": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "mach-nix": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "mach-nixpkgs" - ], - "pypi-deps-db": "pypi-deps-db" - }, - "locked": { - "lastModified": 1661359648, - "narHash": "sha256-BRz30Xg/g535oRJA3xEcXf0KM6GTJPugt2lgaom3D6g=", - "owner": "davhau", - "repo": "mach-nix", - "rev": "6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1", - "type": "github" - }, - "original": { - "owner": "davhau", - "repo": "mach-nix", - "rev": "6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1", - "type": "github" - } - }, - "mach-nixpkgs": { - "locked": { - "lastModified": 1670452817, - "narHash": "sha256-u5GnneIreydXauFCces/boSaj5+0ZgtBIlkOcwGriXY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9fd0585f7dc9b85eb5d426396004cc649261e60d", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9fd0585f7dc9b85eb5d426396004cc649261e60d", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1624561540, - "narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=", + "lastModified": 1683475240, + "narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11", + "rev": "e040aab15638aaf8d0786894851a2b1ca09a7baf", "type": "github" }, "original": { @@ -70,26 +16,8 @@ "type": "github" } }, - "pypi-deps-db": { - "flake": false, - "locked": { - "lastModified": 1670518748, - "narHash": "sha256-pfUce0zlRI+tzxPgvRSKkusjxDCBVjCpkcDKWboHa+U=", - "owner": "davhau", - "repo": "pypi-deps-db", - "rev": "e9571cac25d2f509e44fec9dc94a3703a40126ff", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "pypi-deps-db", - "type": "github" - } - }, "root": { "inputs": { - "mach-nix": "mach-nix", - "mach-nixpkgs": "mach-nixpkgs", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index ef52e8d..4da0f47 100644 --- a/flake.nix +++ b/flake.nix @@ -1,16 +1,7 @@ { description = "My personal NUR repository"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.mach-nixpkgs.url = "github:nixos/nixpkgs/9fd0585f7dc9b85eb5d426396004cc649261e60d"; - inputs.mach-nix = { - url = "github:davhau/mach-nix/6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1"; - inputs.nixpkgs.follows = "mach-nixpkgs"; - inputs.pypi-deps-db = { - url = "github:davhau/pypi-deps-db/e9571cac25d2f509e44fec9dc94a3703a40126ff"; - inputs.nixpkgs.follows = "mach-nixpkgs"; - }; - }; - outputs = { self, nixpkgs, mach-nixpkgs, mach-nix }: + outputs = { self, nixpkgs }: let systems = [ "x86_64-linux" @@ -25,8 +16,6 @@ { packages = forAllSystems (system: import ./default.nix { pkgs = import nixpkgs { inherit system; }; - mach-nixpkgs = import mach-nixpkgs { inherit system; }; - mach-nix = mach-nix.lib.${system}; inherit system; }); }; diff --git a/pkgs/gitea-nyx/build.nix b/pkgs/gitea-nyx/build.nix index e04cc4d..bd703b5 100644 --- a/pkgs/gitea-nyx/build.nix +++ b/pkgs/gitea-nyx/build.nix @@ -10,7 +10,7 @@ pkgs.buildGoModule rec { src = pkgs.fetchgit { url = "https://gitea.pid1.sh/sanctureplicum/gitea.git"; rev = "refs/tags/${giteaVersion}"; - sha256 = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4="; + sha256 = "sha256-jFNnHi1nja0DXq6nSgrBaQ3ezWKe55XyaHR77pGNM7U="; }; nativeBuildInputs = [