Compare commits

...

6 commits

Author SHA1 Message Date
364572a170 flake.lock: Update
Flake lock file updates:

• Updated input 'ghostty':
    'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=4c2d4620007c4c774b7bc6fd282827c04c08686c' (2024-11-24)
  → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=f12ac32c973091f698fc521d9f293ae477875dce' (2024-11-27)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=268778823676ef2bbda42050d78946e1fc27fc31' (2024-11-25)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=1fb720b62aeb474873ba43426ddc53afde1e6cdd' (2024-11-26)
• Updated input 'lix-module':
    'aa2846680f.tar.gz?narHash=sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0%3D&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18)
  → '15b999f9c9.tar.gz?narHash=sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4%3D&rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730' (2024-11-26)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/6a8bc146b4e46d70f182e070f4fe0a69c80b8a2a' (2024-11-25)
  → 'github:nix-community/nixpkgs-wayland/af74f7cec80bd89ae6b2c77a3cdef100bb4cb5a5' (2024-11-26)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/d926bcd5206c0b7afe47bed92557c8cd5e882b36' (2024-11-15)
  → 'github:nix-community/nix-eval-jobs/8f56354b794624689851b2d86c2ce0209cc8f0cf' (2024-11-26)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/nix-github-actions':
    'github:nix-community/nix-github-actions/622f829f5fe69310a866c8a6cd07e747c44ef820' (2024-07-04)
  → 'github:nix-community/nix-github-actions/7b5f051df789b6b20d259924d349a9ba3319b226' (2024-11-18)
• Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs':
    'github:NixOS/nixpkgs/85f7e662eda4fa3a995556527c87b2524b691933' (2024-11-07)
  → 'github:NixOS/nixpkgs/8edf06bea5bcbee082df1b7369ff973b91618b8d' (2024-11-22)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367' (2024-11-19)
  → 'github:nixos/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d' (2024-11-25)
2024-11-27 00:49:55 +00:00
bad91ccc23
nixpkgs-unstable 2024-11-25 11:38:09 -06:00
e01954df5f
flake.lock: Update
Flake lock file updates:

• Updated input 'ghostty':
    'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=63bf16ff00ccac2f730519b4f0dd14cde857792d' (2024-11-21)
  → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=4c2d4620007c4c774b7bc6fd282827c04c08686c' (2024-11-24)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=940f7aa990dbc99815bab8d355999d8277534b17' (2024-11-20)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=268778823676ef2bbda42050d78946e1fc27fc31' (2024-11-25)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/bdba246946fb079b87b4cada4df9b1cdf1c06132' (2024-11-17)
  → 'github:nix-community/nix-index-database/f4a5ca5771ba9ca31ad24a62c8d511a405303436' (2024-11-25)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367' (2024-11-19)
  → 'github:nixos/nixpkgs/61aa4ba718e145c50aa01aa868fe52bf5f34cc29' (2024-11-25)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/82ed6bde37ade88716387bb84d03f6c1aaa74d79' (2024-11-20)
  → 'github:nix-community/nixpkgs-wayland/6a8bc146b4e46d70f182e070f4fe0a69c80b8a2a' (2024-11-25)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/7a1d37b2b16f32536628df9cea6a2003d79a49f9' (2024-11-17)
  → 'github:nix-community/lib-aggregate/c817444fb8a3042c26be57d8640fb744bc1b516c' (2024-11-24)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/b9f04e3cf71c23bea21d2768051e6b3068d44734' (2024-11-17)
  → 'github:nix-community/nixpkgs.lib/87b6978992e2eb605732fba842cad0a7e14b2047' (2024-11-24)
2024-11-25 11:18:08 -06:00
1cc936f966
try running nixos-unstable-small 2024-11-25 11:17:34 -06:00
89b00d80f6
add procs 2024-11-25 11:02:28 -06:00
8fa461c214
nimble v0.16.3 proper 2024-11-25 10:55:10 -06:00
6 changed files with 95 additions and 48 deletions

View file

@ -240,11 +240,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1732159111, "lastModified": 1732667736,
"narHash": "sha256-dIHQDtvPXsuv0z6DVgK6GvTh/jJn14B7Q9J0gT38Pl4=", "narHash": "sha256-2fDoP3t55cT/P1UJCERzlidJMDkkRCe1ErbONNNtQu8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "63bf16ff00ccac2f730519b4f0dd14cde857792d", "rev": "f12ac32c973091f698fc521d9f293ae477875dce",
"revCount": 8050, "revCount": 8122,
"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": 1732629163,
"narHash": "sha256-vFeNbKUstvSZbe9TD4bDYozZd+A/bKD+fxCye+p/Mp8=", "narHash": "sha256-TW6S4O2c76WbU5LkZGACBrF0imGnrPfv0MbES0BJ8bE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "940f7aa990dbc99815bab8d355999d8277534b17", "rev": "1fb720b62aeb474873ba43426ddc53afde1e6cdd",
"revCount": 5484, "revCount": 5498,
"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": {
@ -521,11 +521,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731967274, "lastModified": 1732603698,
"narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=", "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=",
"rev": "aa2846680fa9a2032939d720487942567fd9eb63", "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -615,11 +615,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1731682758, "lastModified": 1732631228,
"narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=", "narHash": "sha256-/7Wyhp00yecUMPNz79gGZpjos8OLHqOfdiWWIQfZA1M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36", "rev": "8f56354b794624689851b2d86c2ce0209cc8f0cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,11 +637,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720066371, "lastModified": 1731952509,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-github-actions", "repo": "nix-github-actions",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
"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": 1732660005,
"narHash": "sha256-GJPuAKncOF26uKuU0hxEBrBnk7Tc2eWDgm4IeVoOTwI=", "narHash": "sha256-sagm2oQQm8s0gUbPf5IXI+cELTdc0fv/SKleWw9tzFo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "82ed6bde37ade88716387bb84d03f6c1aaa74d79", "rev": "af74f7cec80bd89ae6b2c77a3cdef100bb4cb5a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -792,27 +792,27 @@
}, },
"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"
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1730958623, "lastModified": 1732238832,
"narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85f7e662eda4fa3a995556527c87b2524b691933", "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -824,11 +824,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1732521221,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github" "type": "github"
}, },
"original": { "original": {

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/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";

View file

@ -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 { };

View file

@ -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";
};
}
)

View 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
View 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"
]
}
]
}