Compare commits

..

No commits in common. "a32359e19ad34bc46bc075da659ba63ab2e2b7a0" and "8e392148bbece76bdb3777e0e576a38351b12dcc" have entirely different histories.

2 changed files with 16 additions and 42 deletions

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728599261, "lastModified": 1728287529,
"narHash": "sha256-gPQLxw6B3KSlYb+OxXLinVI7ea+ocNiRuvPQKnO6i5M=", "narHash": "sha256-CgS9mFl4FudVF2PR3fzK+6pTXWqge4HrP04TgeEvKAM=",
"owner": "dagger", "owner": "dagger",
"repo": "nix", "repo": "nix",
"rev": "ddf4f5a9c2506235119d527a9461014aff39b11a", "rev": "45b1f49cee26b3514d975f6b461500ec051f0674",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -93,11 +93,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728726232, "lastModified": 1728337164,
"narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=", "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d57112db877f07387ce7104b5ac346ede556d2d7", "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,22 +263,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1728738154,
"narHash": "sha256-BKniFdCCST/4gmDPjHgfVOOvCyVk5sp3PX+f4SKSFM0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "54cce652cb480258b12f15b2915e7a6c79ac51ae",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-update": { "nixpkgs-update": {
"inputs": { "inputs": {
"mmdoc": "mmdoc", "mmdoc": "mmdoc",
@ -302,11 +286,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1728241625,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -355,7 +339,6 @@
"nix-index-database": "nix-index-database_2", "nix-index-database": "nix-index-database_2",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-update": "nixpkgs-update", "nixpkgs-update": "nixpkgs-update",
"suyu": "suyu", "suyu": "suyu",
"w17": "w17" "w17": "w17"

View file

@ -5,9 +5,6 @@
nixpkgs = { nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-unstable"; url = "github:NixOS/nixpkgs/nixos-unstable";
}; };
nixpkgs-master = {
url = "github:NixOS/nixpkgs/master";
};
nixpkgs-update = { nixpkgs-update = {
url = "github:ryantm/nixpkgs-update"; url = "github:ryantm/nixpkgs-update";
}; };
@ -53,24 +50,18 @@
}; };
outputs = outputs =
{ nixpkgs {
, nixpkgs-master nixpkgs,
, home-manager home-manager,
, nixgl nixgl,
, w17 w17,
, ... ...
}@inputs: }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "${system}"; system = "${system}";
overlays = [ overlays = [ nixgl.overlay ];
nixgl.overlay
(final: prev: {
inherit (nixpkgs-master.legacyPackages.${prev.system})
deno;
})
];
allowUnfree = true; allowUnfree = true;
}; };
in in