From 6351b4791f5db6dde06fe852a2f22da7ab4ae566 Mon Sep 17 00:00:00 2001 From: Dominic Egginton Date: Sun, 1 Sep 2024 10:44:40 +0100 Subject: [PATCH 1/2] chore: update nix shell --- flake.nix | 18 ++++++++---------- shell.nix | 8 ++------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 9531586..fafc6e8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,24 +2,22 @@ inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = - { self - , nixpkgs - , flake-utils - , - }: + outputs = { nixpkgs, flake-utils, ... }: - with flake-utils.lib; + with flake-utils.lib; - eachDefaultSystem (system: + eachDefaultSystem (system: let - pkgs = import nixpkgs { inherit system; }; + pkgs = import nixpkgs { + inherit system; + overlays = [ (final: _: { nanoseconds = final.callPackage ./. { }; }) ]; + }; in { formatter = pkgs.nixpkgs-fmt; - packages.default = pkgs.callPackage ./default.nix { }; + packages.default = pkgs.nanoseconds; devShells.default = pkgs.callPackage ./shell.nix { }; }); } diff --git a/shell.nix b/shell.nix index 0ec8561..558e6f2 100644 --- a/shell.nix +++ b/shell.nix @@ -3,10 +3,6 @@ pkgs.mkShell.override { inherit (swift) stdenv; } { - buildInputs = with pkgs; [ - swift - swiftPackages.Foundation - swiftpm - swiftpm2nix - ]; + inputsFrom = [ pkgs.nanoseconds ]; + packages = [ pkgs.swiftpm2nix ]; } From 91f6ff363c5b3495a9ea5c1d3abdb949049287dc Mon Sep 17 00:00:00 2001 From: Dominic Egginton Date: Sun, 1 Sep 2024 11:12:29 +0100 Subject: [PATCH 2/2] chore: add example --- Package.swift | 3 ++- Sources/Example/main.swift | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Sources/Example/main.swift diff --git a/Package.swift b/Package.swift index b41e049..24e1f81 100644 --- a/Package.swift +++ b/Package.swift @@ -8,6 +8,7 @@ let package = Package( ], targets: [ .target(name: "Nanoseconds"), - .testTarget(name: "NanosecondsTests", dependencies: ["Nanoseconds"]) + .testTarget(name: "NanosecondsTests", dependencies: ["Nanoseconds"]), + .target(name: "Example", dependencies: ["Nanoseconds"]) ] ) diff --git a/Sources/Example/main.swift b/Sources/Example/main.swift new file mode 100644 index 0000000..7bab4af --- /dev/null +++ b/Sources/Example/main.swift @@ -0,0 +1,8 @@ +import Foundation +import Nanoseconds + +let start = Now() +sleep(1) +let end = Now() +let duration = end - start +print(duration)