commit 14e6b32be695db72e48da72ca2f92239b3acbe8c
parent 9ccf9bfd0036282f7a9fc389c3170213d225d29e
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 20 Nov 2022 15:26:02 +0300
Up
Diffstat:
9 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1668231603,
- "narHash": "sha256-/4br947zgRqABb52iLF4DCHgD49Fw5aQ6/IdTwaM95E=",
+ "lastModified": 1668882784,
+ "narHash": "sha256-L1mHACWrG83j8U/jDtAdQHmVZu+JwVUxRPf5mhuzr2s=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d8f2c4d846a2e65ad3f5a5e842b672f0b81588a2",
+ "rev": "a1b4a562216eba8df3053bd869155dde4b5bca12",
"type": "github"
},
"original": {
diff --git a/pkgs/misc/amethyst/bin.nix b/pkgs/darwin/amethyst/bin.nix
diff --git a/pkgs/darwin/cudatext/bin.nix b/pkgs/darwin/cudatext/bin.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchurl, undmg, cudatext }:
+
+stdenv.mkDerivation rec {
+ pname = "cudatext-bin";
+ version = "1.176.0.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-amd64-${version}.dmg";
+ hash = "sha256-w5hAxkqopNMzeIQFvCBn8+50CtOB15PGjtAzPBuL3MI=";
+ };
+
+ nativeBuildInputs = [ undmg ];
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/Applications
+ cp -R *.app $out/Applications
+ '';
+
+ meta = with lib; {
+ inherit (cudatext.meta) description homepage changelog license;
+ platforms = [ "x86_64-darwin" ];
+ maintainers = [ maintainers.sikmir ];
+ skip.ci = true;
+ };
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -25,6 +25,8 @@ lib.makeScope newScope (
### DARWIN
+ amethyst-bin = callPackage ./darwin/amethyst/bin.nix { };
+ cudatext-bin = callPackage ./darwin/cudatext/bin.nix { };
macpass-bin = callPackage ./darwin/macpass/bin.nix { };
marta-bin = callPackage ./darwin/marta { };
@@ -136,17 +138,12 @@ lib.makeScope newScope (
### GEMINI
agunua = callPackage ./gemini/agunua { };
- astronaut = callPackage ./gemini/astronaut {
- # Go 1.18 build error on darwin, caused by an old version of golang.org/x/sys
- buildGoModule = pkgs.buildGo117Module;
- };
+ astronaut = callPackage ./gemini/astronaut { };
comitium = callPackage ./gemini/comitium { };
gemcert = callPackage ./gemini/gemcert { };
gemgen = callPackage ./gemini/gemgen { };
gemget = callPackage ./gemini/gemget { };
- gemini-ipfs-gateway = callPackage ./gemini/gemini-ipfs-gateway {
- buildGoModule = pkgs.buildGo117Module;
- };
+ gemini-ipfs-gateway = callPackage ./gemini/gemini-ipfs-gateway { };
geminid = callPackage ./gemini/geminid { };
gemreader = callPackage ./gemini/gemreader { };
gemserv = callPackage ./gemini/gemserv {
@@ -294,7 +291,6 @@ lib.makeScope newScope (
### MISC
aamath = callPackage ./misc/aamath { };
- amethyst-bin = callPackage ./misc/amethyst/bin.nix { };
apibackuper = callPackage ./misc/apibackuper { };
ascii-dash = callPackage ./misc/ascii-dash { };
btpd = callPackage ./misc/btpd { };
@@ -308,9 +304,7 @@ lib.makeScope newScope (
docx2csv = callPackage ./misc/docx2csv { };
finalcut = callPackage ./misc/finalcut { };
gaiagpsclient = callPackage ./misc/gaiagpsclient { };
- glauth = callPackage ./misc/glauth {
- buildGoModule = pkgs.buildGo117Module;
- };
+ glauth = callPackage ./misc/glauth { };
graphene = callPackage ./misc/graphene { };
gsl-lite = callPackage ./misc/gsl-lite { };
how-to-use-pvs-studio-free = callPackage ./misc/pvs-studio/how-to-use-pvs-studio-free.nix { };
@@ -323,12 +317,8 @@ lib.makeScope newScope (
md2html = callPackage ./misc/md2html { };
miband4 = callPackage ./misc/miband4 { };
morse-talk = callPackage ./misc/morse-talk { };
- mqtt-benchmark = callPackage ./misc/mqtt-benchmark {
- buildGoModule = pkgs.buildGo117Module;
- };
- musig = callPackage ./misc/musig {
- buildGoModule = pkgs.buildGo117Module;
- };
+ mqtt-benchmark = callPackage ./misc/mqtt-benchmark { };
+ musig = callPackage ./misc/musig { };
nanodns = callPackage ./misc/nanodns { };
nmtree = callPackage ./misc/nmtree { };
objlab = callPackage ./misc/objlab { };
@@ -356,9 +346,7 @@ lib.makeScope newScope (
### NAKARTE
- elevation_server = callPackage ./nakarte/elevation_server {
- buildGoPackage = pkgs.buildGo117Package;
- };
+ elevation_server = callPackage ./nakarte/elevation_server { };
map-tiler = callPackage ./nakarte/map-tiler {
python3Packages = pkgs.python39Packages;
};
diff --git a/pkgs/gemini/astronaut/default.nix b/pkgs/gemini/astronaut/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }:
+{ lib, stdenv, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }:
buildGoModule rec {
pname = "astronaut";
@@ -32,5 +32,6 @@ buildGoModule rec {
license = licenses.gpl3Only;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/gemini/gemini-ipfs-gateway/default.nix b/pkgs/gemini/gemini-ipfs-gateway/default.nix
@@ -19,5 +19,6 @@ buildGoModule rec {
license = licenses.agpl3Only;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/misc/glauth/default.nix b/pkgs/misc/glauth/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule, go-bindata }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule, go-bindata }:
buildGoModule rec {
pname = "glauth";
@@ -31,5 +31,6 @@ buildGoModule rec {
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/misc/musig/default.nix b/pkgs/misc/musig/default.nix
@@ -31,5 +31,6 @@ buildGoModule rec {
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/nakarte/elevation_server/default.nix b/pkgs/nakarte/elevation_server/default.nix
@@ -25,5 +25,6 @@ buildGoPackage rec {
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
