mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-21 21:50:43 -06:00
Compare commits
5 commits
cdb3cc4eb8
...
bad91ccc23
Author | SHA1 | Date | |
---|---|---|---|
bad91ccc23 | |||
e01954df5f | |||
1cc936f966 | |||
89b00d80f6 | |||
8fa461c214 |
6 changed files with 79 additions and 32 deletions
48
flake.lock
48
flake.lock
|
@ -240,11 +240,11 @@
|
||||||
"zig": "zig"
|
"zig": "zig"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732159111,
|
"lastModified": 1732470296,
|
||||||
"narHash": "sha256-dIHQDtvPXsuv0z6DVgK6GvTh/jJn14B7Q9J0gT38Pl4=",
|
"narHash": "sha256-nsrkCMhhoJiRYv3wIfCLjEu/9RF3yD8fYngzAWx6NMY=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "63bf16ff00ccac2f730519b4f0dd14cde857792d",
|
"rev": "4c2d4620007c4c774b7bc6fd282827c04c08686c",
|
||||||
"revCount": 8050,
|
"revCount": 8100,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
||||||
},
|
},
|
||||||
|
@ -318,11 +318,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732100541,
|
"lastModified": 1732545731,
|
||||||
"narHash": "sha256-vFeNbKUstvSZbe9TD4bDYozZd+A/bKD+fxCye+p/Mp8=",
|
"narHash": "sha256-nRit2lb7kha7bcNB6pwhySbpI7Tjc1PLnkJvayBiJr8=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "940f7aa990dbc99815bab8d355999d8277534b17",
|
"rev": "268778823676ef2bbda42050d78946e1fc27fc31",
|
||||||
"revCount": 5484,
|
"revCount": 5497,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland/"
|
"url": "https://github.com/hyprwm/Hyprland/"
|
||||||
|
@ -482,11 +482,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731845570,
|
"lastModified": 1732450403,
|
||||||
"narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=",
|
"narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lib-aggregate",
|
"repo": "lib-aggregate",
|
||||||
"rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9",
|
"rev": "c817444fb8a3042c26be57d8640fb744bc1b516c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -657,11 +657,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731814505,
|
"lastModified": 1732519917,
|
||||||
"narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=",
|
"narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132",
|
"rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -708,11 +708,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731805462,
|
"lastModified": 1732410305,
|
||||||
"narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=",
|
"narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734",
|
"rev": "87b6978992e2eb605732fba842cad0a7e14b2047",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -745,11 +745,11 @@
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732145604,
|
"lastModified": 1732544430,
|
||||||
"narHash": "sha256-GJPuAKncOF26uKuU0hxEBrBnk7Tc2eWDgm4IeVoOTwI=",
|
"narHash": "sha256-rkQmPl7ER9S5H7hc9/GeZpbZmPJSDlITWfQ9RSMZig4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "82ed6bde37ade88716387bb84d03f6c1aaa74d79",
|
"rev": "6a8bc146b4e46d70f182e070f4fe0a69c80b8a2a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -792,16 +792,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732014248,
|
"lastModified": 1732238832,
|
||||||
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
|
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
|
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixpkgs-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
outputs = inputs: (import ./lib inputs).oizysFlake;
|
outputs = inputs: (import ./lib inputs).oizysFlake;
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";
|
my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ in
|
||||||
{
|
{
|
||||||
nph = pkgs.callPackage ./nim/nph { };
|
nph = pkgs.callPackage ./nim/nph { };
|
||||||
# nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
|
# nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
|
||||||
|
procs = pkgs.callPackage ./nim/procs { };
|
||||||
nimble = pkgs.callPackage ./nim/nimble { };
|
nimble = pkgs.callPackage ./nim/nimble { };
|
||||||
|
|
||||||
distrobox = pkgs.callPackage ./distrobox { };
|
distrobox = pkgs.callPackage ./distrobox { };
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
{
|
{
|
||||||
|
lib,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
buildNimPackage,
|
buildNimPackage,
|
||||||
# deps
|
# deps
|
||||||
openssl,
|
openssl,
|
||||||
|
nim,
|
||||||
|
makeWrapper,
|
||||||
|
|
||||||
}:
|
}:
|
||||||
buildNimPackage (finalAttrs: {
|
buildNimPackage (finalAttrs: {
|
||||||
|
@ -15,11 +18,23 @@ buildNimPackage (finalAttrs: {
|
||||||
hash = "sha256-1tO/6sKPjmu9B6/cF00DeY/mnUHi2Y+hTEZ3WCqKoGw=";
|
hash = "sha256-1tO/6sKPjmu9B6/cF00DeY/mnUHi2Y+hTEZ3WCqKoGw=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
buildInputs = [ openssl ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
doCheck = false;
|
buildInputs = [ openssl ];
|
||||||
|
|
||||||
# localPassC needed from zippy since name mangling on nix is broken
|
nimFlags = [ "--define:git_revision_override=${finalAttrs.src.rev}" ];
|
||||||
nimFlags = [
|
|
||||||
''--passC:"-msse4.1 -mpclmul"''
|
doCheck = false; # it works on their machine
|
||||||
];
|
|
||||||
})
|
postInstall = ''
|
||||||
|
wrapProgram $out/bin/nimble \
|
||||||
|
--suffix PATH : ${lib.makeBinPath [ nim ]}
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Package manager for the Nim programming language";
|
||||||
|
homepage = "https://github.com/nim-lang/nimble";
|
||||||
|
license = lib.licenses.bsd3;
|
||||||
|
mainProgram = "nimble";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
15
pkgs/nim/procs/default.nix
Normal file
15
pkgs/nim/procs/default.nix
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{ fetchFromGitHub, buildNimPackage }:
|
||||||
|
buildNimPackage( finalAttrs: {
|
||||||
|
pname = "procs";
|
||||||
|
version = "0.7.3";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "c-blake";
|
||||||
|
repo = "procs";
|
||||||
|
rev = finalAttrs.version;
|
||||||
|
hash = "sha256-TlR3eOPI6ed0EbGUdSdDYaYKippiFOspSWkv2JePR4M=";
|
||||||
|
};
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
lockFile = ./lock.json;
|
||||||
|
}
|
||||||
|
)
|
16
pkgs/nim/procs/lock.json
Normal file
16
pkgs/nim/procs/lock.json
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"depends": [
|
||||||
|
{
|
||||||
|
"method": "fetchzip",
|
||||||
|
"path": "/nix/store/xhjd99w42nrbi93czwqrpiqk75am3dcn-source",
|
||||||
|
"rev": "e274362fc12dff368aeacd982112385f59fc8c49",
|
||||||
|
"sha256": "19d8na1qnq80y0zwrsq3a99dnxir1c9vjg6h355cm15l4wgad2c8",
|
||||||
|
"srcDir": "",
|
||||||
|
"url": "https://github.com/c-blake/cligen/archive/e274362fc12dff368aeacd982112385f59fc8c49.tar.gz",
|
||||||
|
"subDir": "",
|
||||||
|
"packages": [
|
||||||
|
"cligen"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
Loading…
Reference in a new issue