diff --git a/.hydra/jobsets.nix b/.hydra/jobsets.nix deleted file mode 100644 index 343da56..0000000 --- a/.hydra/jobsets.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ nixpkgs ? }: - -let - - pkgs = import nixpkgs { }; - -in - -{ - - myapp = pkgs.writeShellScript "hello" "${pkgs.hello}/bin/hello"; - -} diff --git a/.hydra/spec.json b/.hydra/spec.json deleted file mode 100644 index 818e84c..0000000 --- a/.hydra/spec.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "hello": { - "enabled": 1, - "hidden": false, - "description": "test", - "nixexprinput": "src", - "nixexprpath": ".hydra/jobsets.nix", - "checkinterval": 300, - "schedulingshares": 100, - "enableemail": false, - "emailoverride": "", - "keepnr": 3, - "inputs": { - "src": { - "type": "git", - "value": "https://forgejo.stefka.eu/jiriks74/zsh.nix main", - "emailresponsible": false - }, - "nixpkgs": { "type": "git", - "type": "git", - "value": "https://github.com/NixOS/nixpkgs.git nixos-unstable", - "emailresponsible": false - } - } - } -} diff --git a/flake.lock b/flake.lock index 96ab7db..78c03aa 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 02fe3b2..0021731 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,9 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - # home-manager = { - # url = "github:nix-community/home-manager/master"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, @@ -52,6 +47,5 @@ ]; }; }; - hydraJobs = import ./hydra.nix {inherit inputs outputs;}; }; } diff --git a/hydra.nix b/hydra.nix deleted file mode 100644 index 2a67e0a..0000000 --- a/hydra.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - inputs, - outputs, -}: let - inherit (inputs.nixpkgs) lib; - - notBroken = pkg: !(pkg.meta.broken or false); - isDistributable = pkg: (pkg.meta.license or {redistributable = true;}).redistributable; - hasPlatform = sys: pkg: lib.elem sys (pkg.meta.platforms or [sys]); - filterValidPkgs = sys: pkgs: - lib.filterAttrs (_: pkg: - lib.isDerivation pkg - && hasPlatform sys pkg - && notBroken pkg - && isDistributable pkg) - pkgs; - - getConfigTopLevel = _: cfg: cfg.config.system.build.toplevel; -in { - # pkgs = lib.mapAttrs filterValidPkgs outputs.packages; - # hosts = lib.mapAttrs getConfigTopLevel outputs.nixosConfigurations; - default = lib.mapAttrs getConfigTopLevel outputs.homeManagerModules.default; - withPackages = lib.mapAttrs getConfigTopLevel outputs.homeManagerModules.withPackages; -}