From d3e7b5c71318cce912204c3242e60dbfd4f10b55 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sat, 29 Jul 2023 20:53:10 +0200
Subject: [PATCH] chore: change flake.nix
---
flake.lock | 8 ++++----
flake.nix | 10 +---------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/flake.lock b/flake.lock
index cdd0370..9d35869 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1688679045,
- "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=",
+ "lastModified": 1690558459,
+ "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3c7487575d9445185249a159046cc02ff364bff8",
+ "rev": "48e82fe1b1c863ee26a33ce9bd39621d2ada0a33",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "nixos-unstable",
+ "ref": "nixos-23.05",
"type": "indirect"
}
},
diff --git a/flake.nix b/flake.nix
index 575f24f..7648996 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
description = "Bob: The HTML and HTML fragment builder";
# Nixpkgs / NixOS version to use.
- inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
+ inputs.nixpkgs.url = "nixpkgs/nixos-23.05";
outputs = { self, nixpkgs }:
let
@@ -10,14 +10,7 @@
# to work with older version of flakes
lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101";
- # Generate a user-friendly version number.
- #version = builtins.substring 0 8 lastModifiedDate;
-
-
rootPath = ./.;
- releaseJson = builtins.fromJSON (builtins.readFile "${rootPath}/release.json");
- version = releaseJson.version;
-
# System types to support.
supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
@@ -39,7 +32,6 @@
{
bob = pkgs.buildGoModule {
pname = "bob";
- inherit version;
# In 'nix develop', we don't need a copy of the source tree
# in the Nix store.
src = ././source;
--
GitLab