Compare commits

...

8 commits

Author SHA1 Message Date
github-actions[bot]
4808169e87 flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'github:hyprwm/Hyprland/fb87e332c59ce386a095b3e81bb1abbcc9cc3e5c' (2024-03-06)
  → 'github:hyprwm/Hyprland/335506d5557b91a0baf974750c353443841e691b' (2024-03-09)
• Added input 'hyprland/hyprcursor':
    'github:hyprwm/hyprcursor/a2233d4a2a58233457712acfd88d10a2a8a85711' (2024-03-08)
• Added input 'hyprland/hyprcursor/hyprlang':
    'github:hyprwm/hyprlang/a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2' (2024-03-08)
• Added input 'hyprland/hyprcursor/hyprlang/nixpkgs':
    follows 'hyprland/hyprcursor/nixpkgs'
• Added input 'hyprland/hyprcursor/hyprlang/systems':
    'github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68' (2023-07-14)
• Added input 'hyprland/hyprcursor/nixpkgs':
    follows 'hyprland/nixpkgs'
• Added input 'hyprland/hyprcursor/systems':
    follows 'hyprland/systems'
• Updated input 'hyprland/hyprlang':
    'github:hyprwm/hyprlang/0fce791ba2334aca183f2ed42399518947550d0d' (2024-02-24)
  → 'github:hyprwm/hyprlang/a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2' (2024-03-08)
• Updated input 'hyprland/wlroots':
    'gitlab:wlroots/wlroots/0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5' (2024-02-21)
  → 'gitlab:wlroots/wlroots/50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b' (2024-03-09)
• Updated input 'hyprland/xdph':
    'github:hyprwm/xdg-desktop-portal-hyprland/1b713911c2f12b96c2574474686e4027ac4bf826' (2024-02-23)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/2d2fb547178ec025da643db57d40a971507b82fe' (2024-03-01)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/93554c04c2f1c02f4a383538e8848d511c3129e9' (2024-03-03)
  → 'github:nix-community/nix-index-database/2ad5ebce1e1be47a8cf330d85265ac09ffa15178' (2024-03-08)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bfa8b30043892dc2b660d403faa159bab7b65898' (2024-03-05)
  → 'github:nixos/nixpkgs/0e7f98a5f30166cbed344569426850b21e4091d4' (2024-03-09)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/d59914397b85d7b208b1ccc39906ef7bfcf0f26c' (2024-03-05)
  → 'github:nix-community/nixpkgs-wayland/c737af27135864461e68214f7bbe9222f7d859fb' (2024-03-09)
2024-03-10 00:38:01 +00:00
4c0b71d1de
add pixi until 0.15.2 lands in nixpkgs-unstable 2024-03-08 09:40:12 -06:00
53e6e9951c
add fall back for pinix to oizys 2024-03-08 09:39:56 -06:00
40fb99a47b
add issue link 2024-03-06 09:42:16 -06:00
52d88c099f
flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'github:hyprwm/Hyprland/12da0fc84f8b084f7b13702b811cbed7dae9854c' (2024-03-04)
  → 'github:hyprwm/Hyprland/fb87e332c59ce386a095b3e81bb1abbcc9cc3e5c' (2024-03-06)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/fa9a51752f1b5de583ad5213eb621be071806663' (2024-03-02)
  → 'github:nixos/nixpkgs/bfa8b30043892dc2b660d403faa159bab7b65898' (2024-03-05)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/9585f97bd49f8da1818b4799e0881aa8a27b1922' (2024-03-03)
  → 'github:nix-community/nixpkgs-wayland/d59914397b85d7b208b1ccc39906ef7bfcf0f26c' (2024-03-05)
2024-03-05 22:25:48 -06:00
186905a17d
flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'github:hyprwm/Hyprland/f801d15947e151a8129ff82c99abb208e4767322' (2024-02-29)
  → 'github:hyprwm/Hyprland/328ab431655f207a5ee59737291f8e8d85fab992' (2024-03-02)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/16884001b26e6955ff4b88b4dfe4c8986e20f153' (2024-01-25)
  → 'github:hyprwm/contrib/2d4ece4a008feefddc194bde785b1d39f987b5a7' (2024-03-02)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ebe6e807793e7c9cc59cf81225fdee1a03413811' (2024-02-29)
  → 'github:nixos/nixpkgs/458b097d81f90275b3fdf03796f0563844926708' (2024-03-02)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/80c30658b9c38af1fac51eb3fc6f423a1f0ae36d' (2024-02-29)
  → 'github:nix-community/nixpkgs-wayland/405a09242dfff6a32466411d3e3c9861dd566e59' (2024-03-02)
• Updated input 'pinix':
    'github:remi-dupre/pinix/83d58d64ebbb68532a0c23646ecd987d95dc0581' (2024-02-18)
  → 'github:remi-dupre/pinix/6f7dc0fccb0e48176629d061b07576d092a5d09c' (2024-03-02)
