Remove stablePkgs.
This commit is contained in:
		
							parent
							
								
									6da10fb12c
								
							
						
					
					
						commit
						c82c06c66b
					
				@ -89,46 +89,6 @@
 | 
			
		||||
    ++ (with gst_all_1; [ gstreamer gstreamer.dev
 | 
			
		||||
      gst-plugins-bad gst-plugins-good gst-plugins-base gst-plugins-ugly ]);
 | 
			
		||||
 | 
			
		||||
  nixpkgs.config.packageOverrides = pkgs: with pkgs; let
 | 
			
		||||
    fetchNixPkgs = { rev, sha256 }:
 | 
			
		||||
    fetchFromGitHub {
 | 
			
		||||
      inherit sha256 rev;
 | 
			
		||||
      owner = "NixOS";
 | 
			
		||||
      repo = "nixpkgs-channels";
 | 
			
		||||
    };
 | 
			
		||||
    stablePkgs = fetchNixPkgs {
 | 
			
		||||
      rev = "bb8f0cc2279934cc2274afb6d0941de30b6187ae";
 | 
			
		||||
      sha256 = "15b4ny9yxk04ml17sflids8sd707yibika1ikz3xi3lf5db0i8gr";
 | 
			
		||||
    };
 | 
			
		||||
  in {
 | 
			
		||||
    # idea-community-eap = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
 | 
			
		||||
    #     name = "idea-community-${version}";
 | 
			
		||||
    #     version = "2017.2.eap";
 | 
			
		||||
    #     src = pkgs.fetchurl {
 | 
			
		||||
    #       url = "https://download.jetbrains.com/idea/ideaIC-172.3544.6-no-jdk.tar.gz";
 | 
			
		||||
    #       sha256 = "72874a0393a6388b04353a359eea1d1242f59d6e7b96a4cf43c793602ac7ccdb";
 | 
			
		||||
    #     };
 | 
			
		||||
    #   });
 | 
			
		||||
    idea-community-eap = pkgs.idea.idea-community;
 | 
			
		||||
 | 
			
		||||
    # clion-eap = pkgs.idea.clion.overrideDerivation (oldAttrs: rec {
 | 
			
		||||
    #   name = "clion-${version}";
 | 
			
		||||
    #   version = "2017.1.eap";
 | 
			
		||||
    #   src = pkgs.fetchurl {
 | 
			
		||||
    #     url = "http://download.jetbrains.com/cpp/CLion-2017.1-RC.tar.gz";
 | 
			
		||||
    #     sha256 = "1rv9rcjv4kv39l9r4g5kqbd4y175301a6kr3js3szkjmhqd50qq3";
 | 
			
		||||
    #   };
 | 
			
		||||
    # });
 | 
			
		||||
    clion-eap = pkgs.idea.clion;
 | 
			
		||||
 | 
			
		||||
    # neovim = pkgs.neovim.override {
 | 
			
		||||
    #   extraPythonPackages = [ pkgs.pythonPackages.websocket_client ];
 | 
			
		||||
    # };
 | 
			
		||||
 | 
			
		||||
    stablePkgs = stablePkgs;
 | 
			
		||||
    stable = import stablePkgs {};
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  nixpkgs.config.allowTexliveBuilds = true;
 | 
			
		||||
  nixpkgs.config.allowUnfree = true;
 | 
			
		||||
  nixpkgs.config.android_sdk.accept_license = true;
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										15
									
								
								flake.nix
									
									
									
									
									
								
							
							
								
								
								
								
								
									
									
								
							
						
						
									
										15
									
								
								flake.nix
									
									
									
									
									
								
							@ -6,13 +6,14 @@
 | 
			
		||||
    neovim-flake.inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  outputs = { self, nixpkgs, neovim-flake, ... }:
 | 
			
		||||
  let
 | 
			
		||||
    neovimOverlay = { pkgs, ... }: { nixpkgs.overlays = [ neovim-flake.overlay ]; };
 | 
			
		||||
  in {
 | 
			
		||||
    nixosConfigurations.petalius = nixpkgs.lib.nixosSystem {
 | 
			
		||||
      system = "x86_64-linux";
 | 
			
		||||
      modules = [ ./petalius.nix neovimOverlay ];
 | 
			
		||||
  outputs = { self, nixpkgs, neovim-flake, ... }: {
 | 
			
		||||
    nixosConfigurations = let
 | 
			
		||||
      neovimOverlay = { pkgs, ... }: { nixpkgs.overlays = [ neovim-flake.overlay ]; };
 | 
			
		||||
    in {
 | 
			
		||||
      petalius = nixpkgs.lib.nixosSystem {
 | 
			
		||||
        system = "x86_64-linux";
 | 
			
		||||
        modules = [ ./petalius.nix neovimOverlay ];
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -2,14 +2,13 @@
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
 | 
			
		||||
    idea-community-eap
 | 
			
		||||
    # clion-eap
 | 
			
		||||
    idea.idea-community
 | 
			
		||||
    # idea.clion
 | 
			
		||||
    texlive.combined.scheme-full biber
 | 
			
		||||
    gimp
 | 
			
		||||
    inkscape
 | 
			
		||||
    # jabref
 | 
			
		||||
    libreoffice-fresh
 | 
			
		||||
    stablePkgs
 | 
			
		||||
    # calibre
 | 
			
		||||
    # goldendict
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user