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 31 additions and 62 deletions
32
flake.lock
32
flake.lock
|
|
@ -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"
|
||||
},
|
||||
|
|
@ -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": {
|
||||
|
|
@ -677,11 +677,11 @@
|
|||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731586452,
|
||||
"narHash": "sha256-tXqbmtaMDW0fsaoxHroOuZ6/A3MRWIoo7Hxtb35Kn2g=",
|
||||
"lastModified": 1731682434,
|
||||
"narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "17186904d5304c9d1fcc1e85e319b19f0396d4c4",
|
||||
"rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -745,11 +745,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731622781,
|
||||
"narHash": "sha256-+oOsI1w5a7MpqM7jRHBlb8BYRmx0+dac1rn+CUHYRG0=",
|
||||
"lastModified": 1731645556,
|
||||
"narHash": "sha256-i27WZwS0f18v+5vODBDrnO5GVlzszseDBXcLQiYr5Yo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "f2b7b11df6dfa8e3becdd3441d1880fdd1d8f979",
|
||||
"rev": "3a7690c5fe0ecfceeddbf09f8642dca424d29793",
|
||||
"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; [
|
||||
nim
|
||||
])
|
||||
++ (with (flake.pkgs "self"); [
|
||||
nimlangserver
|
||||
# nph
|
||||
nimble
|
||||
]);
|
||||
environment.systemPackages = with pkgs; [
|
||||
nim
|
||||
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