mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-21 21:50:43 -06:00
Compare commits
5 commits
f37b38118a
...
180b97e5b3
Author | SHA1 | Date | |
---|---|---|---|
180b97e5b3 | |||
5e029afdff | |||
76e48fc85e | |||
a873608597 | |||
0534193e15 |
6 changed files with 73 additions and 104 deletions
116
flake.lock
116
flake.lock
|
@ -40,11 +40,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724145018,
|
||||
"narHash": "sha256-6R5CeMgr3EGKhqWPkqtteOtix7hBaurfpjHepiq2OrU=",
|
||||
"lastModified": 1731534082,
|
||||
"narHash": "sha256-n8yVzBixxaj0Qn6SV655t6QUtKSOJ+sR4AEoq0Vqb/0=",
|
||||
"owner": "nlewo",
|
||||
"repo": "comin",
|
||||
"rev": "84ef9af404b9157eab2c5e3e44d7c29239329901",
|
||||
"rev": "9afca855518f79b5bff3d2a9663b2e6f81dd361a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -201,11 +201,11 @@
|
|||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -240,11 +240,11 @@
|
|||
"zig": "zig"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731469793,
|
||||
"narHash": "sha256-ZewQYTlsysOt6orTIIKNR+y43iklehOzeBF/Gfy7fog=",
|
||||
"lastModified": 1731606318,
|
||||
"narHash": "sha256-JXgJTl6qK8b7+g9ORH94fZ0sLCwebn8tkpxy1ZG0agA=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "523e3a6ae3e62463b309c1b3222bafd7b1fb11ef",
|
||||
"revCount": 7949,
|
||||
"rev": "4853597cd9829e622be2c3628dc748407c27c423",
|
||||
"revCount": 7968,
|
||||
"type": "git",
|
||||
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
||||
},
|
||||
|
@ -318,11 +318,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731526492,
|
||||
"narHash": "sha256-2Gob+eZEPpF225QrRLXyfeQ9L63YHFa/tNh15FW/Rzo=",
|
||||
"lastModified": 1731631654,
|
||||
"narHash": "sha256-a6gy39yki4mX/Oj83aG08nNntXxXhM1wjksNXGZ8x5c=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "3fb47372b79265ebdabeeefdad10359d5b18377a",
|
||||
"revCount": 5451,
|
||||
"rev": "098e491a43e8b26f4382b48651a4131464bf6a2f",
|
||||
"revCount": 5456,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
@ -413,11 +413,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731363071,
|
||||
"narHash": "sha256-FdB1uxTPgS7vcfVIsG720G2+t2l6uHksW3bp3fzz/Q8=",
|
||||
"lastModified": 1731684150,
|
||||
"narHash": "sha256-jY0bRx2SWuLU02nwDE8Q5bPuMMSiUISJYaH4GWfUFc4=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "884cb9c68c3d28542e581be762b13dcc380a8135",
|
||||
"revCount": 19,
|
||||
"rev": "888c8e4c9395e7abfcbfc044d575ff6cf955672a",
|
||||
"revCount": 21,
|
||||
"type": "git",
|
||||
"url": "https://git.dayl.in/daylin/hyprman.git"
|
||||
},
|
||||
|
@ -482,11 +482,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731240728,
|
||||
"narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=",
|
||||
"lastModified": 1731586450,
|
||||
"narHash": "sha256-upNRIVk5PmBPJ307djkiowhHOx8Dqwb5bpM4XNJH4Ek=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lib-aggregate",
|
||||
"rev": "807ab623e6d01e931269a28a07c59dcfd6474173",
|
||||
"rev": "902e1bb3c2ae0f051ff98e4e3eac247f7e6ca392",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -498,11 +498,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731334117,
|
||||
"narHash": "sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8=",
|
||||
"rev": "8a9094303bc7873c979e54ea20b9f50464ee3965",
|
||||
"lastModified": 1731416517,
|
||||
"narHash": "sha256-1LGkwq9g/BfM0JuZmWPYwBX5RiqIpW/BxXcsLwkVcGg=",
|
||||
"rev": "43777939eb2253596ff822771929a8820916fb29",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a9094303bc7873c979e54ea20b9f50464ee3965.tar.gz?rev=8a9094303bc7873c979e54ea20b9f50464ee3965"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/43777939eb2253596ff822771929a8820916fb29.tar.gz?rev=43777939eb2253596ff822771929a8820916fb29"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
@ -556,11 +556,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725469705,
|
||||
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
|
||||
"lastModified": 1731683943,
|
||||
"narHash": "sha256-S7J/6qnwvj09XSma37oynLONYP+rJAul/sX9hpK7cN4=",
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "nim2nix",
|
||||
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
|
||||
"rev": "a9f1182dbe51675b9666d6a79bebded7d9839ad7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -576,11 +576,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725469705,
|
||||
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
|
||||
"lastModified": 1731683943,
|
||||
"narHash": "sha256-S7J/6qnwvj09XSma37oynLONYP+rJAul/sX9hpK7cN4=",
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "nim2nix",
|
||||
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
|
||||
"rev": "a9f1182dbe51675b9666d6a79bebded7d9839ad7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -615,11 +615,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731250407,
|
||||
"narHash": "sha256-AwyDiazOqBZBUPp0vqYEzvBseZo3Eg16mfjAFvKv2lc=",
|
||||
"lastModified": 1731565875,
|
||||
"narHash": "sha256-jN6HcMNVgWPE++8vNQIyerugFDRWG1ffFCORK/vpCUs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-eval-jobs",
|
||||
"rev": "96902c4573cd03ea7e533634cb49861148f49a7a",
|
||||
"rev": "f2ccb7e2d80601fb43807c36f14703f2342420f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -657,11 +657,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731209121,
|
||||
"narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
|
||||
"lastModified": 1731593150,
|
||||
"narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
|
||||
"rev": "40d882b55e89add1ded379cc99edaab24983d6d9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -677,11 +677,11 @@
|
|||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730453870,
|
||||
"narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=",
|
||||
"lastModified": 1731682434,
|
||||
"narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "adb6bc4b661a43328752b4575be4968a4990c033",
|
||||
"rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -745,11 +745,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731515670,
|
||||
"narHash": "sha256-tY1C721VV87LfNdGBsdRwTXpskFlqEXxLokgNO1OnZA=",
|
||||
"lastModified": 1731645556,
|
||||
"narHash": "sha256-i27WZwS0f18v+5vODBDrnO5GVlzszseDBXcLQiYr5Yo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "c2fa066bb9952469a5e01a08293f78d114c02f09",
|
||||
"rev": "3a7690c5fe0ecfceeddbf09f8642dca424d29793",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -792,11 +792,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1731139594,
|
||||
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||
"lastModified": 1731319897,
|
||||
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -824,11 +824,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1731139594,
|
||||
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||
"lastModified": 1731319897,
|
||||
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -877,11 +877,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729614871,
|
||||
"narHash": "sha256-dSlXHzGlR4pxTGHioqyJoI5boDWwkAtNTPZo2Lsl4xU=",
|
||||
"lastModified": 1731609704,
|
||||
"narHash": "sha256-HSOQ5VyzXOfKLlwSg1pelbwf9hwj89V7rZMbv9ldA1E=",
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "pixi-flake",
|
||||
"rev": "30c2903994e41cea1ea341fd041a78633e95e7b7",
|
||||
"rev": "e11d879dabad54ec0ef0218b48cea7f630fada78",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -938,11 +938,11 @@
|
|||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1731239293,
|
||||
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
|
||||
"lastModified": 1731386116,
|
||||
"narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
|
||||
"rev": "689fed12a013f56d4c4d3f612489634267d86529",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1058,11 +1058,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "nix",
|
||||
"lastModified": 1731528486,
|
||||
"narHash": "sha256-lKtPFzEKzFeNg6euQjmNjetddhWgaS3jjtV0c9zEehw=",
|
||||
"lastModified": 1731626313,
|
||||
"narHash": "sha256-IGKZTmiJPfKBPq8m1TTmMPTKUxrsPwlHLv5UB1px6iU=",
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "tsm",
|
||||
"rev": "5ca52175f6e2f410975a766019158d0794a096ca",
|
||||
"rev": "62ca20fd9b608adc0dbdb30a8d5bf65e451d8908",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -43,10 +43,7 @@ let
|
|||
rec {
|
||||
default = oizys;
|
||||
oizys = pkgs.callPackage ../pkgs/oizys { };
|
||||
# nimlangserver = pkgs.callPackage ../pkgs/nimlangserver { };
|
||||
nph = pkgs.callPackage ../pkgs/nph { };
|
||||
iso = mkIso.config.system.build.isoImage;
|
||||
# roc = (pkgsFromSystem pkgs.system "roc").full;
|
||||
}
|
||||
// (inheritFlakePkgs pkgs [
|
||||
"pixi"
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
@ -11,14 +10,10 @@ let
|
|||
in
|
||||
{
|
||||
config = mkIfIn "nim" cfg {
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
environment.systemPackages = with pkgs; [
|
||||
nim
|
||||
])
|
||||
++ (with (flake.pkgs "self"); [
|
||||
nimlangserver
|
||||
# nph
|
||||
nimble
|
||||
]);
|
||||
nimlangserver
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
let inherit (pkgs) python3Packages;
|
||||
in
|
||||
{
|
||||
nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/
|
||||
nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
|
||||
# nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/
|
||||
# nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
|
||||
nimble = pkgs.callPackage ./nim/nimble { };
|
||||
distrobox = pkgs.callPackage ./distrobox {};
|
||||
llm = python3Packages.callPackage ./llm {};
|
||||
|
|
|
@ -7,14 +7,19 @@
|
|||
}:
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "nimble";
|
||||
version = "0.16.2";
|
||||
version = "0.16.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nim-lang";
|
||||
repo = "nimble";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MVHf19UbOWk8Zba2scj06PxdYYOJA6OXrVyDQ9Ku6Us=";
|
||||
hash = "sha256-1tO/6sKPjmu9B6/cF00DeY/mnUHi2Y+hTEZ3WCqKoGw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
buildInputs = [ openssl ];
|
||||
lockFile = ./lock.json;
|
||||
doCheck = false;
|
||||
|
||||
# localPassC needed from zippy since name mangling on nix is broken
|
||||
nimFlags = [
|
||||
''--passC:"-msse4.1 -mpclmul"''
|
||||
];
|
||||
})
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
"depends": [
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source",
|
||||
"rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0",
|
||||
"sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz",
|
||||
"subDir": "",
|
||||
"packages": [
|
||||
"checksums"
|
||||
]
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"path": "/nix/store/lwg9fm34h5xv0dvxij9r5m2y6pn1zsvx-source",
|
||||
"rev": "faf1617f44d7632ee9601ebc13887644925dcc01",
|
||||
"sha256": "1dxbc41wbvkpdp6q3qz1r38lpn32447qkkgyh2s12ym6bx4ynni4",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/nim-lang/sat/archive/faf1617f44d7632ee9601ebc13887644925dcc01.tar.gz",
|
||||
"subDir": "",
|
||||
"packages": [
|
||||
"sat"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
Loading…
Reference in a new issue