From 5cdb4af753d6565bd67b31f1a2114650921241cf Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 4 May 2023 10:56:46 +0200 Subject: [PATCH] unfree licenses prevent flake check This reverts commit 3b34cfe9582b2378d489f2c8dd8b83643fff09ef. --- flake.lock | 18 +++++++++--------- flake.nix | 9 +++------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index dae3cc0..cef0aa8 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1683153724, - "narHash": "sha256-wiQ8pBYbbPklLngAz5w3VvwmpLqTNroKc7um56iCLHo=", + "lastModified": 1682977601, + "narHash": "sha256-F1Va/Uiw2tVNn27FLqWyBkiqDyIm/eCamw9wA/GK8Fw=", "owner": "nix-community", "repo": "home-manager", - "rev": "514c0a71f47cb80282742d7e4b6913c2c0582c2d", + "rev": "0e4c33d76006c9080d2f228ba1c2308e3e4d7be6", "type": "github" }, "original": { @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1683186212, - "narHash": "sha256-yX8IvlTZk/RoNWS7GuOWv4C3rnR/supXfK9hw1O5biY=", + "lastModified": 1682980127, + "narHash": "sha256-gR9nRwiq1TGtc83SpDnaBcjnEbnOJks4oDDhduGVEZQ=", "owner": "therealr5", "repo": "purge", - "rev": "b5c626728aced5c7b5243f6c6ace69be39197d00", + "rev": "82a64f778ee5edb2af95236077afef237a150104", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1683186719, - "narHash": "sha256-BWSTeVPlqjkQ5J5M5WAeNKqUhHwVQXddfQaQek8qWRU=", + "lastModified": 1683019282, + "narHash": "sha256-MfX/KiPTRllSzeRu3sBdLR2SpbNASL7LLxhUKbes6NQ=", "owner": "therealr5", "repo": "trucksimulatorbot-images", - "rev": "b7952feb4f1620e9f5f984d8f08aa4679d9b0177", + "rev": "a2b6a62af5ff0a9bbf25200b9a296ccf12c8df2c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 99c8076..fa67e50 100644 --- a/flake.nix +++ b/flake.nix @@ -61,12 +61,9 @@ , trucksimulatorbot-images , ... }@attrs: { - packages.x86_64-linux = { - default = self.nixosConfigurations.iso.config.system.build.isoImage; - jmri = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/jmri { }; - x32edit = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/x32edit{ }; - }; - hydraJobs = self.packages; + packages.x86_64-linux.default = self.nixosConfigurations.iso.config.system.build.isoImage; + packages.x86_64-linux.jmri = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/jmri { }; + hydraJobs.x86_64-linux = self.packages.x86_64-linux; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; nixosConfigurations = { thinkpad = nixpkgs.lib.nixosSystem {