commit a3ad9e6f6b4875e1775d27c88da4e420407c9418 · pyrox.dev/nixpkgs

maintainers/maintainer-list.nix

···

       13893
        
           github = "wamserma";

     

       13894
        
           githubId = 60148;

     

       13895
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13896
        
         waynr = {

     

       13897
        
           name = "Wayne Warren";

     

       13898
        
           email = "wayne.warren.s@gmail.com";

···

       13893
        
           github = "wamserma";

     

       13894
        
           githubId = 60148;

     

       13895
        
         };

     

       13896
       +
         water-sucks = {

     

       13897
       +
           email = "varun@cvte.org";

     

       13898
       +
           name = "Varun Narravula";

     

       13899
       +
           github = "water-sucks";

     

       13900
       +
           githubId = 68445574;

     

       13901
       +
         };

     

       13902
        
         waynr = {

     

       13903
        
           name = "Wayne Warren";

     

       13904
        
           email = "wayne.warren.s@gmail.com";

+3 -1

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···

       125
        
             </listitem>

     

       126
        
             <listitem>

     

       127
        
               <para>

     

       128
       -
                 Cinnamon has been updated to 5.4.

     

       0
        
       
     

       0
        
       
     

       129
        
               </para>

     

       130
        
             </listitem>

     

       131
        
             <listitem>

···

       125
        
             </listitem>

     

       126
        
             <listitem>

     

       127
        
               <para>

     

       128
       +
                 Cinnamon has been updated to 5.4. While at it, the cinnamon

     

       129
       +
                 module now defaults to blueman as bluetooth manager and

     

       130
       +
                 slick-greeter as lightdm greeter to match upstream.

     

       131
        
               </para>

     

       132
        
             </listitem>

     

       133
        
             <listitem>

+2 -1

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

···

       50
        
       

     

       51
        
       - PHP now defaults to PHP 8.1, updated from 8.0.

     

       52
        
       

     

       53
       -
       - Cinnamon has been updated to 5.4.

     

       0
        
       
     

       54
        
       

     

       55
        
       - OpenSSL now defaults to OpenSSL 3, updated from 1.1.1.

     

       56

···

       50
        
       

     

       51
        
       - PHP now defaults to PHP 8.1, updated from 8.0.

     

       52
        
       

     

       53
       +
       - Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to

     

       54
       +
         blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream.

     

       55
        
       

     

       56
        
       - OpenSSL now defaults to OpenSSL 3, updated from 1.1.1.

     

       57

+9 -4

nixos/modules/services/x11/desktop-managers/cinnamon.nix

···

       58
        
         };

     

       59
        
       

     

       60
        
         config = mkMerge [

     

       61
       -
           (mkIf (cfg.enable && config.services.xserver.displayManager.lightdm.enable && config.services.xserver.displayManager.lightdm.greeters.gtk.enable) {

     

       62
       -
             services.xserver.displayManager.lightdm.greeters.gtk.extraConfig = mkDefault (builtins.readFile "${pkgs.cinnamon.mint-artwork}/etc/lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf");

     

       63
       -
             })

     

       64
       -
       

     

       65
        
           (mkIf cfg.enable {

     

       66
        
             services.xserver.displayManager.sessionPackages = [ pkgs.cinnamon.cinnamon-common ];

     

       67
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       68
        
             services.xserver.displayManager.sessionCommands = ''

     

       69
        
               if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then

     

       70
        
                   true

···

       58
        
         };

     

       59
        
       

     

       60
        
         config = mkMerge [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       61
        
           (mkIf cfg.enable {

     

       62
        
             services.xserver.displayManager.sessionPackages = [ pkgs.cinnamon.cinnamon-common ];

     

       63
        
       

     

       64
       +
             services.xserver.displayManager.lightdm.greeters.slick = {

     

       65
       +
               enable = mkDefault true;

     

       66
       +
       

     

       67
       +
               # Taken from mint-artwork.gschema.override

     

       68
       +
               theme.name = mkDefault "Mint-X";

     

       69
       +
               theme.package = mkDefault pkgs.cinnamon.mint-themes;

     

       70
       +
               iconTheme.name = mkDefault "Mint-X-Dark";

     

       71
       +
               iconTheme.package = mkDefault pkgs.cinnamon.mint-x-icons;

     

       72
       +
             };

     

       73
        
             services.xserver.displayManager.sessionCommands = ''

     

       74
        
               if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then

     

       75
        
                   true

+124

nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix

···

       1
       +
       { config, lib, pkgs, ... }:

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       

     

       5
       +
       let

     

       6
       +
         ldmcfg = config.services.xserver.displayManager.lightdm;

     

       7
       +
         cfg = ldmcfg.greeters.slick;

     

       8
       +
       

     

       9
       +
         inherit (pkgs) writeText;

     

       10
       +
       

     

       11
       +
         theme = cfg.theme.package;

     

       12
       +
         icons = cfg.iconTheme.package;

     

       13
       +
         font = cfg.font.package;

     

       14
       +
       

     

       15
       +
         slickGreeterConf = writeText "slick-greeter.conf" ''

     

       16
       +
           [Greeter]

     

       17
       +
           background=${ldmcfg.background}

     

       18
       +
           theme-name=${cfg.theme.name}

     

       19
       +
           icon-theme-name=${cfg.iconTheme.name}

     

       20
       +
           font-name=${cfg.font.name}

     

       21
       +
           draw-user-backgrounds=${boolToString cfg.draw-user-backgrounds}

     

       22
       +
           ${cfg.extraConfig}

     

       23
       +
         '';

     

       24
       +
       in

     

       25
       +
       {

     

       26
       +
         options = {

     

       27
       +
           services.xserver.displayManager.lightdm.greeters.slick = {

     

       28
       +
             enable = mkOption {

     

       29
       +
               type = types.bool;

     

       30
       +
               default = true;

     

       31
       +
               description = lib.mdDoc ''

     

       32
       +
                 Whether to enable lightdm-slick-greeter as the lightdm greeter.

     

       33
       +
               '';

     

       34
       +
             };

     

       35
       +
       

     

       36
       +
             theme = {

     

       37
       +
               package = mkOption {

     

       38
       +
                 type = types.package;

     

       39
       +
                 default = pkgs.gnome.gnome-themes-extra;

     

       40
       +
                 defaultText = literalExpression "pkgs.gnome.gnome-themes-extra";

     

       41
       +
                 description = lib.mdDoc ''

     

       42
       +
                   The package path that contains the theme given in the name option.

     

       43
       +
                 '';

     

       44
       +
               };

     

       45
       +
       

     

       46
       +
               name = mkOption {

     

       47
       +
                 type = types.str;

     

       48
       +
                 default = "Adwaita";

     

       49
       +
                 description = lib.mdDoc ''

     

       50
       +
                   Name of the theme to use for the lightdm-slick-greeter.

     

       51
       +
                 '';

     

       52
       +
               };

     

       53
       +
             };

     

       54
       +
       

     

       55
       +
             iconTheme = {

     

       56
       +
               package = mkOption {

     

       57
       +
                 type = types.package;

     

       58
       +
                 default = pkgs.gnome.adwaita-icon-theme;

     

       59
       +
                 defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme";

     

       60
       +
                 description = lib.mdDoc ''

     

       61
       +
                   The package path that contains the icon theme given in the name option.

     

       62
       +
                 '';

     

       63
       +
               };

     

       64
       +
       

     

       65
       +
               name = mkOption {

     

       66
       +
                 type = types.str;

     

       67
       +
                 default = "Adwaita";

     

       68
       +
                 description = lib.mdDoc ''

     

       69
       +
                   Name of the icon theme to use for the lightdm-slick-greeter.

     

       70
       +
                 '';

     

       71
       +
               };

     

       72
       +
             };

     

       73
       +
       

     

       74
       +
             font = {

     

       75
       +
               package = mkOption {

     

       76
       +
                 type = types.package;

     

       77
       +
                 default = pkgs.ubuntu_font_family;

     

       78
       +
                 defaultText = literalExpression "pkgs.ubuntu_font_family";

     

       79
       +
                 description = lib.mdDoc ''

     

       80
       +
                   The package path that contains the font given in the name option.

     

       81
       +
                 '';

     

       82
       +
               };

     

       83
       +
       

     

       84
       +
               name = mkOption {

     

       85
       +
                 type = types.str;

     

       86
       +
                 default = "Ubuntu 11";

     

       87
       +
                 description = lib.mdDoc ''

     

       88
       +
                   Name of the font to use.

     

       89
       +
                 '';

     

       90
       +
               };

     

       91
       +
             };

     

       92
       +
       

     

       93
       +
             draw-user-backgrounds = mkEnableOption "draw user backgrounds";

     

       94
       +
       

     

       95
       +
             extraConfig = mkOption {

     

       96
       +
               type = types.lines;

     

       97
       +
               default = "";

     

       98
       +
               description = lib.mdDoc ''

     

       99
       +
                 Extra configuration that should be put in the lightdm-slick-greeter.conf

     

       100
       +
                 configuration file.

     

       101
       +
               '';

     

       102
       +
             };

     

       103
       +
           };

     

       104
       +
         };

     

       105
       +
       

     

       106
       +
         config = mkIf (ldmcfg.enable && cfg.enable) {

     

       107
       +
           services.xserver.displayManager.lightdm = {

     

       108
       +
             greeters.gtk.enable = false;

     

       109
       +
             greeter = mkDefault {

     

       110
       +
               package = pkgs.lightdm-slick-greeter.xgreeters;

     

       111
       +
               name = "lightdm-slick-greeter";

     

       112
       +
             };

     

       113
       +
           };

     

       114
       +
       

     

       115
       +
           environment.systemPackages = [

     

       116
       +
             icons

     

       117
       +
             theme

     

       118
       +
           ];

     

       119
       +
       

     

       120
       +
           fonts.fonts = [ font ];

     

       121
       +
       

     

       122
       +
           environment.etc."lightdm/slick-greeter.conf".source = slickGreeterConf;

     

       123
       +
         };

     

       124
       +
       }

nixos/modules/services/x11/display-managers/lightdm.nix

···

       82
        
           ./lightdm-greeters/enso-os.nix

     

       83
        
           ./lightdm-greeters/pantheon.nix

     

       84
        
           ./lightdm-greeters/tiny.nix

     

       0
        
       
     

       85
        
           (mkRenamedOptionModule [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "enable" ] [

     

       86
        
             "services"

     

       87
        
             "xserver"

···

       82
        
           ./lightdm-greeters/enso-os.nix

     

       83
        
           ./lightdm-greeters/pantheon.nix

     

       84
        
           ./lightdm-greeters/tiny.nix

     

       85
       +
           ./lightdm-greeters/slick.nix

     

       86
        
           (mkRenamedOptionModule [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "enable" ] [

     

       87
        
             "services"

     

       88
        
             "xserver"

+110

pkgs/applications/display-managers/lightdm-slick-greeter/default.nix

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , pkg-config

     

       5
       +
       , python3

     

       6
       +
       , vala

     

       7
       +
       , intltool

     

       8
       +
       , autoreconfHook

     

       9
       +
       , wrapGAppsHook

     

       10
       +
       , lightdm

     

       11
       +
       , gtk3

     

       12
       +
       , pixman

     

       13
       +
       , libcanberra

     

       14
       +
       , libX11

     

       15
       +
       , libXext

     

       16
       +
       , linkFarm

     

       17
       +
       , lightdm-slick-greeter

     

       18
       +
       , numlockx

     

       19
       +
       }:

     

       20
       +
       

     

       21
       +
       stdenv.mkDerivation rec {

     

       22
       +
         pname = "lightdm-slick-greeter";

     

       23
       +
         version = "1.5.9";

     

       24
       +
       

     

       25
       +
         src = fetchFromGitHub {

     

       26
       +
           owner = "linuxmint";

     

       27
       +
           repo = "slick-greeter";

     

       28
       +
           rev = version;

     

       29
       +
           sha256 = "sha256-UEzidH4ZWggcOWHHuAclHbbgATDBdogL99Ze0PlwRoc=";

     

       30
       +
         };

     

       31
       +
       

     

       32
       +
         nativeBuildInputs = [

     

       33
       +
           pkg-config

     

       34
       +
           vala

     

       35
       +
           intltool

     

       36
       +
           autoreconfHook

     

       37
       +
           wrapGAppsHook

     

       38
       +
           python3

     

       39
       +
           python3.pkgs.wrapPython

     

       40
       +
         ];

     

       41
       +
       

     

       42
       +
         buildInputs = [

     

       43
       +
           lightdm

     

       44
       +
           gtk3

     

       45
       +
           pixman

     

       46
       +
           libcanberra

     

       47
       +
           libX11

     

       48
       +
           libXext

     

       49
       +
         ];

     

       50
       +
       

     

       51
       +
         pythonPath = [

     

       52
       +
           python3.pkgs.pygobject3 # for slick-greeter-check-hidpi

     

       53
       +
         ];

     

       54
       +
       

     

       55
       +
         postPatch = ''

     

       56
       +
           substituteInPlace src/slick-greeter.vala \

     

       57
       +
             --replace "/usr/bin/numlockx" "${numlockx}/bin/numlockx" \

     

       58
       +
             --replace "/usr/share/xsessions/" "/run/current-system/sw/share/xsessions/" \

     

       59
       +
             --replace "/usr/bin/slick-greeter" "${placeholder "out"}/bin/slick-greeter"

     

       60
       +
       

     

       61
       +
           substituteInPlace src/session-list.vala \

     

       62
       +
             --replace "/usr/share" "${placeholder "out"}/share"

     

       63
       +
       

     

       64
       +
           patchShebangs files/usr/bin/*

     

       65
       +
         '';

     

       66
       +
       

     

       67
       +
         preAutoreconf = ''

     

       68
       +
           # intltoolize fails during autoreconfPhase unless this

     

       69
       +
           # directory is created manually.

     

       70
       +
           mkdir m4

     

       71
       +
         '';

     

       72
       +
       

     

       73
       +
         configureFlags = [

     

       74
       +
           "--localstatedir=/var"

     

       75
       +
           "--sysconfdir=/etc"

     

       76
       +
           "--sbindir=${placeholder "out"}/bin"

     

       77
       +
         ];

     

       78
       +
       

     

       79
       +
         installFlags = [

     

       80
       +
           "localstatedir=\${TMPDIR}"

     

       81
       +
           "sysconfdir=${placeholder "out"}/etc"

     

       82
       +
         ];

     

       83
       +
       

     

       84
       +
         postInstall = ''

     

       85
       +
           substituteInPlace "$out/share/xgreeters/slick-greeter.desktop" \

     

       86
       +
             --replace "Exec=slick-greeter" "Exec=$out/bin/slick-greeter"

     

       87
       +
       

     

       88
       +
           cp -r files/usr/* $out

     

       89
       +
         '';

     

       90
       +
       

     

       91
       +
         preFixup = ''

     

       92
       +
           buildPythonPath "$out $pythonPath"

     

       93
       +
           gappsWrapperArgs+=(

     

       94
       +
             --prefix PYTHONPATH : "$program_PYTHONPATH"

     

       95
       +
           )

     

       96
       +
         '';

     

       97
       +
       

     

       98
       +
         passthru.xgreeters = linkFarm "lightdm-slick-greeter-xgreeters" [{

     

       99
       +
           path = "${lightdm-slick-greeter}/share/xgreeters/slick-greeter.desktop";

     

       100
       +
           name = "lightdm-slick-greeter.desktop";

     

       101
       +
         }];

     

       102
       +
       

     

       103
       +
         meta = with lib; {

     

       104
       +
           description = "A slick-looking LightDM greeter";

     

       105
       +
           homepage = "https://github.com/linuxmint/slick-greeter";

     

       106
       +
           license = licenses.gpl3Only;

     

       107
       +
           maintainers = with maintainers; [ water-sucks ];

     

       108
       +
           platforms = platforms.linux;

     

       109
       +
         };

     

       110
       +
       }

+3 -3

pkgs/applications/misc/variety/default.nix

···

       17
        
       

     

       18
        
       python3.pkgs.buildPythonApplication rec {

     

       19
        
         pname = "variety";

     

       20
       -
         version = "0.8.7";

     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "varietywalls";

     

       24
        
           repo = "variety";

     

       25
       -
           rev = version;

     

       26
       -
           hash = "sha256-OFQiZe8G5v4F8HUJPeEM3ggVWHaALT1txy/aymHZ+jc=";

     

       27
        
         };

     

       28
        
       

     

       29
        
         nativeBuildInputs = [

···

       17
        
       

     

       18
        
       python3.pkgs.buildPythonApplication rec {

     

       19
        
         pname = "variety";

     

       20
       +
         version = "0.8.9";

     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "varietywalls";

     

       24
        
           repo = "variety";

     

       25
       +
           rev = "refs/tags/${version}";

     

       26
       +
           hash = "sha256-Tm8RXn2S/NDUD3JWeCHKqSFkxZPJdNMojPGnU4WEpr0=";

     

       27
        
         };

     

       28
        
       

     

       29
        
         nativeBuildInputs = [

+39 -13

pkgs/applications/networking/browsers/dillo/default.nix

···

       1
       -
       { lib, stdenv, fetchurl

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       , fltk

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       , openssl

     

       4
       -
       , libjpeg, libpng

     

       5
        
       , perl

     

       6
       -
       , libXcursor, libXi, libXinerama }:

     

       0
        
       
     

       0
        
       
     

       7
        
       

     

       8
       -
       stdenv.mkDerivation rec {

     

       9
       -
         version = "3.0.5";

     

       10
        
         pname = "dillo";

     

       0
        
       
     

       11
        
       

     

       12
       -
         src = fetchurl {

     

       13
       -
           url = "https://www.dillo.org/download/${pname}-${version}.tar.bz2";

     

       14
       -
           sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv";

     

       0
        
       
     

       15
        
         };

     

       16
        
       

     

       17
       -
         buildInputs = with lib;

     

       18
       -
         [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       

     

       20
        
         # Workaround build failure on -fno-common toolchains:

     

       21
        
         #   ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set';

     

       22
        
         #     dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here

     

       23
        
         NIX_CFLAGS_COMPILE = "-fcommon";

     

       24
        
       

     

       25
       -
         configureFlags = [ "--enable-ssl" ];

     

       26
        
       

     

       27
        
         meta = with lib; {

     

       28
       -
           homepage = "https://www.dillo.org/";

     

       29
        
           description = "A fast graphical web browser with a small footprint";

     

       30
        
           longDescription = ''

     

       31
        
             Dillo is a small, fast web browser, tailored for older machines.

     

       32
        
           '';

     

       33
        
           maintainers = [ maintainers.AndersonTorres ];

     

       34
        
           platforms = platforms.linux;

     

       35
       -
           license = licenses.gpl3;

     

       36
        
         };

     

       37
        
       }

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchhg

     

       4
       +
       , autoreconfHook

     

       5
        
       , fltk

     

       6
       +
       , libXcursor

     

       7
       +
       , libXi

     

       8
       +
       , libXinerama

     

       9
       +
       , libjpeg

     

       10
       +
       , libpng

     

       11
       +
       , mbedtls

     

       12
        
       , openssl

     

       0
        
       
     

       13
        
       , perl

     

       14
       +
       , pkg-config

     

       15
       +
       , which

     

       16
       +
       }:

     

       17
        
       

     

       18
       +
       stdenv.mkDerivation {

     

       0
        
       
     

       19
        
         pname = "dillo";

     

       20
       +
         version = "unstable-2021-02-09";

     

       21
        
       

     

       22
       +
         src = fetchhg {

     

       23
       +
           url = "https://hg.sr.ht/~seirdy/dillo-mirror";

     

       24
       +
           rev = "67b70f024568b505633524be61fcfbde5337849f";

     

       25
       +
           sha256 = "sha256-lbn5u9oEL0zt9yBhznBS9Dz9/6kSwRDJeNXKEojty1g=";

     

       26
        
         };

     

       27
        
       

     

       28
       +
         nativeBuildInputs = [

     

       29
       +
           autoreconfHook

     

       30
       +
           pkg-config

     

       31
       +
           which

     

       32
       +
         ];

     

       33
       +
       

     

       34
       +
         buildInputs = [

     

       35
       +
           fltk

     

       36
       +
           libXcursor

     

       37
       +
           libXi

     

       38
       +
           libXinerama

     

       39
       +
           libjpeg

     

       40
       +
           libpng

     

       41
       +
           mbedtls

     

       42
       +
           openssl

     

       43
       +
           perl

     

       44
       +
         ];

     

       45
        
       

     

       46
        
         # Workaround build failure on -fno-common toolchains:

     

       47
        
         #   ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set';

     

       48
        
         #     dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here

     

       49
        
         NIX_CFLAGS_COMPILE = "-fcommon";

     

       50
        
       

     

       51
       +
         configureFlags = [ "--enable-ssl=yes" ];

     

       52
        
       

     

       53
        
         meta = with lib; {

     

       54
       +
           homepage = "https://hg.sr.ht/~seirdy/dillo-mirror";

     

       55
        
           description = "A fast graphical web browser with a small footprint";

     

       56
        
           longDescription = ''

     

       57
        
             Dillo is a small, fast web browser, tailored for older machines.

     

       58
        
           '';

     

       59
        
           maintainers = [ maintainers.AndersonTorres ];

     

       60
        
           platforms = platforms.linux;

     

       61
       +
           license = licenses.gpl3Plus;

     

       62
        
         };

     

       63
        
       }

+2 -2

pkgs/applications/networking/cluster/werf/default.nix

···

       11
        
       

     

       12
        
       buildGoModule rec {

     

       13
        
         pname = "werf";

     

       14
       -
         version = "1.2.160";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "werf";

     

       18
        
           repo = "werf";

     

       19
        
           rev = "v${version}";

     

       20
       -
           sha256 = "sha256-UeZpH6A/N+frShOOVeRCsIXdBKiI0chsxQvsGJF5JwE=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         vendorSha256 = "sha256-XpSAFiweD2oUKleD6ztDp1+3PpfUWXfGaaE/9mzRrUQ=";

···

       11
        
       

     

       12
        
       buildGoModule rec {

     

       13
        
         pname = "werf";

     

       14
       +
         version = "1.2.163";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "werf";

     

       18
        
           repo = "werf";

     

       19
        
           rev = "v${version}";

     

       20
       +
           sha256 = "sha256-TgXJ5l/vWHIlAEMmPWM50AOMHU9crsmjtxJdmGzPM+w=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         vendorSha256 = "sha256-XpSAFiweD2oUKleD6ztDp1+3PpfUWXfGaaE/9mzRrUQ=";

+3 -3

pkgs/data/misc/v2ray-geoip/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "v2ray-geoip";

     

       5
       -
         version = "202208040058";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "v2fly";

     

       9
        
           repo = "geoip";

     

       10
       -
           rev = "97174fe0eeb28838b0e5e805687d230df773e661";

     

       11
       -
           sha256 = "sha256-hodJ4HQHbv9voSS847pAHd3YSmfkV7fKyJhEUApVN+w=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         installPhase = ''

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "v2ray-geoip";

     

       5
       +
         version = "202208180100";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "v2fly";

     

       9
        
           repo = "geoip";

     

       10
       +
           rev = "005c33be4dd95339596ddd5ce792e8f97dd168a3";

     

       11
       +
           sha256 = "sha256-KvEmgtbelZOauE2WBTzJkwJkaUVW2x8ezgmTE+Gbwu8=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         installPhase = ''

-1

pkgs/desktops/cinnamon/mint-artwork/default.nix

···

       28
        
             -e s,DMZ-White,Vanilla-DMZ,g \

     

       29
        
             -e s,DMZ-Black,Vanilla-DMZ-AA,g \

     

       30
        
             -e s,linuxmint-logo-5,cinnamon-symbolic,g \

     

       31
       -
             -e s,^theme-name=Mint-X$,theme-name=Mint-X-Dark,g \

     

       32
        
             {} +

     

       33
        
       

     

       34
        
           # fixup broken symlink

···

       28
        
             -e s,DMZ-White,Vanilla-DMZ,g \

     

       29
        
             -e s,DMZ-Black,Vanilla-DMZ-AA,g \

     

       30
        
             -e s,linuxmint-logo-5,cinnamon-symbolic,g \

     

       0
        
       
     

       31
        
             {} +

     

       32
        
       

     

       33
        
           # fixup broken symlink

pkgs/top-level/all-packages.nix

···

       30714
        
           inherit (xfce) xfce4-dev-tools;

     

       30715
        
         };

     

       30716
        
       

     

       0
        
       
     

       0
        
       
     

       30717
        
         lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { };

     

       30718
        
       

     

       30719
        
         lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter {

···

       30714
        
           inherit (xfce) xfce4-dev-tools;

     

       30715
        
         };

     

       30716
        
       

     

       30717
       +
         lightdm-slick-greeter = callPackage ../applications/display-managers/lightdm-slick-greeter { };

     

       30718
       +
       

     

       30719
        
         lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { };

     

       30720
        
       

     

       30721
        
         lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter {