daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 06:00:45 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:bad91ccc23c7a5a37f9c143d108e6a411b96bd18
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:cdb3cc4eb829651000f29bfd7979563dbd92ccd1
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "bad91ccc23c7a5a37f9c143d108e6a411b96bd18" and "cdb3cc4eb829651000f29bfd7979563dbd92ccd1" have entirely different histories.
bad91ccc23 ... cdb3cc4eb8

6 changed files with 32 additions and 79 deletions
Show stats Expand all files Collapse all files

48
flake.lock
View file

@ -240,11 +240,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1732470296, "lastModified": 1732159111,
"narHash": "sha256-nsrkCMhhoJiRYv3wIfCLjEu/9RF3yD8fYngzAWx6NMY=", "narHash": "sha256-dIHQDtvPXsuv0z6DVgK6GvTh/jJn14B7Q9J0gT38Pl4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "4c2d4620007c4c774b7bc6fd282827c04c08686c", "rev": "63bf16ff00ccac2f730519b4f0dd14cde857792d",
"revCount": 8100, "revCount": 8050,
"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": 1732545731, "lastModified": 1732100541,
"narHash": "sha256-nRit2lb7kha7bcNB6pwhySbpI7Tjc1PLnkJvayBiJr8=", "narHash": "sha256-vFeNbKUstvSZbe9TD4bDYozZd+A/bKD+fxCye+p/Mp8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "268778823676ef2bbda42050d78946e1fc27fc31", "rev": "940f7aa990dbc99815bab8d355999d8277534b17",
"revCount": 5497, "revCount": 5484,
"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": 1732450403, "lastModified": 1731845570,
"narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=", "narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "c817444fb8a3042c26be57d8640fb744bc1b516c", "rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -657,11 +657,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732519917, "lastModified": 1731814505,
"narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -708,11 +708,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1732410305, "lastModified": 1731805462,
"narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "87b6978992e2eb605732fba842cad0a7e14b2047", "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1732544430, "lastModified": 1732145604,
"narHash": "sha256-rkQmPl7ER9S5H7hc9/GeZpbZmPJSDlITWfQ9RSMZig4=", "narHash": "sha256-GJPuAKncOF26uKuU0hxEBrBnk7Tc2eWDgm4IeVoOTwI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "6a8bc146b4e46d70f182e070f4fe0a69c80b8a2a", "rev": "82ed6bde37ade88716387bb84d03f6c1aaa74d79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -792,16 +792,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1732238832, "lastModified": 1732014248,
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -4,7 +4,7 @@
outputs = inputs: (import ./lib inputs).oizysFlake; outputs = inputs: (import ./lib inputs).oizysFlake;
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-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";

1
pkgs/default.nix
View file

@ -5,7 +5,6 @@ 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 { };

29
pkgs/nim/nimble/default.nix
View file

@ -1,11 +1,8 @@
{ {
lib,
fetchFromGitHub, fetchFromGitHub,
buildNimPackage, buildNimPackage,
# deps # deps
openssl, openssl,
nim,
makeWrapper,
}: }:
buildNimPackage (finalAttrs: { buildNimPackage (finalAttrs: {
@ -18,23 +15,11 @@ buildNimPackage (finalAttrs: {
hash = "sha256-1tO/6sKPjmu9B6/cF00DeY/mnUHi2Y+hTEZ3WCqKoGw="; hash = "sha256-1tO/6sKPjmu9B6/cF00DeY/mnUHi2Y+hTEZ3WCqKoGw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ makeWrapper ]; buildInputs = [ openssl ];
buildInputs = [ openssl ]; doCheck = false;
nimFlags = [ "--define:git_revision_override=${finalAttrs.src.rev}" ]; # localPassC needed from zippy since name mangling on nix is broken
nimFlags = [
doCheck = false; # it works on their machine ''--passC:"-msse4.1 -mpclmul"''
];
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
View file

@ -1,15 +0,0 @@
{ 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
View file

@ -1,16 +0,0 @@
{
"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"
]
}
]
}