From e7d8e4c2e4d63e952648d9eccd9422304acbca97 Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Sat, 8 Jun 2024 18:10:42 -0600
Subject: derivations.nix is better standard name

---
 packages/zeit/default.nix    |  2 +-
 packages/zeit/derivation.nix | 41 +++++++++++++++++++++++++++++++++++++++++
 packages/zeit/zeit.nix       | 41 -----------------------------------------
 3 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 packages/zeit/derivation.nix
 delete mode 100644 packages/zeit/zeit.nix

(limited to 'packages')

diff --git a/packages/zeit/default.nix b/packages/zeit/default.nix
index 3ff3751..48a21d9 100644
--- a/packages/zeit/default.nix
+++ b/packages/zeit/default.nix
@@ -1,2 +1,2 @@
 { pkgs ? import <nixpkgs> {} }:
-pkgs.callPackage ./zeit.nix{}
+pkgs.callPackage ./derivation.nix{}
diff --git a/packages/zeit/derivation.nix b/packages/zeit/derivation.nix
new file mode 100644
index 0000000..46b5b0b
--- /dev/null
+++ b/packages/zeit/derivation.nix
@@ -0,0 +1,41 @@
+{ buildGoModule, pkgs, fetchFromGitHub }:
+# stdenv.mkDerivation rec {
+buildGoModule rec {
+  pname = "zeit";
+  version = "0.0.7";
+  
+  src = fetchFromGitHub {
+    owner = "mrusme";
+    repo = "zeit";
+    rev = "v0.0.7";
+    sha256 = "SCBNMgFBmyeJHC8VU1K2zDhhvdYi9RqaKIcJ4ziKNa0=";
+  };
+  vendorHash = "sha256-gn5fwwBO4eUUYG1PJD7o8xS+tZO+P5M33fVvg2NDANw=";
+
+  # meta = with stdenv.lib; {
+  #   description = "";
+  #   homepage = "";
+  #   license = licenses.gpl;
+  #   maintainers = with maintainers; [];
+  #   platforms = [];
+  # };
+
+  nativeBuildInputs = with pkgs.buildPackages; [ go ];
+  buildInputs = [ ];
+
+  patchPhase = ''
+    sed -i 's/VERSION=0.0/VERSION=${version}/g' Makefile
+  '';
+
+  buildPhase = ''
+    # gcc program.c -o myprogram
+    # PREFIX=$out
+    make
+  	# go build -ldflags "-X github.com/mrusme/zeit/z.VERSION=$(version)"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp zeit $out/bin
+  '';
+}
diff --git a/packages/zeit/zeit.nix b/packages/zeit/zeit.nix
deleted file mode 100644
index 46b5b0b..0000000
--- a/packages/zeit/zeit.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ buildGoModule, pkgs, fetchFromGitHub }:
-# stdenv.mkDerivation rec {
-buildGoModule rec {
-  pname = "zeit";
-  version = "0.0.7";
-  
-  src = fetchFromGitHub {
-    owner = "mrusme";
-    repo = "zeit";
-    rev = "v0.0.7";
-    sha256 = "SCBNMgFBmyeJHC8VU1K2zDhhvdYi9RqaKIcJ4ziKNa0=";
-  };
-  vendorHash = "sha256-gn5fwwBO4eUUYG1PJD7o8xS+tZO+P5M33fVvg2NDANw=";
-
-  # meta = with stdenv.lib; {
-  #   description = "";
-  #   homepage = "";
-  #   license = licenses.gpl;
-  #   maintainers = with maintainers; [];
-  #   platforms = [];
-  # };
-
-  nativeBuildInputs = with pkgs.buildPackages; [ go ];
-  buildInputs = [ ];
-
-  patchPhase = ''
-    sed -i 's/VERSION=0.0/VERSION=${version}/g' Makefile
-  '';
-
-  buildPhase = ''
-    # gcc program.c -o myprogram
-    # PREFIX=$out
-    make
-  	# go build -ldflags "-X github.com/mrusme/zeit/z.VERSION=$(version)"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp zeit $out/bin
-  '';
-}
-- 
cgit v1.2.3