Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now Passing

Browse Source
This commit is contained in:
David Crompton
2023-05-23 13:15:36 -04:00
parent dcea1444c3
commit 175d46bdd9
14 changed files with 132 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/all-packages.nix
View File

@@ -1,8 +1,7 @@
# self - next package set (after our additions)
# super - prior package set (before our additions)
# pkgs - final package set (after everyone's additions)
# final - next package set (after our additions)
# prev - prior package set (before our additions)
#
self: super: pkgs: with pkgs; {
final: prev: with prev; {
fastqc = callPackage ./fastqc.nix { };
@@ -16,10 +15,11 @@ self: super: pkgs: with pkgs; {
#meraculous = callPackage ./meraculous.nix { let stdenv49 = overrideCC stdenv gcc49; in stdenv = stdenv49; boost = boost159.override { stdenv = stdenv49 }; };
mfixgui = python36Packages.callPackage ./mfix/mfixgui.nix { };
mfixgui = python38Packages.callPackage ./mfix/mfixgui.nix { };
mfixsolver = callPackage ./mfix/mfixsolver.nix { };
inherit (callPackage ./opengl/default.nix { inherit super; }) libGL mesa_glxgallium;
inherit (callPackage ./opengl/default.nix { inherit prev; }) libGL mesa_glxgallium;
openfoam = callPackage ./openfoam.nix { };
@@ -27,9 +27,9 @@ self: super: pkgs: with pkgs; {
ovito = libsForQt5.callPackage ./ovito.nix { };
pythonOverrides = lib.composeExtensions super.pythonOverrides (import ./python-packages.nix pkgs);
pythonOverrides = lib.composeExtensions prev.pythonOverrides (import ./python-packages.nix pkgs);
rOverrides = lib.composeExtensions super.rOverrides (import ./r-modules.nix pkgs);
rOverrides = lib.composeExtensions prev.rOverrides (import ./r-modules.nix pkgs);
smoove = callPackage ./smoove { };
@@ -41,12 +41,12 @@ self: super: pkgs: with pkgs; {
samblaster = callPackage ./samblaster.nix { };
svtyper = pythonPackages.callPackage ./svtyper.nix { };
svtyper = python38Packages.callPackage ./svtyper.nix { };
idba = callPackage ./idba.nix { };
nixStable = ( super.nixStable.override { confDir= "/nix/etc"; } ).overrideAttrs
( attrs: { patches = attrs.patches or [] ++ [ ./nix/remote.patch ./nix/cvmfs.patch ]; } );
nix = ( super.nix.override { confDir = "/nix/etc"; } ).overrideAttrs
# nixStable = ( prev.nixStable.override { confDir= "/nix/etc"; } ).overrideAttrs
# ( attrs: { patches = attrs.patches or [] ++ [ ./nix/remote.patch ./nix/cvmfs.patch ]; } );
nix = ( prev.nix.override { confDir = "/nix/etc"; } ).overrideAttrs
( attrs: { patches = attrs.patches or [] ++ [ ./nix/remote.patch ./nix/cvmfs.patch ]; } );
}