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

Compare commits

base: daylin:364572a1706d4fdddfebd7517f9a7e591c20c4d8
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:7555262d5f7754e347e721c96933410ab89a18c6
Branches Tags
daylin:flake-lock
daylin:main

1 commit
364572a170 ... 7555262d5f

Author SHA1 Message Date
daylin-bot
7555262d5f 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=cc38e7e18fd762d5cdb34d06335223b7d7874106' (2024-11-24)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/bdba246946fb079b87b4cada4df9b1cdf1c06132' (2024-11-17)
  → 'github:nix-community/nix-index-database/bedc30c64442579943c1c6e7579db263d810884f' (2024-11-24)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/82ed6bde37ade88716387bb84d03f6c1aaa74d79' (2024-11-20)
  → 'github:nix-community/nixpkgs-wayland/e1ef95bd1b0852f25b8d6c8c43e958de5eb285b3' (2024-11-24)
• 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 00:50:33 +00:00
6 changed files with 42 additions and 89 deletions
Show stats Expand all files Collapse all files

68
flake.lock
View file

@ -240,11 +240,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1732667736, "lastModified": 1732470296,
"narHash": "sha256-2fDoP3t55cT/P1UJCERzlidJMDkkRCe1ErbONNNtQu8=", "narHash": "sha256-nsrkCMhhoJiRYv3wIfCLjEu/9RF3yD8fYngzAWx6NMY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "f12ac32c973091f698fc521d9f293ae477875dce", "rev": "4c2d4620007c4c774b7bc6fd282827c04c08686c",
"revCount": 8122, "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": 1732629163, "lastModified": 1732460016,
"narHash": "sha256-TW6S4O2c76WbU5LkZGACBrF0imGnrPfv0MbES0BJ8bE=", "narHash": "sha256-Kb8TdW9fL/74kYr/Nfhe5EI3JEBn52+wyAxV1ZBGLV8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "1fb720b62aeb474873ba43426ddc53afde1e6cdd", "rev": "cc38e7e18fd762d5cdb34d06335223b7d7874106",
"revCount": 5498, "revCount": 5494,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -521,11 +521,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732603698, "lastModified": 1731967274,
"narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=", "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
"rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730", "rev": "aa2846680fa9a2032939d720487942567fd9eb63",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -615,11 +615,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1732631228, "lastModified": 1731682758,
"narHash": "sha256-/7Wyhp00yecUMPNz79gGZpjos8OLHqOfdiWWIQfZA1M=", "narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "8f56354b794624689851b2d86c2ce0209cc8f0cf", "rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,11 +637,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731952509, "lastModified": 1720066371,
"narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=", "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-github-actions", "repo": "nix-github-actions",
"rev": "7b5f051df789b6b20d259924d349a9ba3319b226", "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -657,11 +657,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732519917, "lastModified": 1732461762,
"narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "narHash": "sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "rev": "bedc30c64442579943c1c6e7579db263d810884f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1732660005, "lastModified": 1732490653,
"narHash": "sha256-sagm2oQQm8s0gUbPf5IXI+cELTdc0fv/SKleWw9tzFo=", "narHash": "sha256-r4ncVqtCXiWRwYfilm4+oWXiYpFMhsLR+PI7uRvz620=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "af74f7cec80bd89ae6b2c77a3cdef100bb4cb5a5", "rev": "e1ef95bd1b0852f25b8d6c8c43e958de5eb285b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -792,27 +792,27 @@
}, },
"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"
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1732238832, "lastModified": 1730958623,
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -824,11 +824,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1732014248,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

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