2024-03-04 09:33:50 -06:00
e23a4fbce5
add 1 todo 2024-03-04 09:31:58 -06:00
github-actions[bot]
998e2d2e95 flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'github:hyprwm/Hyprland/f801d15947e151a8129ff82c99abb208e4767322' (2024-02-29)
  → 'github:hyprwm/Hyprland/2a08f2ba84ead47bd13aae5797d0d71b2e11b612' (2024-03-03)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/16884001b26e6955ff4b88b4dfe4c8986e20f153' (2024-01-25)
  → 'github:hyprwm/contrib/2d4ece4a008feefddc194bde785b1d39f987b5a7' (2024-03-02)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ebe6e807793e7c9cc59cf81225fdee1a03413811' (2024-02-29)
  → 'github:nixos/nixpkgs/458b097d81f90275b3fdf03796f0563844926708' (2024-03-02)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/80c30658b9c38af1fac51eb3fc6f423a1f0ae36d' (2024-02-29)
  → 'github:nix-community/nixpkgs-wayland/ea91a1d89e6f237d2369ad0de846785965cbef0b' (2024-03-02)
• Updated input 'pinix':
    'github:remi-dupre/pinix/83d58d64ebbb68532a0c23646ecd987d95dc0581' (2024-02-18)
  → 'github:remi-dupre/pinix/6f7dc0fccb0e48176629d061b07576d092a5d09c' (2024-03-02)
2024-03-02 19:50:50 -06:00
5 changed files with 196 additions and 39 deletions

View file

