Compare commits

..

No commits in common. "412a5eb3d36f866d6dc879fefbc10c1e87a8eda2" and "fe03115ead20db387da8c2c6f1a17fa3145f927b" have entirely different histories.

3 changed files with 21 additions and 22 deletions

View File

@ -91,11 +91,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692099905, "lastModified": 1687871164,
"narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,11 +107,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1692794066, "lastModified": 1689956312,
"narHash": "sha256-H0aG8r16dj0x/Wz6wQhQxc9V7AsObOiHPaKxQgH6Y08=", "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fc944919f743bb22379dddf18dcb72db6cff84aa", "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -123,11 +123,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1692973538, "lastModified": 1690803489,
"narHash": "sha256-BgwQ9LhSj8bRPlU4WVD9+q2dkQsWTD4ampHADbr2I20=", "narHash": "sha256-TqdStgF+EA+kJ8PzVjOxa8HdM684CmZZz2ohlKq9j4A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9be946f3129e3aec29ff84d3b0230cf6014cdd9c", "rev": "0d117d7ad5d590991d23ccc7bd88c4e627cccf17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -155,11 +155,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1692734709, "lastModified": 1690640159,
"narHash": "sha256-SCFnyHCyYjwEmgUsHDDuU0TsbVMKeU1vwkR+r7uS2Rg=", "narHash": "sha256-5DZUYnkeMOsVb/eqPYb9zns5YsnQXRJRC8Xx/nPMcno=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b85ed9dcbf187b909ef7964774f8847d554fab3b", "rev": "e6ab46982debeab9831236869539a507f670a129",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -203,11 +203,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1692971158, "lastModified": 1690055134,
"narHash": "sha256-1dZ9WJaPs1lCnRRctDgKwOXIn/t+UaiwxwcVksFXwzQ=", "narHash": "sha256-pca36VkwUxcygKtrY8OPWp9MpxHgWauwBWxO8lgHQTU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ee2675bab6f3120ada6671204e9eca40da2fb180", "rev": "15a8d4645c280e35c00a36303bb76eb697d38206",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +282,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1692971964, "lastModified": 1689899128,
"narHash": "sha256-fvswEIz5R1jiuVHEII655I8PcNz/L+ED11YEZl0pqS0=", "narHash": "sha256-jlWnAn+KLgEsJzl9KPABOZrZ7gYmgUHDLfQLskY2O4g=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "d4ce4f679e360c87303075c1ff3e8496e9702348", "rev": "7af90962d9271745087d287248afe2766b58fb71",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -62,9 +62,9 @@
}; };
} }
) )
( # Overrides davinci-resolve with the unstable version because of https://github.com/NixOS/nixpkgs/pull/246074 #( # Overrides davinci-resolve with the unstable version because of https://github.com/NixOS/nixpkgs/pull/246074
final: prev: {davinci-resolve = final.unstable.davinci-resolve;} # final: prev: {davinci-resolve = final.master.davinci-resolve;}
) #)
]; ];
} }
]; ];

View File

@ -18,7 +18,6 @@ with pkgs; [
# image editor # image editor
gimp gimp
davinci-resolve
# games # games
osu-lazer osu-lazer