Fixed them all, updated all flake locks
This commit is contained in:
		
							parent
							
								
									4e96eb7733
								
							
						
					
					
						commit
						75ef7f544d
					
				
					 32 changed files with 240 additions and 290 deletions
				
			
		
							
								
								
									
										44
									
								
								rust-toolchain/flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										44
									
								
								rust-toolchain/flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -20,34 +20,16 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1689261696,
 | 
			
		||||
        "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
        "lastModified": 1705316053,
 | 
			
		||||
        "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=",
 | 
			
		||||
        "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370",
 | 
			
		||||
        "revCount": 571714,
 | 
			
		||||
        "type": "tarball",
 | 
			
		||||
        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.571714%2Brev-c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370/018d13d4-6560-744b-8254-c10a7ef5adef/source.tar.gz"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "ref": "nixpkgs-unstable",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs_2": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1681358109,
 | 
			
		||||
        "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "ref": "nixpkgs-unstable",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
        "type": "tarball",
 | 
			
		||||
        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "root": {
 | 
			
		||||
| 
						 | 
				
			
			@ -59,14 +41,16 @@
 | 
			
		|||
    "rust-overlay": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "flake-utils": "flake-utils",
 | 
			
		||||
        "nixpkgs": "nixpkgs_2"
 | 
			
		||||
        "nixpkgs": [
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1689302058,
 | 
			
		||||
        "narHash": "sha256-yD74lcHTrw4niXcE9goJLbzsgyce48rQQoy5jK5ZK40=",
 | 
			
		||||
        "lastModified": 1705544242,
 | 
			
		||||
        "narHash": "sha256-LIi5jGx7kwJjodpJlnQY+X/PZspRpbDO2ypNSmHwOGQ=",
 | 
			
		||||
        "owner": "oxalica",
 | 
			
		||||
        "repo": "rust-overlay",
 | 
			
		||||
        "rev": "7b8dbbf4c67ed05a9bf3d9e658c12d4108bc24c8",
 | 
			
		||||
        "rev": "ff3e4b3ee418009886848d48e4ba236a2f9de789",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,39 +2,43 @@
 | 
			
		|||
  description = "A Nix-flake-based Rust development environment";
 | 
			
		||||
 | 
			
		||||
  inputs = {
 | 
			
		||||
    inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
 | 
			
		||||
    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
 | 
			
		||||
    rust-overlay = {
 | 
			
		||||
      url = "github:oxalica/rust-overlay";
 | 
			
		||||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  outputs = { self, nixpkgs, rust-overlay }:
 | 
			
		||||
    let
 | 
			
		||||
      overlays = [
 | 
			
		||||
        rust-overlay.overlays.default
 | 
			
		||||
        (final: prev: {
 | 
			
		||||
          rustToolchain = prev.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
 | 
			
		||||
        })
 | 
			
		||||
      ];
 | 
			
		||||
      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
 | 
			
		||||
      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
 | 
			
		||||
        pkgs = import nixpkgs { inherit overlays system; };
 | 
			
		||||
      });
 | 
			
		||||
    in
 | 
			
		||||
    {
 | 
			
		||||
      devShells = forEachSupportedSystem ({ pkgs }: {
 | 
			
		||||
        default = pkgs.mkShell {
 | 
			
		||||
          packages = with pkgs; [
 | 
			
		||||
            rustToolchain
 | 
			
		||||
            openssl
 | 
			
		||||
            pkg-config
 | 
			
		||||
            cargo-deny
 | 
			
		||||
            cargo-edit
 | 
			
		||||
            cargo-watch
 | 
			
		||||
            rust-analyzer
 | 
			
		||||
          ];
 | 
			
		||||
        };
 | 
			
		||||
      });
 | 
			
		||||
    };
 | 
			
		||||
  outputs = {
 | 
			
		||||
    self,
 | 
			
		||||
    nixpkgs,
 | 
			
		||||
    rust-overlay,
 | 
			
		||||
  }: let
 | 
			
		||||
    overlays = [
 | 
			
		||||
      rust-overlay.overlays.default
 | 
			
		||||
      (final: prev: {
 | 
			
		||||
        rustToolchain = prev.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
 | 
			
		||||
      })
 | 
			
		||||
    ];
 | 
			
		||||
    supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
 | 
			
		||||
    forEachSupportedSystem = f:
 | 
			
		||||
      nixpkgs.lib.genAttrs supportedSystems (system:
 | 
			
		||||
        f {
 | 
			
		||||
          pkgs = import nixpkgs {inherit overlays system;};
 | 
			
		||||
        });
 | 
			
		||||
  in {
 | 
			
		||||
    devShells = forEachSupportedSystem ({pkgs}: {
 | 
			
		||||
      default = pkgs.mkShell {
 | 
			
		||||
        packages = with pkgs; [
 | 
			
		||||
          rustToolchain
 | 
			
		||||
          openssl
 | 
			
		||||
          pkg-config
 | 
			
		||||
          cargo-deny
 | 
			
		||||
          cargo-edit
 | 
			
		||||
          cargo-watch
 | 
			
		||||
          rust-analyzer
 | 
			
		||||
        ];
 | 
			
		||||
      };
 | 
			
		||||
    });
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue