commit e72b496a4426191ff03ab5cf092f204bbdf88233 · pyrox.dev/nixpkgs

+2

nixos/doc/manual/release-notes/rl-2511.section.md

···

       18
       18
        
       

     

       19
       19
        
       - Syncthing has been updated to version 2.0.0.

     

       20
       20
        
       

     

       21
       21
       +
       - COSMIC DE has been updated to the beta version, bringing it closer to its first stable release. This includes updates to its core components, applications, and overall stability.

     

       22
       22
       +
       

     

       21
       23
        
       ## New Modules {#sec-release-25.11-new-modules}

     

       22
       24
        
       

     

       23
       25
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

+3

nixos/modules/services/desktop-managers/cosmic.nix

···

       26
       26
        
             cosmic-files

     

       27
       27
        
             config.services.displayManager.cosmic-greeter.package

     

       28
       28
        
             cosmic-idle

     

       29
       29
       +
             cosmic-initial-setup

     

       29
       30
        
             cosmic-launcher

     

       30
       31
        
             cosmic-notifications

     

       31
       32
        
             cosmic-osd

     
···

       103
       104
        
           services.graphical-desktop.enable = true;

     

       104
       105
        
       

     

       105
       106
        
           xdg = {

     

       107
       107
       +
             # Required for cosmic-osd

     

       108
       108
       +
             sounds.enable = true;

     

       106
       109
        
             icons.fallbackCursorThemes = lib.mkDefault [ "Cosmic" ];

     

       107
       110
        
       

     

       108
       111
        
             portal = {

+1 -1

nixos/modules/services/display-managers/cosmic-greeter.nix

···

       29
       29
        
             settings = {

     

       30
       30
        
               default_session = {

     

       31
       31
        
                 user = "cosmic-greeter";

     

       32
       32
       -
                 command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-greeter ${lib.getExe pkgs.cosmic-comp} ${lib.getExe cfg.package}'';

     

       32
       32
       +
                 command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" ${lib.getExe' cfg.package "cosmic-greeter-start"}'';

     

       33
       33
        
               };

     

       34
       34
        
               initial_session = lib.mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) {

     

       35
       35
        
                 user = cfgAutoLogin.user;

+6 -12

pkgs/by-name/co/cosmic-applets/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         fetchpatch2,

     

       6
       5
        
         rustPlatform,

     

       7
       6
        
         libcosmicAppHook,

     

       8
       7
        
         just,

     
···

       12
       11
        
         glib,

     

       13
       12
        
         libinput,

     

       14
       13
        
         pulseaudio,

     

       14
       14
       +
         pipewire,

     

       15
       15
        
         udev,

     

       16
       16
        
         xkeyboard_config,

     

       17
       17
        
         nix-update-script,

     
···

       20
       20
        
       

     

       21
       21
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       22
       22
        
         pname = "cosmic-applets";

     

       23
       23
       -
         version = "1.0.0-alpha.7";

     

       23
       23
       +
         version = "1.0.0-beta.1.1";

     

       24
       24
        
       

     

       25
       25
        
         # nixpkgs-update: no auto update

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "pop-os";

     

       28
       28
        
           repo = "cosmic-applets";

     

       29
       29
        
           tag = "epoch-${finalAttrs.version}";

     

       30
       30
       -
           hash = "sha256-DmU9Dlb8w3a8U+oSGwWARPh1SRbv/8TW7TO9SSvDe1U=";

     

       30
       30
       +
           hash = "sha256-uUcEwa9rGHLzmlutmLl/e38ZqybfYMU0Dhe+FsT5V/E=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
       -
         cargoHash = "sha256-wWs3B5hh2DP93i+4gGDTi+7NT4bj8ULJ+fT95sXxUdg=";

     

       34
       34
       -
       

     

       35
       35
       -
         patches = [

     

       36
       36
       -
           (fetchpatch2 {

     

       37
       37
       -
             name = "fix-bluetooth-dbus-spam.patch";

     

       38
       38
       -
             url = "https://github.com/pop-os/cosmic-applets/commit/b6bb982f2dace0a3d19c78b4b4247760a8010d5b.patch?full_index=1";

     

       39
       39
       -
             hash = "sha256-S5F9rqYrB38T9R6i/n/j3s79Xeh6BMmNkC+E2kTsus4=";

     

       40
       40
       -
           })

     

       41
       41
       -
         ];

     

       33
       33
       +
         cargoHash = "sha256-RnkyIlTJMxMGu+EsmZwvSIapSqdng+t8bqMVsDXprlU=";

     

       42
       34
        
       

     

       43
       35
        
         nativeBuildInputs = [

     

       44
       36
        
           just

     

       45
       37
        
           pkg-config

     

       46
       38
        
           util-linuxMinimal

     

       47
       39
        
           libcosmicAppHook

     

       40
       40
       +
           rustPlatform.bindgenHook

     

       48
       41
        
         ];

     

       49
       42
        
       

     

       50
       43
        
         buildInputs = [

     
···

       52
       45
        
           glib

     

       53
       46
        
           libinput

     

       54
       47
        
           pulseaudio

     

       48
       48
       +
           pipewire

     

       55
       49
        
           udev

     

       56
       50
        
         ];

     

       57
       51

+3 -3

pkgs/by-name/co/cosmic-applibrary/package.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       13
       13
        
         pname = "cosmic-applibrary";

     

       14
       14
       -
         version = "1.0.0-alpha.7";

     

       14
       14
       +
         version = "1.0.0-beta.1.1";

     

       15
       15
        
       

     

       16
       16
        
         # nixpkgs-update: no auto update

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "pop-os";

     

       19
       19
        
           repo = "cosmic-applibrary";

     

       20
       20
        
           tag = "epoch-${finalAttrs.version}";

     

       21
       21
       -
           hash = "sha256-2rGw4Jmr2rL9X1URA5wVPIZocuroS8yaQs42sJqiTbw=";

     

       21
       21
       +
           hash = "sha256-LVNOUOVeX8QpTbUG3bOhMkdrjkF3M0sZg+agSQyWAfA=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         cargoHash = "sha256-+nkXcbAPcIkg+p4ct/E0bm5O0n1MGN43AaWPjw13t9s=";

     

       24
       24
       +
         cargoHash = "sha256-f5uMgscentTlcPXFSan1kKcKh1nk88/3kQPTSuc0wz4=";

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

     

       27
       27
        
           just

+3 -3

pkgs/by-name/co/cosmic-bg/package.nix

···

       13
       13
        
       

     

       14
       14
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       15
       15
        
         pname = "cosmic-bg";

     

       16
       16
       -
         version = "1.0.0-alpha.7";

     

       16
       16
       +
         version = "1.0.0-beta.1.1";

     

       17
       17
        
       

     

       18
       18
        
         # nixpkgs-update: no auto update

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "pop-os";

     

       21
       21
        
           repo = "cosmic-bg";

     

       22
       22
        
           tag = "epoch-${finalAttrs.version}";

     

       23
       23
       -
           hash = "sha256-KMP7TmamtbycF/nKctjYozMJwVr9zdp4A8AWriswo2g=";

     

       23
       23
       +
           hash = "sha256-t5tY7Axiz39lCDhDC/lKSRCURfHspeaP49kNXJvCLC4=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         postPatch = ''

     
···

       29
       29
        
             "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"

     

       30
       30
        
         '';

     

       31
       31
        
       

     

       32
       32
       -
         cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";

     

       32
       32
       +
         cargoHash = "sha256-+NkraWjWHIMIyktAUlp3q2Ot1ib1QRsBBvfdbr5BXto=";

     

       33
       33
        
       

     

       34
       34
        
         nativeBuildInputs = [

     

       35
       35
        
           just

+3 -3

pkgs/by-name/co/cosmic-comp/package.nix

···

       20
       20
        
       

     

       21
       21
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       22
       22
        
         pname = "cosmic-comp";

     

       23
       23
       -
         version = "1.0.0-alpha.7";

     

       23
       23
       +
         version = "1.0.0-beta.1.1";

     

       24
       24
        
       

     

       25
       25
        
         # nixpkgs-update: no auto update

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "pop-os";

     

       28
       28
        
           repo = "cosmic-comp";

     

       29
       29
        
           tag = "epoch-${finalAttrs.version}";

     

       30
       30
       -
           hash = "sha256-2AnGEUWumE1C4Mi5inN7enbxCdWCKbQdYpUvTK3jGQ4=";

     

       30
       30
       +
           hash = "sha256-RHeQk1yBNnDN/efuDDWNLn9O7FQTYLBsbs+h+gxi+Xo=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
       -
         cargoHash = "sha256-fj6TIBuZ5hrds4WMHRa2krXN5fivKriO2Q/FWdnlGaA=";

     

       33
       33
       +
         cargoHash = "sha256-Jaw2v+02lA5wWRAhRNW/lcLnTI7beJIZ43dqcJ60EP0=";

     

       34
       34
        
       

     

       35
       35
        
         separateDebugInfo = true;

     

       36
       36

+31 -48

pkgs/by-name/co/cosmic-edit/package.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         rustPlatform,

     

       6
       6
       -
         makeBinaryWrapper,

     

       7
       7
       -
         cosmic-icons,

     

       6
       6
       +
         libcosmicAppHook,

     

       8
       7
        
         just,

     

       9
       8
        
         pkg-config,

     

       10
       10
       -
         libglvnd,

     

       11
       11
       -
         libxkbcommon,

     

       9
       9
       +
         glib,

     

       12
       10
        
         libinput,

     

       13
       11
        
         fontconfig,

     

       14
       12
        
         freetype,

     

       15
       15
       -
         libgbm,

     

       16
       16
       -
         wayland,

     

       17
       17
       -
         xorg,

     

       18
       18
       -
         vulkan-loader,

     

       19
       13
        
         nixosTests,

     

       14
       14
       +
         nix-update-script,

     

       20
       15
        
       }:

     

       21
       16
        
       

     

       22
       17
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       23
       18
        
         pname = "cosmic-edit";

     

       24
       24
       -
         version = "1.0.0-alpha.7";

     

       19
       19
       +
         version = "1.0.0-beta.1.1";

     

       25
       20
        
       

     

       26
       21
        
         # nixpkgs-update: no auto update

     

       27
       22
        
         src = fetchFromGitHub {

     

       28
       23
        
           owner = "pop-os";

     

       29
       24
        
           repo = "cosmic-edit";

     

       30
       25
        
           tag = "epoch-${finalAttrs.version}";

     

       31
       31
       -
           hash = "sha256-mgUSkYtc+i9pXv0n3zLHwBXFxfeWlhbsFJKa7X+mI98=";

     

       26
       26
       +
           hash = "sha256-Zd/vTNZt9tPXryOwo2U68FtIul7xiRcz5N4Heuyicoc=";

     

       32
       27
        
         };

     

       33
       28
        
       

     

       34
       34
       -
         cargoHash = "sha256-qfPLDgGeYGSO0ZKJooXRK0NnTqzJ6zq6RhBpTTUusQY=";

     

       35
       35
       -
       

     

       36
       36
       -
         # COSMIC applications now uses vergen for the About page

     

       37
       37
       -
         # Update the COMMIT_DATE to match when the commit was made

     

       38
       38
       -
         env.VERGEN_GIT_COMMIT_DATE = "2025-04-17";

     

       39
       39
       -
         env.VERGEN_GIT_SHA = finalAttrs.src.tag;

     

       29
       29
       +
         cargoHash = "sha256-YfD06RAQPZRwapd0fhNsZ0tx+0JMNDXiPJIWwDhmG0M=";

     

       40
       30
        
       

     

       41
       31
        
         postPatch = ''

     

       42
       32
        
           substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"

     
···

       45
       35
        
         nativeBuildInputs = [

     

       46
       36
        
           just

     

       47
       37
        
           pkg-config

     

       48
       48
       -
           makeBinaryWrapper

     

       38
       38
       +
           libcosmicAppHook

     

       49
       39
        
         ];

     

       40
       40
       +
       

     

       50
       41
        
         buildInputs = [

     

       51
       51
       -
           libxkbcommon

     

       52
       52
       -
           xorg.libX11

     

       42
       42
       +
           glib

     

       53
       43
        
           libinput

     

       54
       54
       -
           libglvnd

     

       55
       44
        
           fontconfig

     

       56
       45
        
           freetype

     

       57
       57
       -
           libgbm

     

       58
       58
       -
           wayland

     

       59
       59
       -
           vulkan-loader

     

       60
       46
        
         ];

     

       61
       47
        
       

     

       62
       48
        
         dontUseJustBuild = true;

     

       49
       49
       +
         dontUseJustCheck = true;

     

       63
       50
        
       

     

       64
       51
        
         justFlags = [

     

       65
       52
        
           "--set"

     
···

       70
       57
        
           "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-edit"

     

       71
       58
        
         ];

     

       72
       59
        
       

     

       73
       73
       -
         # Force linking to libEGL, which is always dlopen()ed, and to

     

       74
       74
       -
         # libwayland-client, which is always dlopen()ed except by the

     

       75
       75
       -
         # obscure winit backend.

     

       76
       76
       -
         RUSTFLAGS = map (a: "-C link-arg=${a}") [

     

       77
       77
       -
           "-Wl,--push-state,--no-as-needed"

     

       78
       78
       -
           "-lEGL"

     

       79
       79
       -
           "-lwayland-client"

     

       80
       80
       -
           "-Wl,--pop-state"

     

       81
       81
       -
         ];

     

       60
       60
       +
         passthru = {

     

       61
       61
       +
           tests = {

     

       62
       62
       +
             inherit (nixosTests)

     

       63
       63
       +
               cosmic

     

       64
       64
       +
               cosmic-autologin

     

       65
       65
       +
               cosmic-noxwayland

     

       66
       66
       +
               cosmic-autologin-noxwayland

     

       67
       67
       +
               ;

     

       68
       68
       +
           };

     

       82
       69
        
       

     

       83
       83
       -
         postInstall = ''

     

       84
       84
       -
           wrapProgram "$out/bin/cosmic-edit" \

     

       85
       85
       -
             --suffix XDG_DATA_DIRS : "${cosmic-icons}/share"

     

       86
       86
       -
         '';

     

       87
       87
       -
       

     

       88
       88
       -
         passthru.tests = {

     

       89
       89
       -
           inherit (nixosTests)

     

       90
       90
       -
             cosmic

     

       91
       91
       -
             cosmic-autologin

     

       92
       92
       -
             cosmic-noxwayland

     

       93
       93
       -
             cosmic-autologin-noxwayland

     

       94
       94
       -
             ;

     

       70
       70
       +
           updateScript = nix-update-script {

     

       71
       71
       +
             extraArgs = [

     

       72
       72
       +
               "--version"

     

       73
       73
       +
               "unstable"

     

       74
       74
       +
               "--version-regex"

     

       75
       75
       +
               "epoch-(.*)"

     

       76
       76
       +
             ];

     

       77
       77
       +
           };

     

       95
       78
        
         };

     

       96
       79
        
       

     

       97
       97
       -
         meta = with lib; {

     

       80
       80
       +
         meta = {

     

       98
       81
        
           homepage = "https://github.com/pop-os/cosmic-edit";

     

       99
       82
        
           description = "Text Editor for the COSMIC Desktop Environment";

     

       100
       83
        
           mainProgram = "cosmic-edit";

     

       101
       101
       -
           license = licenses.gpl3Only;

     

       102
       102
       -
           teams = [ teams.cosmic ];

     

       103
       103
       -
           platforms = platforms.linux;

     

       84
       84
       +
           license = lib.licenses.gpl3Only;

     

       85
       85
       +
           teams = [ lib.teams.cosmic ];

     

       86
       86
       +
           platforms = lib.platforms.linux;

     

       104
       87
        
         };

     

       105
       88
        
       })

+5 -19

pkgs/by-name/co/cosmic-files/package.nix

···

       12
       12
        
       

     

       13
       13
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       14
       14
        
         pname = "cosmic-files";

     

       15
       15
       -
         version = "1.0.0-alpha.7";

     

       15
       15
       +
         version = "1.0.0-beta.1.1";

     

       16
       16
        
       

     

       17
       17
        
         # nixpkgs-update: no auto update

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "pop-os";

     

       20
       20
        
           repo = "cosmic-files";

     

       21
       21
        
           tag = "epoch-${finalAttrs.version}";

     

       22
       22
       -
           hash = "sha256-bI5yTpqU2N6hFwI9wi4b9N5onY5iN+8YDM3bSgdYxjQ=";

     

       22
       22
       +
           hash = "sha256-pSjmsWsGGhjCekMTX8iiNVbF5X33zg5YVDWtemjIDWU=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         cargoHash = "sha256-7AOdSk9XIXFCDyCus3XgOK3ZBVa4CvX+NFM0jHf7Wbs=";

     

       26
       26
       -
       

     

       27
       27
       -
         env = {

     

       28
       28
       -
           VERGEN_GIT_COMMIT_DATE = "2025-04-22";

     

       29
       29
       -
           VERGEN_GIT_SHA = finalAttrs.src.tag;

     

       30
       30
       -
         };

     

       25
       25
       +
         cargoHash = "sha256-7RANj+aXdmBVO66QDgcNrrU4qEGK4Py4+ZctYWU1OO8=";

     

       31
       26
        
       

     

       32
       27
        
         nativeBuildInputs = [

     

       33
       28
        
           just

     

       34
       29
        
           libcosmicAppHook

     

       30
       30
       +
           rustPlatform.bindgenHook

     

       35
       31
        
         ];

     

       36
       32
        
       

     

       37
       33
        
         buildInputs = [ glib ];

     
···

       72
       68
        
       

     

       73
       69
        
           defaultCargoTestFlags="$cargoTestFlags"

     

       74
       70
        
       

     

       75
       75
       -
           # Some tests with the `compio` runtime expect io_uring support but that

     

       76
       76
       -
           # is disabled in the Nix sandbox and the tests fail because they can't

     

       77
       77
       -
           # run in the sandbox. Ideally, the `compio` crate should fallback to a

     

       78
       78
       -
           # non-io_uring runtime but for some reason, that doesn't happen.

     

       79
       79
       -
           cargoTestFlags="$defaultCargoTestFlags --package cosmic-files -- \

     

       80
       80
       -
             --skip operation::tests::copy_dir_to_same_location \

     

       81
       81
       -
             --skip operation::tests::copy_file_to_same_location \

     

       82
       82
       -
             --skip operation::tests::copy_file_with_diff_name_to_diff_dir \

     

       83
       83
       -
             --skip operation::tests::copy_file_with_extension_to_same_loc \

     

       84
       84
       -
             --skip operation::tests::copy_to_diff_dir_doesnt_dupe_files \

     

       85
       85
       -
             --skip operation::tests::copying_file_multiple_times_to_same_location"

     

       71
       71
       +
           cargoTestFlags="$defaultCargoTestFlags --package cosmic-files"

     

       86
       72
        
           runHook cargoCheckHook

     

       87
       73
        
       

     

       88
       74
        
           cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-applet"

+6 -4

pkgs/by-name/co/cosmic-greeter/package.nix

···

       6
       6
        
         libcosmicAppHook,

     

       7
       7
        
         cmake,

     

       8
       8
        
         just,

     

       9
       9
       +
         cosmic-randr,

     

       9
       10
        
         libinput,

     

       10
       11
        
         linux-pam,

     

       11
       12
        
         udev,

     
···

       17
       18
        
       

     

       18
       19
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       19
       20
        
         pname = "cosmic-greeter";

     

       20
       20
       -
         version = "1.0.0-alpha.7";

     

       21
       21
       +
         version = "1.0.0-beta.1.1";

     

       21
       22
        
       

     

       22
       23
        
         # nixpkgs-update: no auto update

     

       23
       24
        
         src = fetchFromGitHub {

     

       24
       25
        
           owner = "pop-os";

     

       25
       26
        
           repo = "cosmic-greeter";

     

       26
       27
        
           tag = "epoch-${finalAttrs.version}";

     

       27
       27
       -
           hash = "sha256-o9ZoRHi+k+HCSGfRz1lQFAeJMCqcTQEHf5rf9wn3qqY=";

     

       28
       28
       +
           hash = "sha256-rMZ+UbHarnvPaVAI5XeBfLduWEZHthguRSKLv3d/Eo0=";

     

       28
       29
        
         };

     

       29
       30
        
       

     

       30
       30
       -
         cargoHash = "sha256-hUHkyz/avFu9g1FMdC+4vz6xM75CauurrarhouuVZXc=";

     

       31
       31
       +
         cargoHash = "sha256-qioWGfg+cMaRNX6H6IWdcAU2py7oq9eNaxzKWw0H4R4=";

     

       31
       32
        
       

     

       32
       32
       -
         env.VERGEN_GIT_COMMIT_DATE = "2025-04-25";

     

       33
       33
       +
         env.VERGEN_GIT_COMMIT_DATE = "2025-09-16";

     

       33
       34
        
         env.VERGEN_GIT_SHA = finalAttrs.src.tag;

     

       34
       35
        
       

     

       35
       36
        
         cargoBuildFlags = [ "--all" ];

     
···

       42
       43
        
         ];

     

       43
       44
        
       

     

       44
       45
        
         buildInputs = [

     

       46
       46
       +
           cosmic-randr

     

       45
       47
        
           libinput

     

       46
       48
        
           linux-pam

     

       47
       49
        
           udev

+2 -2

pkgs/by-name/co/cosmic-icons/package.nix

···

       9
       9
        
       }:

     

       10
       10
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       11
       11
        
         pname = "cosmic-icons";

     

       12
       12
       -
         version = "1.0.0-alpha.7";

     

       12
       12
       +
         version = "1.0.0-beta.1.1";

     

       13
       13
        
       

     

       14
       14
        
         # nixpkgs-update: no auto update

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "pop-os";

     

       17
       17
        
           repo = "cosmic-icons";

     

       18
       18
        
           tag = "epoch-${finalAttrs.version}";

     

       19
       19
       -
           hash = "sha256-KDmEYeuiDTYvqg2XJK8pMDfsmROKtN+if5Qxz57H5xs=";

     

       19
       19
       +
           hash = "sha256-jxt0x0Ctk0PaaFQjf8p9y1yEgWkuEi7bR2VtybwlQAs=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ just ];

+1 -1

pkgs/by-name/co/cosmic-idle/package.nix

···

       16
       16
        
       

     

       17
       17
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       18
       18
        
         pname = "cosmic-idle";

     

       19
       19
       -
         version = "1.0.0-alpha.7";

     

       19
       19
       +
         version = "1.0.0-beta.1.1";

     

       20
       20
        
       

     

       21
       21
        
         # nixpkgs-update: no auto update

     

       22
       22
        
         src = fetchFromGitHub {

+74

pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch

···

       1
       1
       +
       diff --git a/src/main.rs b/src/main.rs

     

       2
       2
       +
       index a0e8f2e..07cf8b9 100644

     

       3
       3
       +
       --- a/src/main.rs

     

       4
       4
       +
       +++ b/src/main.rs

     

       5
       5
       +
       @@ -194,19 +194,19 @@ impl Application for App {

     

       6
       6
       +
                                }

     

       7
       7
       +
                            }

     

       8
       8
       +
        

     

       9
       9
       +
       -                    page::Message::Language(message) => {

     

       10
       10
       +
       -                        if let Some(page) =

     

       11
       11
       +
       -                            self.pages.get_mut(&TypeId::of::<page::language::Page>())

     

       12
       12
       +
       -                        {

     

       13
       13
       +
       -                            return page

     

       14
       14
       +
       -                                .as_any()

     

       15
       15
       +
       -                                .downcast_mut::<page::language::Page>()

     

       16
       16
       +
       -                                .unwrap()

     

       17
       17
       +
       -                                .update(message)

     

       18
       18
       +
       -                                .map(Message::PageMessage)

     

       19
       19
       +
       -                                .map(cosmic::Action::App);

     

       20
       20
       +
       -                        }

     

       21
       21
       +
       -                    }

     

       22
       22
       +
       +                    // page::Message::Language(message) => {

     

       23
       23
       +
       +                    //     if let Some(page) =

     

       24
       24
       +
       +                    //         self.pages.get_mut(&TypeId::of::<page::language::Page>())

     

       25
       25
       +
       +                    //     {

     

       26
       26
       +
       +                    //         return page

     

       27
       27
       +
       +                    //             .as_any()

     

       28
       28
       +
       +                    //             .downcast_mut::<page::language::Page>()

     

       29
       29
       +
       +                    //             .unwrap()

     

       30
       30
       +
       +                    //             .update(message)

     

       31
       31
       +
       +                    //             .map(Message::PageMessage)

     

       32
       32
       +
       +                    //             .map(cosmic::Action::App);

     

       33
       33
       +
       +                    //     }

     

       34
       34
       +
       +                    // }

     

       35
       35
       +
        

     

       36
       36
       +
                            page::Message::Layout(message) => {

     

       37
       37
       +
                                if let Some(page) = self.pages.get_mut(&TypeId::of::<page::layout::Page>())

     

       38
       38
       +
       diff --git a/src/page/mod.rs b/src/page/mod.rs

     

       39
       39
       +
       index 389728c..937a1b3 100644

     

       40
       40
       +
       --- a/src/page/mod.rs

     

       41
       41
       +
       +++ b/src/page/mod.rs

     

       42
       42
       +
       @@ -4,7 +4,7 @@ use std::any::{Any, TypeId};

     

       43
       43
       +
        

     

       44
       44
       +
        pub mod appearance;

     

       45
       45
       +
        pub mod keyboard;

     

       46
       46
       +
       -pub mod language;

     

       47
       47
       +
       +// pub mod language;

     

       48
       48
       +
        pub mod launcher;

     

       49
       49
       +
        pub mod layout;

     

       50
       50
       +
        pub mod location;

     

       51
       51
       +
       @@ -34,10 +34,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {

     

       52
       52
       +
            if let AppMode::NewInstall { create_user } = mode {

     

       53
       53
       +
                pages.insert(TypeId::of::<wifi::Page>(), Box::new(wifi::Page::default()));

     

       54
       54
       +
        

     

       55
       55
       +
       -        pages.insert(

     

       56
       56
       +
       -            TypeId::of::<language::Page>(),

     

       57
       57
       +
       -            Box::new(language::Page::new()),

     

       58
       58
       +
       -        );

     

       59
       59
       +
       +        // pages.insert(

     

       60
       60
       +
       +        //     TypeId::of::<language::Page>(),

     

       61
       61
       +
       +        //     Box::new(language::Page::new()),

     

       62
       62
       +
       +        // );

     

       63
       63
       +
        

     

       64
       64
       +
                pages.insert(

     

       65
       65
       +
                    TypeId::of::<keyboard::Page>(),

     

       66
       66
       +
       @@ -95,7 +95,7 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {

     

       67
       67
       +
        pub enum Message {

     

       68
       68
       +
            Appearance(appearance::Message),

     

       69
       69
       +
            Keyboard(keyboard::Message),

     

       70
       70
       +
       -    Language(language::Message),

     

       71
       71
       +
       +    // Language(language::Message),

     

       72
       72
       +
            Layout(layout::Message),

     

       73
       73
       +
            Location(location::Message),

     

       74
       74
       +
            SetTheme(cosmic::Theme),

+64

pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch

···

       1
       1
       +
       diff --git a/src/main.rs b/src/main.rs

     

       2
       2
       +
       index a0e8f2e..b6ff8dc 100644

     

       3
       3
       +
       --- a/src/main.rs

     

       4
       4
       +
       +++ b/src/main.rs

     

       5
       5
       +
       @@ -221,7 +221,7 @@ impl Application for App {

     

       6
       6
       +
                                }

     

       7
       7
       +
                            }

     

       8
       8
       +
        

     

       9
       9
       +
       -                    page::Message::Location(message) => {

     

       10
       10
       +
       +                    /* page::Message::Location(message) => {

     

       11
       11
       +
                                if let Some(page) =

     

       12
       12
       +
                                    self.pages.get_mut(&TypeId::of::<page::location::Page>())

     

       13
       13
       +
                                {

     

       14
       14
       +
       @@ -233,7 +233,7 @@ impl Application for App {

     

       15
       15
       +
                                        .map(Message::PageMessage)

     

       16
       16
       +
                                        .map(cosmic::Action::App);

     

       17
       17
       +
                                }

     

       18
       18
       +
       -                    }

     

       19
       19
       +
       +                    } */

     

       20
       20
       +
        

     

       21
       21
       +
                            page::Message::User(message) => {

     

       22
       22
       +
                                if let Some(page) = self.pages.get_mut(&TypeId::of::<page::user::Page>()) {

     

       23
       23
       +
       diff --git a/src/page/mod.rs b/src/page/mod.rs

     

       24
       24
       +
       index 389728c..38ced5e 100644

     

       25
       25
       +
       --- a/src/page/mod.rs

     

       26
       26
       +
       +++ b/src/page/mod.rs

     

       27
       27
       +
       @@ -7,7 +7,7 @@ pub mod keyboard;

     

       28
       28
       +
        pub mod language;

     

       29
       29
       +
        pub mod launcher;

     

       30
       30
       +
        pub mod layout;

     

       31
       31
       +
       -pub mod location;

     

       32
       32
       +
       +// pub mod location;

     

       33
       33
       +
        pub mod new_apps;

     

       34
       34
       +
        pub mod new_shortcuts;

     

       35
       35
       +
        pub mod user;

     

       36
       36
       +
       @@ -48,10 +48,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {

     

       37
       37
       +
                    pages.insert(TypeId::of::<user::Page>(), Box::new(user::Page::default()));

     

       38
       38
       +
                }

     

       39
       39
       +
        

     

       40
       40
       +
       -        pages.insert(

     

       41
       41
       +
       +        /* pages.insert(

     

       42
       42
       +
                    TypeId::of::<location::Page>(),

     

       43
       43
       +
                    Box::new(location::Page::new()),

     

       44
       44
       +
       -        );

     

       45
       45
       +
       +        ); */

     

       46
       46
       +
            }

     

       47
       47
       +
        

     

       48
       48
       +
            pages.insert(

     

       49
       49
       +
       @@ -97,7 +97,7 @@ pub enum Message {

     

       50
       50
       +
            Keyboard(keyboard::Message),

     

       51
       51
       +
            Language(language::Message),

     

       52
       52
       +
            Layout(layout::Message),

     

       53
       53
       +
       -    Location(location::Message),

     

       54
       54
       +
       +    // Location(location::Message),

     

       55
       55
       +
            SetTheme(cosmic::Theme),

     

       56
       56
       +
            User(user::Message),

     

       57
       57
       +
            Welcome(welcome::Message),

     

       58
       58
       +
       @@ -150,4 +150,4 @@ pub trait Page {

     

       59
       59
       +
            fn view(&self) -> Element<'_, Message> {

     

       60
       60
       +
                widget::text::body("TODO").into()

     

       61
       61
       +
            }

     

       62
       62
       +
       -}

     

       63
       63
       +
       +}

     

       64
       64
       +
       \ No newline at end of file

+102

pkgs/by-name/co/cosmic-initial-setup/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         rustPlatform,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         just,

     

       7
       7
       +
         libcosmicAppHook,

     

       8
       8
       +
         libinput,

     

       9
       9
       +
         openssl,

     

       10
       10
       +
         udev,

     

       11
       11
       +
         nixosTests,

     

       12
       12
       +
         nix-update-script,

     

       13
       13
       +
       }:

     

       14
       14
       +
       rustPlatform.buildRustPackage (finalAttrs: {

     

       15
       15
       +
         pname = "cosmic-initial-setup";

     

       16
       16
       +
         version = "1.0.0-beta.1.1";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "pop-os";

     

       20
       20
       +
           repo = "cosmic-initial-setup";

     

       21
       21
       +
           tag = "epoch-${finalAttrs.version}";

     

       22
       22
       +
           hash = "sha256-kjJqGNcIlnzEsfA4eQ9D23ZGgRcmWQyWheAlwpjfALA=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         cargoHash = "sha256-orwK9gcFXK4/+sfwRubcz0PP6YAFqsENRHnlSLttLxM=";

     

       26
       26
       +
       

     

       27
       27
       +
         # cargo-auditable fails during the build when compiling the `crabtime::function`

     

       28
       28
       +
         # procedural macro. It panics because the `--out-dir` flag is not passed to

     

       29
       29
       +
         # the rustc wrapper.

     

       30
       30
       +
         #

     

       31
       31
       +
         # Reported this issue upstream in:

     

       32
       32
       +
         # https://github.com/rust-secure-code/cargo-auditable/issues/225

     

       33
       33
       +
         auditable = false;

     

       34
       34
       +
       

     

       35
       35
       +
         nativeBuildInputs = [

     

       36
       36
       +
           libcosmicAppHook

     

       37
       37
       +
           just

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         buildInputs = [

     

       41
       41
       +
           libinput

     

       42
       42
       +
           openssl

     

       43
       43
       +
           udev

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       46
       46
       +
         # These are not needed for NixOS

     

       47
       47
       +
         patches = [

     

       48
       48
       +
           ./disable-language-page.patch

     

       49
       49
       +
           ./disable-timezone-page.patch

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       52
       52
       +
         postPatch = ''

     

       53
       53
       +
           # Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart

     

       54
       54
       +
           substituteInPlace justfile \

     

       55
       55
       +
             --replace-fail \

     

       56
       56
       +
             "autostart-dst := rootdir / 'etc' / 'xdg' / 'autostart' / desktop-entry" \

     

       57
       57
       +
             "autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry"

     

       58
       58
       +
         '';

     

       59
       59
       +
       

     

       60
       60
       +
         dontUseJustBuild = true;

     

       61
       61
       +
         dontUseJustCheck = true;

     

       62
       62
       +
       

     

       63
       63
       +
         justFlags = [

     

       64
       64
       +
           "--set"

     

       65
       65
       +
           "prefix"

     

       66
       66
       +
           (placeholder "out")

     

       67
       67
       +
           "--set"

     

       68
       68
       +
           "cargo-target-dir"

     

       69
       69
       +
           "target/${stdenv.hostPlatform.rust.cargoShortTarget}"

     

       70
       70
       +
         ];

     

       71
       71
       +
       

     

       72
       72
       +
         env.DISABLE_IF_EXISTS = "/iso/nix-store.squashfs";

     

       73
       73
       +
       

     

       74
       74
       +
         passthru = {

     

       75
       75
       +
           tests = {

     

       76
       76
       +
             inherit (nixosTests)

     

       77
       77
       +
               cosmic

     

       78
       78
       +
               cosmic-autologin

     

       79
       79
       +
               cosmic-noxwayland

     

       80
       80
       +
               cosmic-autologin-noxwayland

     

       81
       81
       +
               ;

     

       82
       82
       +
           };

     

       83
       83
       +
       

     

       84
       84
       +
           updateScript = nix-update-script {

     

       85
       85
       +
             extraArgs = [

     

       86
       86
       +
               "--version"

     

       87
       87
       +
               "unstable"

     

       88
       88
       +
               "--version-regex"

     

       89
       89
       +
               "epoch-(.*)"

     

       90
       90
       +
             ];

     

       91
       91
       +
           };

     

       92
       92
       +
         };

     

       93
       93
       +
       

     

       94
       94
       +
         meta = {

     

       95
       95
       +
           description = "COSMIC Initial Setup";

     

       96
       96
       +
           homepage = "https://github.com/pop-os/cosmic-initial-setup";

     

       97
       97
       +
           license = lib.licenses.gpl3Only;

     

       98
       98
       +
           mainProgram = "cosmic-initial-setup";

     

       99
       99
       +
           platforms = lib.platforms.linux;

     

       100
       100
       +
           teams = [ lib.teams.cosmic ];

     

       101
       101
       +
         };

     

       102
       102
       +
       })

+3 -3

pkgs/by-name/co/cosmic-launcher/package.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       13
       13
        
         pname = "cosmic-launcher";

     

       14
       14
       -
         version = "1.0.0-alpha.7";

     

       14
       14
       +
         version = "1.0.0-beta.1.1";

     

       15
       15
        
       

     

       16
       16
        
         # nixpkgs-update: no auto update

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "pop-os";

     

       19
       19
        
           repo = "cosmic-launcher";

     

       20
       20
        
           tag = "epoch-${finalAttrs.version}";

     

       21
       21
       -
           hash = "sha256-niMsDLVMUEr8VyubDm6RGgS7p22v5nH/F8cASJOszhs=";

     

       21
       21
       +
           hash = "sha256-vAuWH9qmstPcfPvcKoM/2VjGxAfdtO9hhOPaZ5Ft4Y0=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         cargoHash = "sha256-Wh3vI42RBfXpI7mvPVUmGK3fITGi+EGyo+lG7VnZg3w=";

     

       24
       24
       +
         cargoHash = "sha256-57rkCufJPWm844/iMIfULfaGR9770q8VgZgnqCM57Zg=";

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

     

       27
       27
        
           just

+3 -3

pkgs/by-name/co/cosmic-notifications/package.nix

···

       12
       12
        
       

     

       13
       13
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       14
       14
        
         pname = "cosmic-notifications";

     

       15
       15
       -
         version = "1.0.0-alpha.7";

     

       15
       15
       +
         version = "1.0.0-beta.1.1";

     

       16
       16
        
       

     

       17
       17
        
         # nixpkgs-update: no auto update

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "pop-os";

     

       20
       20
        
           repo = "cosmic-notifications";

     

       21
       21
        
           tag = "epoch-${finalAttrs.version}";

     

       22
       22
       -
           hash = "sha256-xcGmcOoxHb7gj6fW7xPZ5R0MTkMVXNJgvr9d5LPy9kw=";

     

       22
       22
       +
           hash = "sha256-wgOjaiKJ1KYdYsynQV5+KKGhdneELiLTHYqjMEWaxt0=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         cargoHash = "sha256-7EDe1OjGS6Xl0N/BrZG8lzWO0pFbwiEp+kn6WyydJQM=";

     

       25
       25
       +
         cargoHash = "sha256-CL8xvj57yq0qzK3tyYh3YXh+fM4ZDsmL8nP1mcqTqeQ=";

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

     

       28
       28
        
           just

+11 -10

pkgs/by-name/co/cosmic-osd/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         fetchFromGitHub,

     

       4
       4
       -
         sound-theme-freedesktop,

     

       5
       4
        
         rustPlatform,

     

       6
       5
        
         libcosmicAppHook,

     

       7
       6
        
         pulseaudio,

     

       7
       7
       +
         pipewire,

     

       8
       8
       +
         libinput,

     

       8
       9
        
         udev,

     

       9
       10
        
         nix-update-script,

     

       10
       11
        
         nixosTests,

     
···

       12
       13
        
       

     

       13
       14
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       14
       15
        
         pname = "cosmic-osd";

     

       15
       15
       -
         version = "1.0.0-alpha.7";

     

       16
       16
       +
         version = "1.0.0-beta.1.1";

     

       16
       17
        
       

     

       17
       18
        
         # nixpkgs-update: no auto update

     

       18
       19
        
         src = fetchFromGitHub {

     

       19
       20
        
           owner = "pop-os";

     

       20
       21
        
           repo = "cosmic-osd";

     

       21
       22
        
           tag = "epoch-${finalAttrs.version}";

     

       22
       22
       -
           hash = "sha256-POjuxrNBajp4IOw7YwF2TS4OfoM8Hxo1fO48nkhKj8U=";

     

       23
       23
       +
           hash = "sha256-tsP4dlHmzuf5QgByDWbuigMrpgnJAjuNsYwWDSutCoI=";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       25
       -
         postPatch = ''

     

       26
       26
       -
           substituteInPlace src/components/app.rs \

     

       27
       27
       -
             --replace-fail '/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga' '${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga'

     

       28
       28
       -
         '';

     

       26
       26
       +
         cargoHash = "sha256-YcNvvK+Zf8nSS5YjS5iaoipogstiyBdNY7LhWPsz9xQ=";

     

       29
       27
        
       

     

       30
       30
       -
         cargoHash = "sha256-kfExKggQo3MoTXw1JbKWjLu5kwYF0n7DzSQcG6e1+QQ=";

     

       31
       31
       -
       

     

       32
       32
       -
         nativeBuildInputs = [ libcosmicAppHook ];

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           libcosmicAppHook

     

       30
       30
       +
           rustPlatform.bindgenHook

     

       31
       31
       +
         ];

     

       33
       32
        
       

     

       34
       33
        
         buildInputs = [

     

       35
       34
        
           pulseaudio

     

       36
       35
        
           udev

     

       36
       36
       +
           libinput

     

       37
       37
       +
           pipewire

     

       37
       38
        
         ];

     

       38
       39
        
       

     

       39
       40
        
         env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1";

+3 -3

pkgs/by-name/co/cosmic-panel/package.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       13
       13
        
         pname = "cosmic-panel";

     

       14
       14
       -
         version = "1.0.0-alpha.7";

     

       14
       14
       +
         version = "1.0.0-beta.1.1";

     

       15
       15
        
       

     

       16
       16
        
         # nixpkgs-update: no auto update

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "pop-os";

     

       19
       19
        
           repo = "cosmic-panel";

     

       20
       20
        
           tag = "epoch-${finalAttrs.version}";

     

       21
       21
       -
           hash = "sha256-QcrkfU6HNZ2tWfKsMdcv58HC/PE7b4T14AIep85TWOY=";

     

       21
       21
       +
           hash = "sha256-gSTvF6Zcixh5/uYZuUiCIdBlXJj31+lISBwLujTuOfo=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         cargoHash = "sha256-qufOJeWPRjj4GgWNJmQfYaGKeYOQbkTeFzrUSi9QNnQ=";

     

       24
       24
       +
         cargoHash = "sha256-8KOl581VmsfE7jiVFXy3ZDIfAqnaJuiDd7paqiFI/mk=";

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

     

       27
       27
        
           just

+3 -3

pkgs/by-name/co/cosmic-player/package.nix

···

       18
       18
        
       

     

       19
       19
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       20
       20
        
         pname = "cosmic-player";

     

       21
       21
       -
         version = "1.0.0-alpha.7";

     

       21
       21
       +
         version = "1.0.0-beta.1.1";

     

       22
       22
        
       

     

       23
       23
        
         # nixpkgs-update: no auto update

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "pop-os";

     

       26
       26
        
           repo = "cosmic-player";

     

       27
       27
        
           tag = "epoch-${finalAttrs.version}";

     

       28
       28
       -
           hash = "sha256-/xf3IOFVpctfgaaNNq2HUzK/qHt7Qikcv0JKoPJboRU=";

     

       28
       28
       +
           hash = "sha256-oTTVVQkSkON5NTgO5+eUD2wVpiW5MvW3MZyeyqqc3qk=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
       -
         cargoHash = "sha256-0RrtErTR2J5mn/Lfppk+5X8UUOC2LN65krAq1uz/O4M=";

     

       31
       31
       +
         cargoHash = "sha256-DodFIfthiGFSvXWfPsPjFhNY6G7z3lb6pfc5HtUXhMo=";

     

       32
       32
        
       

     

       33
       33
        
         postPatch = ''

     

       34
       34
        
           substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"

+3 -3

pkgs/by-name/co/cosmic-randr/package.nix

···

       12
       12
        
       

     

       13
       13
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       14
       14
        
         pname = "cosmic-randr";

     

       15
       15
       -
         version = "1.0.0-alpha.7";

     

       15
       15
       +
         version = "1.0.0-beta.1.1";

     

       16
       16
        
       

     

       17
       17
        
         # nixpkgs-update: no auto update

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "pop-os";

     

       20
       20
        
           repo = "cosmic-randr";

     

       21
       21
        
           tag = "epoch-${finalAttrs.version}";

     

       22
       22
       -
           hash = "sha256-vCGbWsG/F3WhWVSy8Z3r4ZHpks/X/57/ZZXuw6BFl+c=";

     

       22
       22
       +
           hash = "sha256-daP2YZ7B1LXzqh2n0KoSTJbitdK+hlZO+Ydt9behzmQ=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         cargoHash = "sha256-lW44Y7RhA1l+cCDwqSq9sbhWi+kONJ0zy1fUu8WPYw0=";

     

       25
       25
       +
         cargoHash = "sha256-tkmBthh+nM3Mb9WoSjxMbx3t0NTf6lv91TwEwEANS6U=";

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

     

       28
       28
        
           just

+3 -3

pkgs/by-name/co/cosmic-screenshot/package.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       12
       12
        
         pname = "cosmic-screenshot";

     

       13
       13
       -
         version = "1.0.0-alpha.7";

     

       13
       13
       +
         version = "1.0.0-beta.1.1";

     

       14
       14
        
       

     

       15
       15
        
         # nixpkgs-update: no auto update

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "pop-os";

     

       18
       18
        
           repo = "cosmic-screenshot";

     

       19
       19
        
           tag = "epoch-${finalAttrs.version}";

     

       20
       20
       -
           hash = "sha256-VvU/9vYdoTvy3yzdeXrhKrtS9tUHMKnaSAeNTEKk5PA=";

     

       20
       20
       +
           hash = "sha256-TKR8EDXZwKKC1WSZhlcf5U6tiM4cWCdb24U74vVKTaU=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         cargoHash = "sha256-1r0Uwcf4kpHCgWqrUYZELsVXGDzbtbmu/WFeX53fBiQ=";

     

       23
       23
       +
         cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

     

       26
       26
        
           just

+3 -3

pkgs/by-name/co/cosmic-session/package.nix

···

       12
       12
        
       

     

       13
       13
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       14
       14
        
         pname = "cosmic-session";

     

       15
       15
       -
         version = "1.0.0-alpha.7";

     

       15
       15
       +
         version = "1.0.0-beta.1.1";

     

       16
       16
        
       

     

       17
       17
        
         # nixpkgs-update: no auto update

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "pop-os";

     

       20
       20
        
           repo = "cosmic-session";

     

       21
       21
        
           tag = "epoch-${finalAttrs.version}";

     

       22
       22
       -
           hash = "sha256-vozm4vcXV3RB9Pk6om1UNCfGh80vIVJvSwbzwGDQw3Y=";

     

       22
       22
       +
           hash = "sha256-P3xXYd80P+DR1vVE0zZC+v4ARsGhRrG9N9LdP2BEfDA=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         cargoHash = "sha256-68budhhbt8wPY7sfDqwIs4MWB/NBXsswK6HbC2AnHqE=";

     

       25
       25
       +
         cargoHash = "sha256-bo46A7hS1U0cOsa/T4oMTKUTjxVCaGuFdN2qCjVHxhg=";

     

       26
       26
        
       

     

       27
       27
        
         postPatch = ''

     

       28
       28
        
           substituteInPlace data/start-cosmic \

+10 -10

pkgs/by-name/co/cosmic-settings-daemon/package.nix

···

       7
       7
        
         adw-gtk3,

     

       8
       8
        
         pkg-config,

     

       9
       9
        
         libpulseaudio,

     

       10
       10
       -
         geoclue2-with-demo-agent,

     

       11
       10
        
         libinput,

     

       12
       11
        
         udev,

     

       12
       12
       +
         openssl,

     

       13
       13
        
         nixosTests,

     

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       17
       17
        
         pname = "cosmic-settings-daemon";

     

       18
       18
       -
         version = "1.0.0-alpha.7";

     

       18
       18
       +
         version = "1.0.0-beta.1.1";

     

       19
       19
        
       

     

       20
       20
        
         # nixpkgs-update: no auto update

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "pop-os";

     

       23
       23
        
           repo = "cosmic-settings-daemon";

     

       24
       24
        
           tag = "epoch-${finalAttrs.version}";

     

       25
       25
       -
           hash = "sha256-vdhkE5CmgiGYg5TXxN7lLqxjv7apKEKvIscXFIzZfRc=";

     

       25
       25
       +
           hash = "sha256-tHG/VoaP1tcns6AyedkkVUpWFlcOclWijsHYQ3vOIjs=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         postPatch = ''

     
···

       32
       32
        
             --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'

     

       33
       33
        
         '';

     

       34
       34
        
       

     

       35
       35
       -
         cargoHash = "sha256-Dzv1SDeZFIa+LFQQ91lO7RBHldsjDnGf+R12Ln2WZwU=";

     

       35
       35
       +
         cargoHash = "sha256-1YQ7eQ6L6OHvVihUUnZCDWXXtVOyaI1pFN7YD/OBcfo=";

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [ pkg-config ];

     

       38
       38
       +
       

     

       38
       39
        
         buildInputs = [

     

       39
       40
        
           libinput

     

       40
       41
        
           libpulseaudio

     

       42
       42
       +
           openssl

     

       41
       43
        
           udev

     

       42
       44
        
         ];

     

       43
       45
        
       

     

       44
       44
       -
         env.GEOCLUE_AGENT = "${lib.getLib geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent";

     

       45
       45
       -
       

     

       46
       46
        
         makeFlags = [

     

       47
       47
        
           "prefix=$(out)"

     

       48
       48
        
           "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"

     
···

       59
       59
        
             ;

     

       60
       60
        
         };

     

       61
       61
        
       

     

       62
       62
       -
         meta = with lib; {

     

       62
       62
       +
         meta = {

     

       63
       63
        
           homepage = "https://github.com/pop-os/cosmic-settings-daemon";

     

       64
       64
        
           description = "Settings Daemon for the COSMIC Desktop Environment";

     

       65
       65
        
           mainProgram = "cosmic-settings-daemon";

     

       66
       66
       -
           license = licenses.gpl3Only;

     

       67
       67
       -
           teams = [ teams.cosmic ];

     

       68
       68
       -
           platforms = platforms.linux;

     

       66
       66
       +
           license = lib.licenses.gpl3Only;

     

       67
       67
       +
           teams = [ lib.teams.cosmic ];

     

       68
       68
       +
           platforms = lib.platforms.linux;

     

       69
       69
        
         };

     

       70
       70
        
       })

+3 -3

pkgs/by-name/co/cosmic-settings/package.nix

···

       27
       27
        
       in

     

       28
       28
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       29
       29
        
         pname = "cosmic-settings";

     

       30
       30
       -
         version = "1.0.0-alpha.7";

     

       30
       30
       +
         version = "1.0.0-beta.1.1";

     

       31
       31
        
       

     

       32
       32
        
         # nixpkgs-update: no auto update

     

       33
       33
        
         src = fetchFromGitHub {

     

       34
       34
        
           owner = "pop-os";

     

       35
       35
        
           repo = "cosmic-settings";

     

       36
       36
        
           tag = "epoch-${finalAttrs.version}";

     

       37
       37
       -
           hash = "sha256-rrPgCXl4uD4Gvstgj9Sdv6rB/0d8wa56CdBjAkTLQG8=";

     

       37
       37
       +
           hash = "sha256-Yn5CSp/vsLMbkcQ7mCDw/ErgkSCyEvkwNvWqupVUkZ4=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
       -
         cargoHash = "sha256-7Aoy/okgFSwDU6jMYzTGtwPbK82yMgL5bnKBfBUD3vA=";

     

       40
       40
       +
         cargoHash = "sha256-dHyUTV5txSLWEDE7Blplz8CBvyuUmYNNr1kbifujHKk=";

     

       41
       41
        
       

     

       42
       42
        
         nativeBuildInputs = [

     

       43
       43
        
           cmake

+3 -3

pkgs/by-name/co/cosmic-store/package.nix

···

       15
       15
        
       

     

       16
       16
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       17
       17
        
         pname = "cosmic-store";

     

       18
       18
       -
         version = "1.0.0-alpha.7";

     

       18
       18
       +
         version = "1.0.0-beta.1.1";

     

       19
       19
        
       

     

       20
       20
        
         # nixpkgs-update: no auto update

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "pop-os";

     

       23
       23
        
           repo = "cosmic-store";

     

       24
       24
        
           tag = "epoch-${finalAttrs.version}";

     

       25
       25
       -
           hash = "sha256-skNzkpcdGJkve7enlnnZxYxnScHFmyaCAy0xaMEEsE0=";

     

       25
       25
       +
           hash = "sha256-KlXFFoUEa0YTQDEJHMrbWOIEsSnXvJNzzaEFYR83t9s=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         cargoHash = "sha256-2iWJFPSvNQ6JwQwzowKYbgjog2gsjOUlReai/j0d3Do=";

     

       28
       28
       +
         cargoHash = "sha256-xdNYQB/zmndnMAkstwJ6Z2uk0fXli3gIYHchUq/3u6k=";

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

     

       31
       31
        
           just

+3 -10

pkgs/by-name/co/cosmic-term/package.nix

···

       15
       15
        
       

     

       16
       16
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       17
       17
        
         pname = "cosmic-term";

     

       18
       18
       -
         version = "1.0.0-alpha.7";

     

       18
       18
       +
         version = "1.0.0-beta.1.1";

     

       19
       19
        
       

     

       20
       20
        
         # nixpkgs-update: no auto update

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "pop-os";

     

       23
       23
        
           repo = "cosmic-term";

     

       24
       24
        
           tag = "epoch-${finalAttrs.version}";

     

       25
       25
       -
           hash = "sha256-leCKdnlevfLiPJkloWCpOjkHaSf7+EYdobZRZ/Jis+4=";

     

       25
       25
       +
           hash = "sha256-1kQuPMaLXq+V1fTplXKoXAVOtyuD4Sh8diljHgTDbdI=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         cargoHash = "sha256-Re9t25tkwmrvXB9GmPSVG+QDUZmk5rwrrY2ntlB3Tdw=";

     

       29
       29
       -
       

     

       30
       30
       -
         # COSMIC applications now uses vergen for the About page

     

       31
       31
       -
         # Update the COMMIT_DATE to match when the commit was made

     

       32
       32
       -
         env = {

     

       33
       33
       -
           VERGEN_GIT_COMMIT_DATE = "2025-04-20";

     

       34
       34
       -
           VERGEN_GIT_SHA = finalAttrs.src.tag;

     

       35
       35
       -
         };

     

       28
       28
       +
         cargoHash = "sha256-mpuVSHb9YcDZB+eyyD+5ZNzUeEgx8T25IFjsD/Q/quU=";

     

       36
       29
        
       

     

       37
       30
        
         nativeBuildInputs = [

     

       38
       31
        
           just

+1 -9

pkgs/by-name/co/cosmic-wallpapers/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenvNoCC,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         fetchpatch,

     

       6
       5
        
         nix-update-script,

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       10
       9
        
         pname = "cosmic-wallpapers";

     

       11
       11
       -
         version = "1.0.0-alpha.7";

     

       10
       10
       +
         version = "1.0.0-beta.1.1";

     

       12
       11
        
       

     

       13
       12
        
         # nixpkgs-update: no auto update

     

       14
       13
        
         src = fetchFromGitHub {

     
···

       19
       18
        
           fetchLFS = true;

     

       20
       19
        
           hash = "sha256-XtNmV6fxKFlirXQvxxgAYSQveQs8RCTfcFd8SVdEXtE=";

     

       21
       20
        
         };

     

       22
       22
       -
       

     

       23
       23
       -
         patches = [

     

       24
       24
       -
           (fetchpatch {

     

       25
       25
       -
             url = "https://github.com/pop-os/cosmic-wallpapers/pull/2/commits/4d17ebe69335f8ffa80fd1c48baa7f3d3efa4dbe.patch";

     

       26
       26
       -
             hash = "sha256-4QRtX5dbN6C/ZKU3pvV7mTT7EDrMWvRCFB4004RMylM=";

     

       27
       27
       -
           })

     

       28
       28
       -
         ];

     

       29
       21
        
       

     

       30
       22
        
         makeFlags = [ "prefix=${placeholder "out"}" ];

     

       31
       23

+3 -3

pkgs/by-name/co/cosmic-workspaces-epoch/package.nix

···

       14
       14
        
       

     

       15
       15
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       16
       16
        
         pname = "cosmic-workspaces-epoch";

     

       17
       17
       -
         version = "1.0.0-alpha.7";

     

       17
       17
       +
         version = "1.0.0-beta.1.1";

     

       18
       18
        
       

     

       19
       19
        
         # nixpkgs-update: no auto update

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "pop-os";

     

       22
       22
        
           repo = "cosmic-workspaces-epoch";

     

       23
       23
        
           tag = "epoch-${finalAttrs.version}";

     

       24
       24
       -
           hash = "sha256-d7KYZbq8O/t5V/gU+wwstp06vyfnmt6vRKo+54Dct+o=";

     

       24
       24
       +
           hash = "sha256-gcS8Q9SR7Dj1FH2Dtdd6jUMX8u5kHJBMvlgqJGw+rjA=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         cargoHash = "sha256-TjgnPuFUIDtxx9kpvN9hKiir3/ZVtCc0z1CE4UHre1Q=";

     

       27
       27
       +
         cargoHash = "sha256-BE6s2dmbgXlFXrtd8b9k2LltLnegLzWbIUlaEQvv+5o=";

     

       28
       28
        
       

     

       29
       29
        
         separateDebugInfo = true;

     

       30
       30

+11 -10

pkgs/by-name/po/pop-launcher/package.nix

···

       10
       10
        
         libxkbcommon,

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
       -
       rustPlatform.buildRustPackage rec {

     

       13
       13
       +
       rustPlatform.buildRustPackage (finalAttrs: {

     

       14
       14
        
         pname = "pop-launcher";

     

       15
       15
       -
         version = "1.2.4";

     

       15
       15
       +
         version = "1.2.6";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "pop-os";

     

       19
       19
        
           repo = "launcher";

     

       20
       20
       -
           rev = version;

     

       21
       21
       -
           hash = "sha256-CLpquNgdtnGMlMpGLv72WZmizalvYPfMWlE/qLprVrs=";

     

       20
       20
       +
           tag = finalAttrs.version;

     

       21
       21
       +
           hash = "sha256-4wPspv5bpqoG45uUkrtxJTvdbmFkpWv8QBZxsPbGu/M=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

     
···

       29
       29
        
           libxkbcommon

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
       -
         cargoHash = "sha256-Htre2gzAlNfxBkBvMMtjYbUcuwNw+tB4DI18iBA+g34=";

     

       32
       32
       +
         cargoHash = "sha256-gc1YhIxHBqmMOE3Gu3T4gmGdAp0t+qiUXDcPYZE6utU=";

     

       33
       33
        
       

     

       34
       34
        
         cargoBuildFlags = [

     

       35
       35
        
           "--package"

     
···

       66
       66
        
               --replace-fail '/usr/bin/gnome-terminal' 'gnome-terminal'

     

       67
       67
        
         '';

     

       68
       68
        
       

     

       69
       69
       -
         meta = with lib; {

     

       69
       69
       +
         meta = {

     

       70
       70
        
           description = "Modular IPC-based desktop launcher service";

     

       71
       71
        
           homepage = "https://github.com/pop-os/launcher";

     

       72
       72
       -
           platforms = platforms.linux;

     

       73
       73
       -
           license = licenses.mpl20;

     

       74
       74
       -
           maintainers = with maintainers; [ samhug ];

     

       72
       72
       +
           platforms = lib.platforms.linux;

     

       73
       73
       +
           license = lib.licenses.mpl20;

     

       74
       74
       +
           maintainers = with lib.maintainers; [ samhug ];

     

       75
       75
        
           mainProgram = "pop-launcher";

     

       76
       76
       +
           teams = [ lib.teams.cosmic ];

     

       76
       77
        
         };

     

       77
       77
       -
       }

     

       78
       78
       +
       })

+3 -8

pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix

···

       17
       17
        
       

     

       18
       18
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       19
       19
        
         pname = "xdg-desktop-portal-cosmic";

     

       20
       20
       -
         version = "1.0.0-alpha.7";

     

       20
       20
       +
         version = "1.0.0-beta.1.1";

     

       21
       21
        
       

     

       22
       22
        
         # nixpkgs-update: no auto update

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "pop-os";

     

       25
       25
        
           repo = "xdg-desktop-portal-cosmic";

     

       26
       26
        
           tag = "epoch-${finalAttrs.version}";

     

       27
       27
       -
           hash = "sha256-7yfrjKHuYOWPMMkHdGZ+g0hynh2TtSf4h8zW13tTus4=";

     

       27
       27
       +
           hash = "sha256-EkhOa1Tircgyta98Zf4ZaV/tR4zZh4/bU35xjn3xU8c=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       -
         env = {

     

       31
       31
       -
           VERGEN_GIT_COMMIT_DATE = "2025-04-08";

     

       32
       32
       -
           VERGEN_GIT_SHA = finalAttrs.src.tag;

     

       33
       33
       -
         };

     

       34
       34
       -
       

     

       35
       35
       -
         cargoHash = "sha256-fOaLeWtrjgBDSShC5OmBZKODNQn4bp/+iPZX5ZMQFqk=";

     

       30
       30
       +
         cargoHash = "sha256-uJKwwESkzqweM4JunnMIsDE8xhCyjFFZs1GiJAwnbG8=";

     

       36
       31
        
       

     

       37
       32
        
         separateDebugInfo = true;

     

       38
       33