Merge pull request #58 from giraffe-fsharp/mrtz/nix

Prepare release and bump nix dependencies

Author: mrtz-j

.envrc

@@ -1 +1,9 @@
-use_nix
+#!/usr/bin/env bash
+# the shebang is ignored, but nice for editors
+watch_file npins/sources.json
+
+# Load .env file if it exists
+dotenv_if_exists
+
+# Activate development shell
+use nix

.github/workflows/build.yml

@@ -8,8 +8,12 @@ env:
   # Stop wasting time caching packages
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   # Disable sending usage data to Microsoft
-  DOTNET_CLI_TELEMETRY_OPTOUT: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
   DOTNET_VERSION: 8.0.301
+  DOTNET_MULTILEVEL_LOOKUP: '0'
+  DOTNET_NOLOGO: 'true'
+  FORCE_COLOR: '1'
+  NUGET_XMLDOC_MODE: ''
 
 # Kill other jobs when we trigger this workflow by sending new commits
 # to the PR.
@@ -18,10 +22,13 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   fantomas-check:
     name: "Format with Fantomas"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       -   name: Checkout repository
           uses: actions/checkout@v4

.github/workflows/publish.yml

@@ -13,6 +13,10 @@ env:
   # Project name to pack and publish
   PROJECT_NAME: Giraffe.OpenApi
   DOTNET_VERSION: 8.0.301
+  DOTNET_MULTILEVEL_LOOKUP: '0'
+  DOTNET_NOLOGO: 'true'
+  FORCE_COLOR: '1'
+  NUGET_XMLDOC_MODE: ''
   # GitHub Packages Feed settings
   GITHUB_FEED: https://nuget.pkg.github.com/giraffe-fsharp/
   GITHUB_USER: dustinmoris
@@ -21,6 +25,9 @@ env:
   NUGET_FEED: https://api.nuget.org/v3/index.json
   NUGET_KEY: ${{ secrets.NUGET_KEY }}
 
+permissions:
+  contents: read
+  
 jobs:
   build:
     name: Build the project

.gitignore

@@ -9,3 +9,4 @@
 .direnv
 .DS_Store
 result
+result-*

CHANGELOG.md

@@ -1,5 +1,13 @@
 Notable changes are recorded here.
 
+# Giraffe.OpenApi 0.0.2
+
+## Updates
+
+- Add labeled path parameters - Credits @RJSonnenberg
+- Fix issue where using multiple path parameters AND addOpenApiSimple, which requires a tuple for the request type, caused a request body to be required despite all parameters being in path. - Credits @RJSonnenberg
+- Update sample project to redirect to Swagger UI upon startup. - Credits @RJSonnenberg
+
 # Giraffe.OpenApi 0.0.1
 
 Initial Version

nuget.config NuGet.Confignuget.config renamed to NuGet.Config

@@ -1,46 +1,41 @@
 {
-  sources ? import ./deps,
+  sources ? import ./npins,
   system ? builtins.currentSystem,
-}: let
-  pname = "GiraffeOpenApi";
+  pkgs ? import sources.nixpkgs {
+    inherit system;
+    config = { };
+    overlays = [ ];
+  },
+}:
+let
+  pname = "Giraffe.OpenApi";
   dotnet-sdk = pkgs.dotnet-sdk_8;
   dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0;
-  version = "0.0.1";
-  dotnetTool = toolName: toolVersion: sha256:
-    pkgs.stdenvNoCC.mkDerivation rec {
-      name = toolName;
-      version = toolVersion;
-      nativeBuildInputs = [pkgs.makeWrapper];
-      src = pkgs.fetchNuGet {
-        pname = name;
-        version = version;
-        sha256 = sha256;
-        installPhase = ''mkdir -p $out/bin && cp -r tools/net8.0/any/* $out/bin'';
-      };
-      installPhase = ''
-        runHook preInstall
-        mkdir -p "$out/lib"
-        cp -r ./bin/* "$out/lib"
-        makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${name}" --add-flags "$out/lib/${name}.dll"
-        runHook postInstall
-      '';
-    };
-  shell = pkgs.mkShell {
-    nativeBuildInputs = [
+  version = "0.0.2";
+  shell = pkgs.mkShellNoCC {
+    buildInputs = [
       dotnet-sdk
     ];
 
+    packages = [
+      pkgs.npins
+      pkgs.fantomas
+      pkgs.fsautocomplete
+    ];
+
     DOTNET_ROOT = "${dotnet-sdk}";
   };
-  pkgs = import sources.nixpkgs {
-    inherit system;
-    config = {};
-    overlays = [];
-  };
-in {
+in
+{
   inherit shell;
-  fantomas = dotnetTool "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version (builtins.head (builtins.filter (elem: elem.pname == "fantomas") ((import ./deps/deps.nix) {fetchNuGet = x: x;}))).sha256;
-  default = pkgs.callPackage ./deps/giraffe-openapi.nix {
-    inherit pname version dotnet-sdk dotnet-runtime pkgs;
+
+  default = pkgs.callPackage ./nix/package.nix {
+    inherit
+      pname
+      version
+      dotnet-sdk
+      dotnet-runtime
+      pkgs
+      ;
   };
 }