Make work with current unstable.
This commit is contained in:
		
							parent
							
								
									f504d72136
								
							
						
					
					
						commit
						103f5c3758
					
				@ -53,7 +53,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    isync
 | 
					    isync
 | 
				
			||||||
    msmtp
 | 
					    msmtp
 | 
				
			||||||
    vdirsyncer khard khal
 | 
					    stable.vdirsyncer stable.khard khal
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    rclone
 | 
					    rclone
 | 
				
			||||||
    duplicity
 | 
					    duplicity
 | 
				
			||||||
@ -86,8 +86,8 @@
 | 
				
			|||||||
      repo = "nixpkgs-channels";
 | 
					      repo = "nixpkgs-channels";
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    stablePkgs = fetchNixPkgs {
 | 
					    stablePkgs = fetchNixPkgs {
 | 
				
			||||||
      rev = "95b9c99f6d091273572ff1ec62b97b6ad3f68bdf";
 | 
					      rev = "2b417708c282d84316366f4125b00b29c49df10f";
 | 
				
			||||||
      sha256 = "1qcwr9binkwfayix88aljwssxi5djkwscx0rnwlk1yp9q60rgp3d";
 | 
					      sha256 = "0426qaxw09h0kkn5zwh126hfb2j12j5xan6ijvv2c905pqi401zq";
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
  in {
 | 
					  in {
 | 
				
			||||||
    # idea-community-eap = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
 | 
					    # idea-community-eap = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
 | 
				
			||||||
 | 
				
			|||||||
@ -24,13 +24,13 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    # virtmanager
 | 
					    # virtmanager
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    (if lib.hasAttr "curaPlugins" pkgs then
 | 
					    (with pkgs.stable; if lib.hasAttr "curaPlugins" pkgs then
 | 
				
			||||||
      cura.override {
 | 
					      cura.override {
 | 
				
			||||||
        plugins = with curaPlugins; [ octoprint ];
 | 
					        plugins = with curaPlugins; [ octoprint ];
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
     else cura)
 | 
					     else cura)
 | 
				
			||||||
    openscad
 | 
					    openscad
 | 
				
			||||||
    freecad
 | 
					    stable.freecad
 | 
				
			||||||
    meshlab
 | 
					    meshlab
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    audacious
 | 
					    audacious
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user