danderson/channel-scripts
0
0
Fork 0
forked from the-distro/channel-scripts
Code Pull requests Activity

Merge pull request #71 from K900/plasma-6-isos

Browse source 
Ship Plasma 6 ISOs
This commit is contained in:
Martin Weinelt 2024-05-22 00:53:39 +02:00 committed by GitHub
parent 7b22f478d8 e427972875
commit df7a9c1ba7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1708440434, "lastModified": 1716239187,
"narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=", "narHash": "sha256-5oyOV5ZlqXYQ8RB6lvVrKxVBeBPE/ZsLY+qQKqSJLZM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560", "rev": "f88df4bf25b729d78712c441fb0910f7085e9395",
"type": "github" "type": "github"
}, },
"original": { "original": {

20
flake.nix
View file

@ -6,8 +6,24 @@
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
{ {
overlays.default = final: prev: { overlays.default = final: prev: {
nix-index-unwrapped = prev.nix-index-unwrapped.overrideAttrs(old: { nix-index-unwrapped = (prev.nix-index-unwrapped.override {
patches = [ ./nix-index-https.patch ]; rustPlatform = final.rustPackages_1_76.rustPlatform;
}).overrideAttrs(old: rec {
version = "0.1.7-unstable-2024-05-11";
# commit with proper HTTPS fixes
# FIXME: unpin after next release
src = final.fetchFromGitHub {
owner = "nix-community";
repo = "nix-index";
rev = "195fb3525038e40836b8d286371365f5e7857c0c";
hash = "sha256-Cw6Q9rHcLjPKzab5O4G7cetFAaTZCex2VLvYIhJCbpg=";
};
cargoDeps = final.rustPlatform.fetchCargoTarball {
inherit src;
hash = "sha256-Pl56f8FU/U/x4gkTt5yXxE8FVQ/pGBDuxxP7HrfsaBc=";
};
}); });
nixos-channel-native-programs = with final; stdenv.mkDerivation { nixos-channel-native-programs = with final; stdenv.mkDerivation {

10
mirror-nixos-branch.pl
View file

@ -219,8 +219,13 @@ if ($bucketReleases && $bucketReleases->head_key("$releasePrefix")) {
# All of these jobs are not present in small channels # All of these jobs are not present in small channels
if ($channelName !~ /-small/) { if ($channelName !~ /-small/) {
downloadFile("nixos.iso_plasma5.aarch64-linux"); if ($channelName =~ /nixos-2[0123]/) {
downloadFile("nixos.iso_plasma5.x86_64-linux"); downloadFile("nixos.iso_plasma5.aarch64-linux");
downloadFile("nixos.iso_plasma5.x86_64-linux");
} else {
downloadFile("nixos.iso_plasma6.aarch64-linux");
downloadFile("nixos.iso_plasma6.x86_64-linux");
}
downloadFile("nixos.iso_gnome.aarch64-linux"); downloadFile("nixos.iso_gnome.aarch64-linux");
downloadFile("nixos.iso_gnome.x86_64-linux"); downloadFile("nixos.iso_gnome.x86_64-linux");
@ -357,6 +362,7 @@ if ($channelName =~ /nixos/) {
for my $artifact ("nixos-graphical", for my $artifact ("nixos-graphical",
"nixos-plasma5", "nixos-plasma5",
"nixos-plasma6",
"nixos-gnome", "nixos-gnome",
"nixos-minimal", "nixos-minimal",
) )