Some massive changes to make flakiness better
Renamed the @inputs to @top. This was a misguided attempt to make a
different change, but it's going to stick, now.
Began moving packages to their own folder rather than being intermingled
with overlays
Created a local overlay that just includes my personal packages
Cleaned up some dead code
Moved to just using the raw 'imports' instead of needing to explicitly
call out the `foo = import foo.nix {};` syntax
This commit is contained in:
+31
-29
@@ -1,19 +1,20 @@
|
||||
final: prev:
|
||||
|
||||
let
|
||||
myPackages = pypackages: with pypackages; [
|
||||
black
|
||||
dateutil
|
||||
ipython
|
||||
mypy
|
||||
pylint
|
||||
pyyaml
|
||||
responses
|
||||
ruamel-yaml
|
||||
tox
|
||||
typing-extensions
|
||||
virtualenv
|
||||
];
|
||||
myPackages =
|
||||
pypackages: with pypackages; [
|
||||
black
|
||||
dateutil
|
||||
ipython
|
||||
mypy
|
||||
pylint
|
||||
pyyaml
|
||||
responses
|
||||
ruamel-yaml
|
||||
tox
|
||||
typing-extensions
|
||||
virtualenv
|
||||
];
|
||||
|
||||
myPython = prev.python312.withPackages myPackages;
|
||||
is2405 = prev.lib.versionAtLeast prev.lib.version "24";
|
||||
@@ -24,34 +25,34 @@ rec {
|
||||
|
||||
## Testing adding python packages in the correct manner
|
||||
pythonPackagesExtensions = (prev.pythonPackagesExtensions or [ ]) ++ [
|
||||
(python-final: _:
|
||||
let cp = python-final.callPackage; in {
|
||||
(
|
||||
python-final: _:
|
||||
let
|
||||
cp = python-final.callPackage;
|
||||
in
|
||||
{
|
||||
django-rapyd-modernauth = cp ./django-rapyd-modernauth.nix { };
|
||||
graypy = cp ./graypy.nix { };
|
||||
itg-django-utils = cp ./itg-django-utils.nix { };
|
||||
xonsh-apipenv = cp ./xonsh-apipenv.nix { };
|
||||
})
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
# My own packages
|
||||
aacs = prev.callPackage ./aacs.nix { };
|
||||
create_ssl = prev.callPackage ./create_ssl.nix { };
|
||||
enwiki-dump = prev.callPackage ./enwiki-dump.nix { };
|
||||
hms = prev.callPackage ./hms {
|
||||
pkgs = final.pkgs;
|
||||
};
|
||||
inject = prev.callPackage ./inject.nix { inherit (final) pkgs; };
|
||||
inject-darwin = prev.callPackage ./inject-darwin.nix { inherit (final) pkgs; };
|
||||
setup-ssh = prev.callPackage ./setup-ssh {
|
||||
pkgs = final.pkgs;
|
||||
};
|
||||
setup-ssh = prev.callPackage ./setup-ssh { pkgs = final.pkgs; };
|
||||
upgrade-pg-cluster = prev.callPackage ./upgrade-pg-cluster.nix { };
|
||||
|
||||
# Overrides of packages
|
||||
brew = prev.callPackage ./homebrew.nix { };
|
||||
copier = (if is2405 then
|
||||
prev.copier.overridePythonAttrs
|
||||
(_: {
|
||||
copier = (
|
||||
if is2405 then
|
||||
prev.copier.overridePythonAttrs (_: {
|
||||
version = "9.1.0";
|
||||
src = final.fetchFromGitHub {
|
||||
owner = "copier-org";
|
||||
@@ -60,15 +61,16 @@ rec {
|
||||
hash = "sha256-x5r7Xv4lAOMkR+UIEeSY7LvbYMLpTWYuICYe9ygz1tA=";
|
||||
postFetch = "rm $out/tests/demo/doc/ma*ana.txt";
|
||||
};
|
||||
}) else prev.copier);
|
||||
})
|
||||
else
|
||||
prev.copier
|
||||
);
|
||||
libbluray-custom = prev.libbluray.override {
|
||||
withAACS = true;
|
||||
withBDplus = true;
|
||||
};
|
||||
template = prev.callPackage ./template.nix { };
|
||||
handbrake = prev.handbrake.override {
|
||||
libbluray = libbluray-custom;
|
||||
};
|
||||
handbrake = prev.handbrake.override { libbluray = libbluray-custom; };
|
||||
libvirt-greg = prev.libvirt.overrideAttrs {
|
||||
postInstall = prev.libvirt.postInstall + "rm -r $out/lib/systemd/system/libvirtd.service";
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user