@ -38,7 +38,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": "systems_3"
},
"locked": {
"lastModified": 1709126324,
@ -54,23 +54,50 @@
"type": "github"
}
},
"hyprcursor": {
"inputs": {
"hyprlang": "hyprlang",
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1709942067,
"narHash": "sha256-DGU4zQDwIx6pXM6oHdA+89UU/QjqE05HiXOvigECJjI=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "a2233d4a2a58233457712acfd88d10a2a8a85711",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"hyprlang": "hyprlang_2",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems",
"systems": "systems_2",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1709242419,
"narHash": "sha256-KrgZzmNe5JTtbK1DAmarghdB7A4VqhehsofgXgp6Xg0=",
"lastModified": 1710026388,
"narHash": "sha256-Z/ReJhaauOe+uThHB1LJ/3tJOnNxdYybS72Z8gkRWT8=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "f801d15947e151a8129ff82c99abb208e4767322",
"rev": "335506d5557b91a0baf974750c353443841e691b",
"type": "github"
},
"original": {
@ -87,11 +114,11 @@
]
},
"locked": {
"lastModified": 1706198673,
"narHash": "sha256-bHlxFd+3QHy6eXtTzzhwVNcyxBSOxTvBuJGNUzI4C4M=",
"lastModified": 1709391291,
"narHash": "sha256-NJwAgXRKLVuO3YLkGxXIanLvTKN+cJsYwbLoWOa7ODk=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "16884001b26e6955ff4b88b4dfe4c8986e20f153",
"rev": "2d4ece4a008feefddc194bde785b1d39f987b5a7",
"type": "github"
},
"original": {
@ -126,6 +153,29 @@
}
},
"hyprlang": {
"inputs": {
"nixpkgs": [
"hyprland",
"hyprcursor",
"nixpkgs"
],
"systems": "systems"
},
"locked": {
"lastModified": 1709914708,
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_2": {
"inputs": {
"nixpkgs": [
"hyprland",
@ -137,11 +187,11 @@
]
},
"locked": {
"lastModified": 1708787654,
"narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=",
"lastModified": 1709914708,
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "0fce791ba2334aca183f2ed42399518947550d0d",
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
"type": "github"
},
"original": {
@ -156,11 +206,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1709208631,
"narHash": "sha256-n+SCii/GQR3zjaZzjhGAjrQQlF+xjaGEjWdpDb4wJ3U=",
"lastModified": 1709467759,
"narHash": "sha256-ojIpNROGKk56wyvpMAlBVor3CvPez3pFMORrocxW4io=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "1f03ac8dc3a54f68f55d36b5e7fc65afc302a3d7",
"rev": "206e40afdc468d0658e30e1644e2473dc6285cf2",
"type": "github"
},
"original": {
@ -220,11 +270,11 @@
]
},
"locked": {
"lastModified": 1708830466,
"narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
"lastModified": 1709906691,
"narHash": "sha256-206XMy1NGW42bnHukJl5W2F90yHNoJc7+H3i+/8i2Pg=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
"rev": "2ad5ebce1e1be47a8cf330d85265ac09ffa15178",
"type": "github"
},
"original": {
@ -235,11 +285,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1709200309,
"narHash": "sha256-lKdtMbhnBNU1lr978T+wEYet3sfIXXgyiDZNEgx8CV8=",
"lastModified": 1709968316,
"narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ebe6e807793e7c9cc59cf81225fdee1a03413811",
"rev": "0e7f98a5f30166cbed344569426850b21e4091d4",
"type": "github"
},
"original": {
@ -251,11 +301,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1708821942,
"narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=",
"lastModified": 1709426687,
"narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b",
"rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c",
"type": "github"
},
"original": {
@ -276,11 +326,11 @@
]
},
"locked": {
"lastModified": 1709212569,
"narHash": "sha256-0igtEBEmCuSspTO/HEYqFYzXuJeAy9f9BLftGih9cj4=",
"lastModified": 1709990107,
"narHash": "sha256-fuAqFR/lGwKOxMw7wCK7xzUv/JhS8v9bdNQJ9KCE5HQ=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "80c30658b9c38af1fac51eb3fc6f423a1f0ae36d",
"rev": "c737af27135864461e68214f7bbe9222f7d859fb",
"type": "github"
},
"original": {
@ -296,11 +346,11 @@
]
},
"locked": {
"lastModified": 1708267018,
"narHash": "sha256-/LA/IKbO7qgd5s/dWckcY2RQwyVZxvLH5gHzDzHXdO8=",
"lastModified": 1709390347,
"narHash": "sha256-C7RDQ1xPktZGf8eSDUeZ2ZKetHtM2VJA0C10z0d8tkw=",
"owner": "remi-dupre",
"repo": "pinix",
"rev": "83d58d64ebbb68532a0c23646ecd987d95dc0581",
"rev": "6f7dc0fccb0e48176629d061b07576d092a5d09c",
"type": "github"
},
"original": {
@ -336,6 +386,21 @@
}
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -375,18 +440,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1708558866,
"narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
"lastModified": 1709983277,
"narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
"type": "gitlab"
}
},
@ -410,11 +475,11 @@
]
},
"locked": {
"lastModified": 1708696469,
"narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
"lastModified": 1709299639,
"narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
"rev": "2d2fb547178ec025da643db57d40a971507b82fe",
"type": "github"
},
"original": {

View file

@ -6,6 +6,7 @@
}: let
inherit (lib) mkIfIn;
cfg = config.oizys.languages;
pixi = pkgs.callPackage ../../pkgs/pixi.nix {};
in {
config = mkIfIn "python" cfg {
environment.systemPackages = let

View file

@ -17,6 +17,14 @@ proc error(args: varargs[string, `$`]) =
args.join("")
)
proc warn(args: varargs[string, `$`]) =
stdout.styledWriteLine(
fgCyan, "oizys", resetStyle, "|",
fgYellow, "WARN", resetStyle, "| ",
args.join("")
)
type
OizysContext = object
flake, host: string
@ -43,7 +51,13 @@ proc check(c: OizysContext) =
info "host: ", c.host
proc cmd(c: OizysContext): string {.inline.} =
if c.pinix: "pix" else: "nix"
let pixExists = findExe("pix") != ""
if c.pinix:
if pixExists:
return "pix"
else:
warn "pinix not found, falling back to nix"
return "nix"
proc systemFlakePath(c: OizysContext): string =
c.flake & "#nixosConfigurations." & c.host & ".config.system.build.toplevel"

76
pkgs/pixi.nix Normal file
View file

@ -0,0 +1,76 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
, installShellFiles
, darwin
, testers
, pixi
}:
rustPlatform.buildRustPackage rec {
pname = "pixi";
version = "0.15.2";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
rev = "v${version}";
hash = "sha256-bh8Uu6Q2AND50Qzivc6k1Z8JWudkHC2i4YW1Hxa69SM=";
};
cargoHash = "sha256-yMIcPwnuN7F2ZrOtJw8T+nxeSzLsYn+iC34bYeWpi/w=";
nativeBuildInputs = [
pkg-config
installShellFiles
];
buildInputs = [
openssl
]
++ lib.optionals stdenv.isDarwin (
with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation IOKit SystemConfiguration Security ]
);
# There are some CI failures with Rattler. Tests on Aarch64 has been skipped.
# See https://github.com/prefix-dev/pixi/pull/241.
doCheck = !stdenv.isAarch64;
preCheck = ''
export HOME="$(mktemp -d)"
'';
checkFlags = [
# Skip tests requiring network
"--skip=add_channel"
"--skip=add_functionality"
"--skip=add_functionality_os"
"--skip=add_functionality_union"
"--skip=add_pypi_functionality"
"--skip=test_alias"
"--skip=test_cwd"
"--skip=test_incremental_lock_file"
];
postInstall = ''
installShellCompletion --cmd pix \
--bash <($out/bin/pixi completion --shell bash) \
--fish <($out/bin/pixi completion --shell fish) \
--zsh <($out/bin/pixi completion --shell zsh)
'';
passthru.tests.version = testers.testVersion {
package = pixi;
};
meta = with lib; {
description = "Package management made easy";
homepage = "https://pixi.sh/";
license = licenses.bsd3;
maintainers = with lib.maintainers; [ aaronjheng edmundmiller ];
mainProgram = "pixi";
};
}

View file

@ -1,6 +1,7 @@
# oizys todo's
- [ ] add graceful fall back for oizys-cli if pinix isn't installed system-wide yet
- [-] add graceful fall back for oizys-cli if pinix isn't installed system-wide yet
- [ ] trackdown wezterm bug... (try building from flake?)
> https://github.com/wez/wezterm/issues/5067
<!-- generated with <3 by daylinmorgan/todo -->