commit 632c65fbd4d97784af6b14b1155b774608b32eab · pyrox.dev/nixpkgs

+2 -2

lib/systems/platforms.nix

···

       481
        
         riscv-multiplatform = {

     

       482
        
           linux-kernel = {

     

       483
        
             name = "riscv-multiplatform";

     

       484
       -
             target = "vmlinux";

     

       485
        
             autoModules = true;

     

       486
        
             baseConfig = "defconfig";

     

       0
        
       
     

       487
        
             extraConfig = ''

     

       488
       -
               FTRACE n

     

       489
        
               SERIAL_OF_PLATFORM y

     

       490
        
             '';

     

       491
        
           };

···

       481
        
         riscv-multiplatform = {

     

       482
        
           linux-kernel = {

     

       483
        
             name = "riscv-multiplatform";

     

       484
       +
             target = "Image";

     

       485
        
             autoModules = true;

     

       486
        
             baseConfig = "defconfig";

     

       487
       +
             DTB = true;

     

       488
        
             extraConfig = ''

     

       0
        
       
     

       489
        
               SERIAL_OF_PLATFORM y

     

       490
        
             '';

     

       491
        
           };

+21 -1

nixos/modules/virtualisation/containers.nix

···

       48
        
             description = "containers.conf configuration";

     

       49
        
           };

     

       50
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       51
        
           registries = {

     

       52
        
             search = mkOption {

     

       53
        
               type = types.listOf types.str;

     
···

       97
        
         };

     

       98
        
       

     

       99
        
         config = lib.mkIf cfg.enable {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       100
        
           virtualisation.containers.containersConf.settings = {

     

       101
       -
             network.cni_plugin_dirs = [ "${pkgs.cni-plugins}/bin/" ];

     

       102
        
             engine = {

     

       103
        
               init_path = "${pkgs.catatonit}/bin/catatonit";

     

       104
        
             } // lib.optionalAttrs cfg.ociSeccompBpfHook.enable {

···

       48
        
             description = "containers.conf configuration";

     

       49
        
           };

     

       50
        
       

     

       51
       +
           containersConf.cniPlugins = mkOption {

     

       52
       +
             type = types.listOf types.package;

     

       53
       +
             defaultText = ''

     

       54
       +
               [

     

       55
       +
                 pkgs.cni-plugins

     

       56
       +
               ]

     

       57
       +
             '';

     

       58
       +
             example = lib.literalExample ''

     

       59
       +
               [

     

       60
       +
                 pkgs.cniPlugins.dnsname

     

       61
       +
               ]

     

       62
       +
             '';

     

       63
       +
             description = ''

     

       64
       +
               CNI plugins to install on the system.

     

       65
       +
             '';

     

       66
       +
           };

     

       67
       +
       

     

       68
        
           registries = {

     

       69
        
             search = mkOption {

     

       70
        
               type = types.listOf types.str;

     
···

       114
        
         };

     

       115
        
       

     

       116
        
         config = lib.mkIf cfg.enable {

     

       117
       +
       

     

       118
       +
           virtualisation.containers.containersConf.cniPlugins = [ pkgs.cni-plugins ];

     

       119
       +
       

     

       120
        
           virtualisation.containers.containersConf.settings = {

     

       121
       +
             network.cni_plugin_dirs = map (p: "${lib.getBin p}/bin") cfg.containersConf.cniPlugins;

     

       122
        
             engine = {

     

       123
        
               init_path = "${pkgs.catatonit}/bin/catatonit";

     

       124
        
             } // lib.optionalAttrs cfg.ociSeccompBpfHook.enable {

+36

nixos/modules/virtualisation/podman-dnsname.nix

···

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

     

       2
       +
       let

     

       3
       +
         inherit (lib)

     

       4
       +
           mkOption

     

       5
       +
           mkIf

     

       6
       +
           types

     

       7
       +
           ;

     

       8
       +
       

     

       9
       +
         cfg = config.virtualisation.podman;

     

       10
       +
       

     

       11
       +
       in

     

       12
       +
       {

     

       13
       +
         options = {

     

       14
       +
           virtualisation.podman = {

     

       15
       +
       

     

       16
       +
             defaultNetwork.dnsname.enable = mkOption {

     

       17
       +
               type = types.bool;

     

       18
       +
               default = false;

     

       19
       +
               description = ''

     

       20
       +
                 Enable DNS resolution in the default podman network.

     

       21
       +
               '';

     

       22
       +
             };

     

       23
       +
       

     

       24
       +
           };

     

       25
       +
         };

     

       26
       +
       

     

       27
       +
         config = {

     

       28
       +
           virtualisation.containers.containersConf.cniPlugins = mkIf cfg.defaultNetwork.dnsname.enable [ pkgs.dnsname-cni ];

     

       29
       +
           virtualisation.podman.defaultNetwork.extraPlugins =

     

       30
       +
             lib.optional cfg.defaultNetwork.dnsname.enable {

     

       31
       +
               type = "dnsname";

     

       32
       +
               domainName = "dns.podman";

     

       33
       +
               capabilities.aliases = true;

     

       34
       +
             };

     

       35
       +
         };

     

       36
       +
       }

+23 -1

nixos/modules/virtualisation/podman.nix

···

       2
        
       let

     

       3
        
         cfg = config.virtualisation.podman;

     

       4
        
         toml = pkgs.formats.toml { };

     

       0
        
       
     

       5
        
       

     

       6
        
         inherit (lib) mkOption types;

     

       7
        
       

     
···

       22
        
           done

     

       23
        
         '';

     

       24
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
       in

     

       26
        
       {

     

       27
        
         imports = [

     

       0
        
       
     

       28
        
           ./podman-network-socket.nix

     

       29
        
           (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ])

     

       30
        
         ];

     
···

       99
        
             '';

     

       100
        
           };

     

       101
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       102
        
       

     

       103
        
         };

     

       104
        
       

     
···

       107
        
             environment.systemPackages = [ cfg.package ]

     

       108
        
               ++ lib.optional cfg.dockerCompat dockerCompat;

     

       109
        
       

     

       110
       -
             environment.etc."cni/net.d/87-podman-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist";

     

       111
        
       

     

       112
        
             virtualisation.containers = {

     

       113
        
               enable = true; # Enable common /etc/containers configuration

···

       2
        
       let

     

       3
        
         cfg = config.virtualisation.podman;

     

       4
        
         toml = pkgs.formats.toml { };

     

       5
       +
         json = pkgs.formats.json { };

     

       6
        
       

     

       7
        
         inherit (lib) mkOption types;

     

       8
        
       

     
···

       23
        
           done

     

       24
        
         '';

     

       25
        
       

     

       26
       +
         net-conflist = pkgs.runCommand "87-podman-bridge.conflist" {

     

       27
       +
           nativeBuildInputs = [ pkgs.jq ];

     

       28
       +
           extraPlugins = builtins.toJSON cfg.defaultNetwork.extraPlugins;

     

       29
       +
           jqScript = ''

     

       30
       +
             . + { "plugins": (.plugins + $extraPlugins) }

     

       31
       +
           '';

     

       32
       +
         } ''

     

       33
       +
           jq <${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist \

     

       34
       +
             --argjson extraPlugins "$extraPlugins" \

     

       35
       +
             "$jqScript" \

     

       36
       +
             >$out

     

       37
       +
         '';

     

       38
       +
       

     

       39
        
       in

     

       40
        
       {

     

       41
        
         imports = [

     

       42
       +
           ./podman-dnsname.nix

     

       43
        
           ./podman-network-socket.nix

     

       44
        
           (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ])

     

       45
        
         ];

     
···

       114
        
             '';

     

       115
        
           };

     

       116
        
       

     

       117
       +
           defaultNetwork.extraPlugins = lib.mkOption {

     

       118
       +
             type = types.listOf json.type;

     

       119
       +
             default = [];

     

       120
       +
             description = ''

     

       121
       +
               Extra CNI plugin configurations to add to podman's default network.

     

       122
       +
             '';

     

       123
       +
           };

     

       124
        
       

     

       125
        
         };

     

       126
        
       

     
···

       129
        
             environment.systemPackages = [ cfg.package ]

     

       130
        
               ++ lib.optional cfg.dockerCompat dockerCompat;

     

       131
        
       

     

       132
       +
             environment.etc."cni/net.d/87-podman-bridge.conflist".source = net-conflist;

     

       133
        
       

     

       134
        
             virtualisation.containers = {

     

       135
        
               enable = true; # Enable common /etc/containers configuration

nixos/tests/all-tests.nix

···

       336
        
         plotinus = handleTest ./plotinus.nix {};

     

       337
        
         podgrab = handleTest ./podgrab.nix {};

     

       338
        
         podman = handleTestOn ["x86_64-linux"] ./podman.nix {};

     

       0
        
       
     

       339
        
         podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {};

     

       340
        
         pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};

     

       341
        
         postfix = handleTest ./postfix.nix {};

···

       336
        
         plotinus = handleTest ./plotinus.nix {};

     

       337
        
         podgrab = handleTest ./podgrab.nix {};

     

       338
        
         podman = handleTestOn ["x86_64-linux"] ./podman.nix {};

     

       339
       +
         podman-dnsname = handleTestOn ["x86_64-linux"] ./podman-dnsname.nix {};

     

       340
        
         podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {};

     

       341
        
         pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};

     

       342
        
         postfix = handleTest ./postfix.nix {};

+42

nixos/tests/podman-dnsname.nix

···

       1
       +
       import ./make-test-python.nix (

     

       2
       +
         { pkgs, lib, ... }:

     

       3
       +
         let

     

       4
       +
           inherit (pkgs) writeTextDir python3 curl;

     

       5
       +
           webroot = writeTextDir "index.html" "<h1>Hi</h1>";

     

       6
       +
         in

     

       7
       +
         {

     

       8
       +
           name = "podman-dnsname";

     

       9
       +
           meta = {

     

       10
       +
             maintainers = with lib.maintainers; [ roberth ] ++ lib.teams.podman.members;

     

       11
       +
           };

     

       12
       +
       

     

       13
       +
           nodes = {

     

       14
       +
             podman = { pkgs, ... }: {

     

       15
       +
               virtualisation.podman.enable = true;

     

       16
       +
               virtualisation.podman.defaultNetwork.dnsname.enable = true;

     

       17
       +
             };

     

       18
       +
           };

     

       19
       +
       

     

       20
       +
           testScript = ''

     

       21
       +
             podman.wait_for_unit("sockets.target")

     

       22
       +
       

     

       23
       +
             with subtest("DNS works"): # also tests inter-container tcp routing

     

       24
       +
               podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")

     

       25
       +
               podman.succeed(

     

       26
       +
                 "podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${webroot} scratchimg ${python3}/bin/python -m http.server 8000"

     

       27
       +
               )

     

       28
       +
               podman.succeed("podman ps | grep webserver")

     

       29
       +
               podman.succeed("""

     

       30
       +
                 for i in `seq 0 120`; do

     

       31
       +
                   podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${curl}/bin/curl http://webserver:8000 >/dev/console \

     

       32
       +
                     && exit 0

     

       33
       +
                   sleep 0.5

     

       34
       +
                 done

     

       35
       +
                 exit 1

     

       36
       +
               """)

     

       37
       +
               podman.succeed("podman stop webserver")

     

       38
       +
               podman.succeed("podman rm webserver")

     

       39
       +
       

     

       40
       +
           '';

     

       41
       +
         }

     

       42
       +
       )

+23 -12

pkgs/applications/misc/bibletime/default.nix

···

       1
        
       { lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core

     

       2
       -
       , qtbase, qttools, qtsvg, qtwebkit

     

       3
       -
       }:

     

       4
        
       

     

       5
        
       mkDerivation rec {

     

       6
        
       

     

       7
       -
         version = "2.11.2";

     

       8
        
       

     

       9
        
         pname = "bibletime";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
       -
           url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz";

     

       13
       -
           sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i";

     

       0
        
       
     

       14
        
         };

     

       15
        
       

     

       16
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       17
        
         buildInputs = [

     

       18
       -
          sword boost clucene_core

     

       19
       -
          qtbase qttools qtsvg qtwebkit

     

       20
       -
        ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
       

     

       22
       -
         preConfigure =  ''

     

       23
        
           export CLUCENE_HOME=${clucene_core};

     

       24
        
           export SWORD_HOME=${sword};

     

       25
        
         '';

     

       26
        
       

     

       27
       -
         cmakeFlags = [ "-DUSE_QT_WEBKIT=ON" "-DCMAKE_BUILD_TYPE=Debug" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
       

     

       29
        
         meta = {

     

       30
        
           description = "A Qt4 Bible study tool";

     

       31
        
           homepage = "http://www.bibletime.info/";

     

       32
        
           platforms = lib.platforms.linux;

     

       33
       -
           license = lib.licenses.gpl2;

     

       34
        
           maintainers = [ lib.maintainers.piotr ];

     

       35
        
         };

     

       36
        
       }

···

       1
        
       { lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core

     

       2
       +
       , qtbase, qttools, qtsvg, perlPackages, docbook_xml_dtd_45

     

       3
       +
       , docbook_xsl_ns }:

     

       4
        
       

     

       5
        
       mkDerivation rec {

     

       6
        
       

     

       7
       +
         version = "3.0";

     

       8
        
       

     

       9
        
         pname = "bibletime";

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
       +
           url =

     

       13
       +
             "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz";

     

       14
       +
           sha256 = "08i6nb9a7z0jpsq76q0kr62hw6ph9chqjpjcvkimbcj4mmifzgnn";

     

       15
        
         };

     

       16
        
       

     

       17
       +
         nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ];

     

       18
        
         buildInputs = [

     

       19
       +
           sword

     

       20
       +
           boost

     

       21
       +
           clucene_core

     

       22
       +
           qtbase

     

       23
       +
           qttools

     

       24
       +
           qtsvg

     

       25
       +
           perlPackages.Po4a

     

       26
       +
         ];

     

       27
        
       

     

       28
       +
         preConfigure = ''

     

       29
        
           export CLUCENE_HOME=${clucene_core};

     

       30
        
           export SWORD_HOME=${sword};

     

       31
        
         '';

     

       32
        
       

     

       33
       +
         cmakeFlags = [

     

       34
       +
           "-DBUILD_HOWTO_PDF=OFF"

     

       35
       +
           "-DBUILD_HANDBOOK_PDF=OFF"

     

       36
       +
           "-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl"

     

       37
       +
           "-DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl"

     

       38
       +
         ];

     

       39
        
       

     

       40
        
         meta = {

     

       41
        
           description = "A Qt4 Bible study tool";

     

       42
        
           homepage = "http://www.bibletime.info/";

     

       43
        
           platforms = lib.platforms.linux;

     

       44
       +
           license = lib.licenses.gpl2Plus;

     

       45
        
           maintainers = [ lib.maintainers.piotr ];

     

       46
        
         };

     

       47
        
       }

+2 -2

pkgs/applications/networking/browsers/firefox/packages.nix

···

       32
        
       

     

       33
        
         firefox-esr-78 = common rec {

     

       34
        
           pname = "firefox-esr";

     

       35
       -
           ffversion = "78.10.1esr";

     

       36
        
           src = fetchurl {

     

       37
        
             url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";

     

       38
       -
             sha512 = "a22773d9b3f0dca253805257f358a906769d23f15115e3a8851024f701e27dee45f056f7d34ebf1fcde0a3f91ec299639c2a12556e938a232cdea9e59835fde1";

     

       39
        
           };

     

       40
        
       

     

       41
        
           meta = {

···

       32
        
       

     

       33
        
         firefox-esr-78 = common rec {

     

       34
        
           pname = "firefox-esr";

     

       35
       +
           ffversion = "78.11.0esr";

     

       36
        
           src = fetchurl {

     

       37
        
             url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";

     

       38
       +
             sha512 = "d02fc2eda587155b1c54ca12a6c5cde220a29f41f154f1c9b71ae8f966d8cc9439201a5b241e03fc0795b74e2479f7aa5d6b69f70b7639432e5382f321f7a6f4";

     

       39
        
           };

     

       40
        
       

     

       41
        
           meta = {

+15 -5

pkgs/applications/networking/cluster/dnsname-cni/default.nix

···

       1
       -
       { buildGoModule, fetchFromGitHub, lib, dnsmasq }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "cni-plugin-dnsname";

     
···

       11
        
           sha256 = "sha256-hHkQOHDso92gXFCz40iQ7j2cHTEAMsaeW8MCJV2Otqo=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         patches = [ ./hardcode-dnsmasq-path.patch ];

     

       15
       -
       

     

       16
       -
         postPatch = ''

     

       17
       -
           substituteInPlace plugins/meta/dnsname/service.go --replace '@DNSMASQ@' '${dnsmasq}/bin/dnsmasq'

     

       18
        
         '';

     

       19
        
       

     

       20
        
         vendorSha256 = null;

     

       21
        
         subPackages = [ "plugins/meta/dnsname" ];

     

       22
        
       

     

       23
        
         doCheck = false; # NOTE: requires root privileges

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
       

     

       25
        
         meta = with lib; {

     

       26
        
           description = "DNS name resolution for containers";

···

       1
       +
       {

     

       2
       +
         buildGoModule,

     

       3
       +
         dnsmasq,

     

       4
       +
         fetchFromGitHub,

     

       5
       +
         lib,

     

       6
       +
         nixosTests,

     

       7
       +
         makeWrapper,

     

       8
       +
       }:

     

       9
        
       

     

       10
        
       buildGoModule rec {

     

       11
        
         pname = "cni-plugin-dnsname";

     
···

       18
        
           sha256 = "sha256-hHkQOHDso92gXFCz40iQ7j2cHTEAMsaeW8MCJV2Otqo=";

     

       19
        
         };

     

       20
        
       

     

       21
       +
         nativeBuildInputs = [ makeWrapper ];

     

       22
       +
         postInstall = ''

     

       23
       +
           wrapProgram $out/bin/dnsname --prefix PATH : ${lib.makeBinPath [ dnsmasq ]}

     

       0
        
       
     

       24
        
         '';

     

       25
        
       

     

       26
        
         vendorSha256 = null;

     

       27
        
         subPackages = [ "plugins/meta/dnsname" ];

     

       28
        
       

     

       29
        
         doCheck = false; # NOTE: requires root privileges

     

       30
       +
       

     

       31
       +
         passthru.tests = {

     

       32
       +
           inherit (nixosTests) podman-dnsname;

     

       33
       +
         };

     

       34
        
       

     

       35
        
         meta = with lib; {

     

       36
        
           description = "DNS name resolution for containers";

-19

pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch

···

       1
       -
       diff --git a/plugins/meta/dnsname/service.go b/plugins/meta/dnsname/service.go

     

       2
       -
       index fc05f75..f6b4caf 100644

     

       3
       -
       --- a/plugins/meta/dnsname/service.go

     

       4
       -
       +++ b/plugins/meta/dnsname/service.go

     

       5
       -
       @@ -16,10 +16,14 @@ import (

     

       6
       -
        

     

       7
       -
        // newDNSMasqFile creates a new instance of a dnsNameFile

     

       8
       -
        func newDNSMasqFile(domainName, networkInterface, networkName string) (dnsNameFile, error) {

     

       9
       -
       +	/*

     

       10
       -
        	dnsMasqBinary, err := exec.LookPath("dnsmasq")

     

       11
       -
        	if err != nil {

     

       12
       -
        		return dnsNameFile{}, errors.Errorf("the dnsmasq cni plugin requires the dnsmasq binary be in PATH")

     

       13
       -
        	}

     

       14
       -
       +	*/

     

       15
       -
       +	_ = errors.Errorf // XXX(mikroskeem): reduce diff

     

       16
       -
       +	dnsMasqBinary := "@DNSMASQ@"

     

       17
       -
        	masqConf := dnsNameFile{

     

       18
       -
        		ConfigFile:       makePath(networkName, confFileName),

     

       19
       -
        		Domain:           domainName,

+4 -1

pkgs/applications/virtualization/podman/default.nix

···

       84
        
         passthru.tests = {

     

       85
        
           inherit (nixosTests) podman;

     

       86
        
           # related modules

     

       87
       -
           inherit (nixosTests) podman-tls-ghostunnel;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       88
        
         };

     

       89
        
       

     

       90
        
         meta = with lib; {

···

       84
        
         passthru.tests = {

     

       85
        
           inherit (nixosTests) podman;

     

       86
        
           # related modules

     

       87
       +
           inherit (nixosTests)

     

       88
       +
             podman-tls-ghostunnel

     

       89
       +
             podman-dnsname

     

       90
       +
             ;

     

       91
        
         };

     

       92
        
       

     

       93
        
         meta = with lib; {

+17 -14

pkgs/applications/window-managers/wio/default.nix

···

       1
       -
       { lib, stdenv, fetchgit

     

       0
        
       
     

       0
        
       
     

       2
        
       , meson

     

       3
        
       , ninja

     

       4
        
       , pkg-config

     
···

       17
        
       

     

       18
        
       stdenv.mkDerivation rec {

     

       19
        
         pname = "wio";

     

       20
       -
         version = "unstable-2020-11-02";

     

       21
        
       

     

       22
       -
         src = fetchgit {

     

       23
       -
           url = "https://git.sr.ht/~sircmpwn/wio";

     

       24
       -
           rev = "31b742e473b15a2087be740d1de28bc2afd47a4d";

     

       25
       -
           sha256 = "1vpvlahv6dmr7vfb11p5cc5ds2y2vfvcb877nkqx18yin6pg357l";

     

       0
        
       
     

       26
        
         };

     

       27
        
       

     

       28
       -
         patches = [

     

       29
       -
           # To fix the build with wlroots 0.13:

     

       30
       -
           ./wlroots-0.13.patch

     

       0
        
       
     

       0
        
       
     

       31
        
         ];

     

       32
       -
       

     

       33
       -
         nativeBuildInputs = [ meson ninja pkg-config makeWrapper ];

     

       34
        
         buildInputs = [

     

       35
        
           cairo

     

       36
        
           libxkbcommon

     

       0
        
       
     

       37
        
           udev

     

       38
        
           wayland

     

       39
        
           wayland-protocols

     

       40
        
           wlroots

     

       41
       -
           mesa # for libEGL

     

       42
        
           xwayland

     

       43
        
         ];

     

       44
        
       

     
···

       48
        
         '';

     

       49
        
       

     

       50
        
         meta = with lib; {

     

       0
        
       
     

       51
        
           description = "That Plan 9 feel, for Wayland";

     

       52
        
           longDescription = ''

     

       53
        
             Wio is a Wayland compositor for Linux and FreeBSD which has a similar look

     

       54
        
             and feel to plan9's rio.

     

       55
        
           '';

     

       56
       -
           homepage = "https://wio-project.org/";

     

       57
        
           license = licenses.mit;

     

       0
        
       
     

       58
        
           platforms = with platforms; linux;

     

       59
       -
           maintainers = with maintainers; [ AndersonTorres ];

     

       60
        
         };

     

       61
        
       

     

       62
        
         passthru.providedSessions = [ "wio" ];

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromBitbucket

     

       4
        
       , meson

     

       5
        
       , ninja

     

       6
        
       , pkg-config

     
···

       19
        
       

     

       20
        
       stdenv.mkDerivation rec {

     

       21
        
         pname = "wio";

     

       22
       +
         version = "0.0.0+unstable=2021-06-01";

     

       23
        
       

     

       24
       +
         src = fetchFromBitbucket {

     

       25
       +
           owner = "anderson_torres";

     

       26
       +
           repo = pname;

     

       27
       +
           rev = "ad57eb45ba0459cd0b16ba486cb6e01626079c29";

     

       28
       +
           sha256 = "sha256-mCggAscQ+Ej3SNwhA6QxecV1nH6Rw8RDf8yAsbadqjE=";

     

       29
        
         };

     

       30
        
       

     

       31
       +
         nativeBuildInputs = [

     

       32
       +
           meson

     

       33
       +
           ninja

     

       34
       +
           pkg-config

     

       35
       +
           makeWrapper

     

       36
        
         ];

     

       0
        
       
     

       0
        
       
     

       37
        
         buildInputs = [

     

       38
        
           cairo

     

       39
        
           libxkbcommon

     

       40
       +
           mesa # for libEGL

     

       41
        
           udev

     

       42
        
           wayland

     

       43
        
           wayland-protocols

     

       44
        
           wlroots

     

       0
        
       
     

       45
        
           xwayland

     

       46
        
         ];

     

       47
        
       

     
···

       51
        
         '';

     

       52
        
       

     

       53
        
         meta = with lib; {

     

       54
       +
           homepage = "https://wio-project.org/";

     

       55
        
           description = "That Plan 9 feel, for Wayland";

     

       56
        
           longDescription = ''

     

       57
        
             Wio is a Wayland compositor for Linux and FreeBSD which has a similar look

     

       58
        
             and feel to plan9's rio.

     

       59
        
           '';

     

       0
        
       
     

       60
        
           license = licenses.mit;

     

       61
       +
           maintainers = with maintainers; [ AndersonTorres ];

     

       62
        
           platforms = with platforms; linux;

     

       0
        
       
     

       63
        
         };

     

       64
        
       

     

       65
        
         passthru.providedSessions = [ "wio" ];

-254

pkgs/applications/window-managers/wio/wlroots-0.13.patch

···

       1
       -
       commit 8a3f903b20d646ebb2472c4f094ca1bf225a96c7

     

       2
       -
       Author: Michael Weiss <dev.primeos@gmail.com>

     

       3
       -
       Date:   Fri May 14 19:19:05 2021 +0200

     

       4
       -
       

     

       5
       -
           Fix the build with wlroots 0.13

     

       6
       -
       

     

       7
       -
       diff --git a/main.c b/main.c

     

       8
       -
       index 5d7dcda..870fdb0 100644

     

       9
       -
       --- a/main.c

     

       10
       -
       +++ b/main.c

     

       11
       -
       @@ -1,6 +1,7 @@

     

       12
       -
        #define _POSIX_C_SOURCE 200809L

     

       13
       -
        #include <assert.h>

     

       14
       -
        #include <cairo/cairo.h>

     

       15
       -
       +#include <libdrm/drm_fourcc.h>

     

       16
       -
        #include <getopt.h>

     

       17
       -
        #include <stdlib.h>

     

       18
       -
        #include <string.h>

     

       19
       -
       @@ -49,7 +50,7 @@ static void gen_menu_textures(struct wio_server *server) {

     

       20
       -
        		cairo_surface_flush(surf);

     

       21
       -
        		unsigned char *data = cairo_image_surface_get_data(surf);

     

       22
       -
        		server->menu.inactive_textures[i] = wlr_texture_from_pixels(renderer,

     

       23
       -
       -				WL_SHM_FORMAT_ARGB8888,

     

       24
       -
       +				DRM_FORMAT_ARGB8888,

     

       25
       -
        				cairo_image_surface_get_stride(surf),

     

       26
       -
        				extents.width + 2, extents.height + 2, data);

     

       27
       -
        	}

     

       28
       -
       @@ -66,7 +67,7 @@ static void gen_menu_textures(struct wio_server *server) {

     

       29
       -
        		cairo_surface_flush(surf);

     

       30
       -
        		unsigned char *data = cairo_image_surface_get_data(surf);

     

       31
       -
        		server->menu.active_textures[i] = wlr_texture_from_pixels(renderer,

     

       32
       -
       -				WL_SHM_FORMAT_ARGB8888,

     

       33
       -
       +				DRM_FORMAT_ARGB8888,

     

       34
       -
        				cairo_image_surface_get_stride(surf),

     

       35
       -
        				extents.width + 2, extents.height + 2, data);

     

       36
       -
        	}

     

       37
       -
       @@ -152,7 +153,7 @@ int main(int argc, char **argv) {

     

       38
       -
        	}

     

       39
       -
        

     

       40
       -
        	server.wl_display = wl_display_create();

     

       41
       -
       -	server.backend = wlr_backend_autocreate(server.wl_display, NULL);

     

       42
       -
       +	server.backend = wlr_backend_autocreate(server.wl_display);

     

       43
       -
        	server.renderer = wlr_backend_get_renderer(server.backend);

     

       44
       -
        	wlr_renderer_init_wl_display(server.renderer, server.wl_display);

     

       45
       -
        

     

       46
       -
       diff --git a/protocols/wlr-layer-shell-unstable-v1.xml b/protocols/wlr-layer-shell-unstable-v1.xml

     

       47
       -
       index 90b8bc8..d62fd51 100644

     

       48
       -
       --- a/protocols/wlr-layer-shell-unstable-v1.xml

     

       49
       -
       +++ b/protocols/wlr-layer-shell-unstable-v1.xml

     

       50
       -
       @@ -25,7 +25,7 @@

     

       51
       -
            THIS SOFTWARE.

     

       52
       -
          </copyright>

     

       53
       -
        

     

       54
       -
       -  <interface name="zwlr_layer_shell_v1" version="1">

     

       55
       -
       +  <interface name="zwlr_layer_shell_v1" version="4">

     

       56
       -
            <description summary="create surfaces that are layers of the desktop">

     

       57
       -
              Clients can use this interface to assign the surface_layer role to

     

       58
       -
              wl_surfaces. Such surfaces are assigned to a "layer" of the output and

     

       59
       -
       @@ -47,6 +47,12 @@

     

       60
       -
                or manipulate a buffer prior to the first layer_surface.configure call

     

       61
       -
                must also be treated as errors.

     

       62
       -
        

     

       63
       -
       +        After creating a layer_surface object and setting it up, the client

     

       64
       -
       +        must perform an initial commit without any buffer attached.

     

       65
       -
       +        The compositor will reply with a layer_surface.configure event.

     

       66
       -
       +        The client must acknowledge it and is then allowed to attach a buffer

     

       67
       -
       +        to map the surface.

     

       68
       -
       +

     

       69
       -
                You may pass NULL for output to allow the compositor to decide which

     

       70
       -
                output to use. Generally this will be the one that the user most

     

       71
       -
                recently interacted with.

     

       72
       -
       @@ -82,17 +88,35 @@

     

       73
       -
              <entry name="top" value="2"/>

     

       74
       -
              <entry name="overlay" value="3"/>

     

       75
       -
            </enum>

     

       76
       -
       +

     

       77
       -
       +    <!-- Version 3 additions -->

     

       78
       -
       +

     

       79
       -
       +    <request name="destroy" type="destructor" since="3">

     

       80
       -
       +      <description summary="destroy the layer_shell object">

     

       81
       -
       +        This request indicates that the client will not use the layer_shell

     

       82
       -
       +        object any more. Objects that have been created through this instance

     

       83
       -
       +        are not affected.

     

       84
       -
       +      </description>

     

       85
       -
       +    </request>

     

       86
       -
          </interface>

     

       87
       -
        

     

       88
       -
       -  <interface name="zwlr_layer_surface_v1" version="1">

     

       89
       -
       +  <interface name="zwlr_layer_surface_v1" version="4">

     

       90
       -
            <description summary="layer metadata interface">

     

       91
       -
              An interface that may be implemented by a wl_surface, for surfaces that

     

       92
       -
              are designed to be rendered as a layer of a stacked desktop-like

     

       93
       -
              environment.

     

       94
       -
        

     

       95
       -
       -      Layer surface state (size, anchor, exclusive zone, margin, interactivity)

     

       96
       -
       -      is double-buffered, and will be applied at the time wl_surface.commit of

     

       97
       -
       -      the corresponding wl_surface is called.

     

       98
       -
       +      Layer surface state (layer, size, anchor, exclusive zone,

     

       99
       -
       +      margin, interactivity) is double-buffered, and will be applied at the

     

       100
       -
       +      time wl_surface.commit of the corresponding wl_surface is called.

     

       101
       -
       +

     

       102
       -
       +      Attaching a null buffer to a layer surface unmaps it.

     

       103
       -
       +

     

       104
       -
       +      Unmapping a layer_surface means that the surface cannot be shown by the

     

       105
       -
       +      compositor until it is explicitly mapped again. The layer_surface

     

       106
       -
       +      returns to the state it had right after layer_shell.get_layer_surface.

     

       107
       -
       +      The client can re-map the surface by performing a commit without any

     

       108
       -
       +      buffer attached, waiting for a configure event and handling it as usual.

     

       109
       -
            </description>

     

       110
       -
        

     

       111
       -
            <request name="set_size">

     

       112
       -
       @@ -127,14 +151,19 @@

     

       113
       -
        

     

       114
       -
            <request name="set_exclusive_zone">

     

       115
       -
              <description summary="configures the exclusive geometry of this surface">

     

       116
       -
       -        Requests that the compositor avoids occluding an area of the surface

     

       117
       -
       -        with other surfaces. The compositor's use of this information is

     

       118
       -
       +        Requests that the compositor avoids occluding an area with other

     

       119
       -
       +        surfaces. The compositor's use of this information is

     

       120
       -
                implementation-dependent - do not assume that this region will not

     

       121
       -
                actually be occluded.

     

       122
       -
        

     

       123
       -
       -        A positive value is only meaningful if the surface is anchored to an

     

       124
       -
       -        edge, rather than a corner. The zone is the number of surface-local

     

       125
       -
       -        coordinates from the edge that is considered exclusive.

     

       126
       -
       +        A positive value is only meaningful if the surface is anchored to one

     

       127
       -
       +        edge or an edge and both perpendicular edges. If the surface is not

     

       128
       -
       +        anchored, anchored to only two perpendicular edges (a corner), anchored

     

       129
       -
       +        to only two parallel edges or anchored to all edges, a positive value

     

       130
       -
       +        will be treated the same as zero.

     

       131
       -
       +

     

       132
       -
       +        A positive zone is the distance from the edge in surface-local

     

       133
       -
       +        coordinates to consider exclusive.

     

       134
       -
        

     

       135
       -
                Surfaces that do not wish to have an exclusive zone may instead specify

     

       136
       -
                how they should interact with surfaces that do. If set to zero, the

     

       137
       -
       @@ -174,21 +203,85 @@

     

       138
       -
              <arg name="left" type="int"/>

     

       139
       -
            </request>

     

       140
       -
        

     

       141
       -
       +    <enum name="keyboard_interactivity">

     

       142
       -
       +      <description summary="types of keyboard interaction possible for a layer shell surface">

     

       143
       -
       +        Types of keyboard interaction possible for layer shell surfaces. The

     

       144
       -
       +        rationale for this is twofold: (1) some applications are not interested

     

       145
       -
       +        in keyboard events and not allowing them to be focused can improve the

     

       146
       -
       +        desktop experience; (2) some applications will want to take exclusive

     

       147
       -
       +        keyboard focus.

     

       148
       -
       +      </description>

     

       149
       -
       +

     

       150
       -
       +      <entry name="none" value="0">

     

       151
       -
       +        <description summary="no keyboard focus is possible">

     

       152
       -
       +          This value indicates that this surface is not interested in keyboard

     

       153
       -
       +          events and the compositor should never assign it the keyboard focus.

     

       154
       -
       +

     

       155
       -
       +          This is the default value, set for newly created layer shell surfaces.

     

       156
       -
       +

     

       157
       -
       +          This is useful for e.g. desktop widgets that display information or

     

       158
       -
       +          only have interaction with non-keyboard input devices.

     

       159
       -
       +        </description>

     

       160
       -
       +      </entry>

     

       161
       -
       +      <entry name="exclusive" value="1">

     

       162
       -
       +        <description summary="request exclusive keyboard focus">

     

       163
       -
       +          Request exclusive keyboard focus if this surface is above the shell surface layer.

     

       164
       -
       +

     

       165
       -
       +          For the top and overlay layers, the seat will always give

     

       166
       -
       +          exclusive keyboard focus to the top-most layer which has keyboard

     

       167
       -
       +          interactivity set to exclusive. If this layer contains multiple

     

       168
       -
       +          surfaces with keyboard interactivity set to exclusive, the compositor

     

       169
       -
       +          determines the one receiving keyboard events in an implementation-

     

       170
       -
       +          defined manner. In this case, no guarantee is made when this surface

     

       171
       -
       +          will receive keyboard focus (if ever).

     

       172
       -
       +

     

       173
       -
       +          For the bottom and background layers, the compositor is allowed to use

     

       174
       -
       +          normal focus semantics.

     

       175
       -
       +

     

       176
       -
       +          This setting is mainly intended for applications that need to ensure

     

       177
       -
       +          they receive all keyboard events, such as a lock screen or a password

     

       178
       -
       +          prompt.

     

       179
       -
       +        </description>

     

       180
       -
       +      </entry>

     

       181
       -
       +      <entry name="on_demand" value="2" since="4">

     

       182
       -
       +        <description summary="request regular keyboard focus semantics">

     

       183
       -
       +          This requests the compositor to allow this surface to be focused and

     

       184
       -
       +          unfocused by the user in an implementation-defined manner. The user

     

       185
       -
       +          should be able to unfocus this surface even regardless of the layer

     

       186
       -
       +          it is on.

     

       187
       -
       +

     

       188
       -
       +          Typically, the compositor will want to use its normal mechanism to

     

       189
       -
       +          manage keyboard focus between layer shell surfaces with this setting

     

       190
       -
       +          and regular toplevels on the desktop layer (e.g. click to focus).

     

       191
       -
       +          Nevertheless, it is possible for a compositor to require a special

     

       192
       -
       +          interaction to focus or unfocus layer shell surfaces (e.g. requiring

     

       193
       -
       +          a click even if focus follows the mouse normally, or providing a

     

       194
       -
       +          keybinding to switch focus between layers).

     

       195
       -
       +

     

       196
       -
       +          This setting is mainly intended for desktop shell components (e.g.

     

       197
       -
       +          panels) that allow keyboard interaction. Using this option can allow

     

       198
       -
       +          implementing a desktop shell that can be fully usable without the

     

       199
       -
       +          mouse.

     

       200
       -
       +        </description>

     

       201
       -
       +      </entry>

     

       202
       -
       +    </enum>

     

       203
       -
       +

     

       204
       -
            <request name="set_keyboard_interactivity">

     

       205
       -
              <description summary="requests keyboard events">

     

       206
       -
       -        Set to 1 to request that the seat send keyboard events to this layer

     

       207
       -
       -        surface. For layers below the shell surface layer, the seat will use

     

       208
       -
       -        normal focus semantics. For layers above the shell surface layers, the

     

       209
       -
       -        seat will always give exclusive keyboard focus to the top-most layer

     

       210
       -
       -        which has keyboard interactivity set to true.

     

       211
       -
       +        Set how keyboard events are delivered to this surface. By default,

     

       212
       -
       +        layer shell surfaces do not receive keyboard events; this request can

     

       213
       -
       +        be used to change this.

     

       214
       -
       +

     

       215
       -
       +        This setting is inherited by child surfaces set by the get_popup

     

       216
       -
       +        request.

     

       217
       -
        

     

       218
       -
                Layer surfaces receive pointer, touch, and tablet events normally. If

     

       219
       -
                you do not want to receive them, set the input region on your surface

     

       220
       -
                to an empty region.

     

       221
       -
        

     

       222
       -
       -        Events is double-buffered, see wl_surface.commit.

     

       223
       -
       +        Keyboard interactivity is double-buffered, see wl_surface.commit.

     

       224
       -
              </description>

     

       225
       -
       -      <arg name="keyboard_interactivity" type="uint"/>

     

       226
       -
       +      <arg name="keyboard_interactivity" type="uint" enum="keyboard_interactivity"/>

     

       227
       -
            </request>

     

       228
       -
        

     

       229
       -
            <request name="get_popup">

     

       230
       -
       @@ -273,6 +366,7 @@

     

       231
       -
              <entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>

     

       232
       -
              <entry name="invalid_size" value="1" summary="size is invalid"/>

     

       233
       -
              <entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>

     

       234
       -
       +      <entry name="invalid_keyboard_interactivity" value="3" summary="keyboard interactivity is invalid"/>

     

       235
       -
            </enum>

     

       236
       -
        

     

       237
       -
            <enum name="anchor" bitfield="true">

     

       238
       -
       @@ -281,5 +375,16 @@

     

       239
       -
              <entry name="left" value="4" summary="the left edge of the anchor rectangle"/>

     

       240
       -
              <entry name="right" value="8" summary="the right edge of the anchor rectangle"/>

     

       241
       -
            </enum>

     

       242
       -
       +

     

       243
       -
       +    <!-- Version 2 additions -->

     

       244
       -
       +

     

       245
       -
       +    <request name="set_layer" since="2">

     

       246
       -
       +      <description summary="change the layer of the surface">

     

       247
       -
       +        Change the layer that the surface is rendered on.

     

       248
       -
       +

     

       249
       -
       +        Layer is double-buffered, see wl_surface.commit.

     

       250
       -
       +      </description>

     

       251
       -
       +      <arg name="layer" type="uint" enum="zwlr_layer_shell_v1.layer" summary="layer to move this surface to"/>

     

       252
       -
       +    </request>

     

       253
       -
          </interface>

     

       254
       -
        </protocol>

+1 -1

pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch

···

       24
        
                                                             sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1,

     

       25
        
                                                             mtInternal);

     

       26
        
       -    sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch);

     

       27
       -
       +    sprintf(ld_library_path, "%s%s", v);

     

       28
        
            Arguments::set_library_path(ld_library_path);

     

       29
        
            FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal);

     

       30
        
          }

···

       24
        
                                                             sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1,

     

       25
        
                                                             mtInternal);

     

       26
        
       -    sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch);

     

       27
       +
       +    sprintf(ld_library_path, "%s", v);

     

       28
        
            Arguments::set_library_path(ld_library_path);

     

       29
        
            FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal);

     

       30
        
          }

+2 -2

pkgs/development/libraries/drumstick/default.nix

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "drumstick";

     

       8
       -
         version = "2.2.0";

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
        
           url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";

     

       12
       -
           sha256 = "sha256-Ytus/kgL2Bs0vRQGROoJO9eO6lajOSaQLVjwsF4YypY=";

     

       13
        
         };

     

       14
        
       

     

       15
        
         patches = [

···

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "drumstick";

     

       8
       +
         version = "2.2.1";

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
        
           url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";

     

       12
       +
           sha256 = "sha256-UxXUEkO5qXPIjw99BdkAspikR9Nlu32clf28cTyf+W4=";

     

       13
        
         };

     

       14
        
       

     

       15
        
         patches = [

+2 -2

pkgs/development/tools/go-mockery/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "go-mockery";

     

       5
       -
         version = "2.7.5";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "vektra";

     

       9
        
           repo = "mockery";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-RdXViEEJR8yud2coSmAUfIe1mTCHiZHALrcGRslNfEg=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "go-mockery";

     

       5
       +
         version = "2.8.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "vektra";

     

       9
        
           repo = "mockery";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-sOZig47KKKGJmV9QNCa+TwYCxemeVl6xssfExSaaFjY=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";

+3 -3

pkgs/development/tools/go-task/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "go-task";

     

       5
       -
         version = "3.4.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = pname;

     

       9
        
           repo = "task";

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-632ISkBIZJBJpybuiuRHOV3CAJg1rSe3hK+W7hmW2cM=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorSha256 = "sha256-qKjCGZnCts4GfBafSRXR7xTvfJdqK8zjpu01eiyITkU=";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "go-task";

     

       5
       +
         version = "3.4.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = pname;

     

       9
        
           repo = "task";

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-hI6x3DOB7pP+umnEFqL0sIx+6qN74sooLdkR2pC74D8=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI=";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

+2 -2

pkgs/games/ckan/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "ckan";

     

       5
       -
         version = "1.30.2";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";

     

       9
       -
           sha256 = "sha256-ggmUsJb3xKpI3ygTmzR5f3na/oU4OEa3r3edjlN5R+Q=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         dontUnpack = true;

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "ckan";

     

       5
       +
         version = "1.30.4";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";

     

       9
       +
           sha256 = "sha256-IgPqUEDpaIuGoaGoH2GCEzh3KxF3pkJC3VjTYXwSiQE=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         dontUnpack = true;

+3 -3

pkgs/servers/monitoring/mackerel-agent/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "mackerel-agent";

     

       5
       -
         version = "0.71.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "mackerelio";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-xEUIfmQX7I+I2wi53vc1JZYDweY9OAAUd2TZJ125+iw=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ makeWrapper ];

     

       15
        
         checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];

     

       16
        
         buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];

     

       17
        
       

     

       18
       -
         vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs=";

     

       19
        
       

     

       20
        
         subPackages = [ "." ];

     

       21

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "mackerel-agent";

     

       5
       +
         version = "0.71.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "mackerelio";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-O67xzL4avCOh2x6qJCScOWR2TS1hfP5S6jHHELNbZWQ=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ makeWrapper ];

     

       15
        
         checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];

     

       16
        
         buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];

     

       17
        
       

     

       18
       +
         vendorSha256 = "sha256-iFWQoAnB0R6XwjdPvOWJdNTmEZ961zE51vDrmZ7r4Jk=";

     

       19
        
       

     

       20
        
         subPackages = [ "." ];

     

       21

+3 -3

pkgs/tools/admin/eksctl/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "eksctl";

     

       5
       -
         version = "0.51.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "weaveworks";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "sha256-OTgcQLYtUAf7EeaEafzfPG02SGjVvSAVvVGI4A/S0Zs=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorSha256 = "sha256-RkUr4ytoFa6/luaxDLj0FiF3cs9fJav0JHcZCN46Mqs=";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "eksctl";

     

       5
       +
         version = "0.52.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "weaveworks";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "sha256-P8v8XliY8XbfdiqSUTUhI4HYBKzAk/LHVSF0OLS8Vag=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorSha256 = "sha256-4aZVQjcrZ6NKXr0ZFMWEcf6jMtp6TlRlinZ6ZZvLDyE=";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

+3 -3

pkgs/tools/backup/bupstash/default.nix

···

       1
        
       { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:

     

       2
        
       rustPlatform.buildRustPackage rec {

     

       3
        
         pname = "bupstash";

     

       4
       -
         version = "0.9.0";

     

       5
        
       

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "andrewchambers";

     

       8
        
           repo = pname;

     

       9
        
           rev = "v${version}";

     

       10
       -
           sha256 = "sha256-uA5XEG9nvqsXg34bqw8k4Rjk5F9bPFSk1HQ4Bv6Ar+I=";

     

       11
        
         };

     

       12
        
       

     

       13
       -
         cargoSha256 = "sha256-4r+Ioh6Waoy/7LVF3CPz18c2bCRYym5T4za1GSKw7WQ=";

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ ronn pkg-config installShellFiles ];

     

       16
        
         buildInputs = [ libsodium ];

···

       1
        
       { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:

     

       2
        
       rustPlatform.buildRustPackage rec {

     

       3
        
         pname = "bupstash";

     

       4
       +
         version = "0.9.1";

     

       5
        
       

     

       6
        
         src = fetchFromGitHub {

     

       7
        
           owner = "andrewchambers";

     

       8
        
           repo = pname;

     

       9
        
           rev = "v${version}";

     

       10
       +
           sha256 = "sha256-DzRGhdUxfBW6iazpCHlQ9J8IL10FVxhac8kx6yBSGNk=";

     

       11
        
         };

     

       12
        
       

     

       13
       +
         cargoSha256 = "sha256-IKk4VsO/oH4nC6F1W+JA3Agl7oXXNJ7zpP2PYpPLREU=";

     

       14
        
       

     

       15
        
         nativeBuildInputs = [ ronn pkg-config installShellFiles ];

     

       16
        
         buildInputs = [ libsodium ];

+3 -3

pkgs/tools/misc/krapslog/default.nix

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "krapslog";

     

       5
       -
         version = "0.1.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "acj";

     

       9
        
           repo = "krapslog-rs";

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "sha256-BaR72djkvaMmdBqbykezLkY81Y7iajhNPcFGYq/qv7Y=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         cargoSha256 = "sha256-rcLsqMegCos+v0OkdRvH9xoopE7R/njEUVteMY/6mj8=";

     

       15
        
       

     

       16
        
         buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       17

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "krapslog";

     

       5
       +
         version = "0.2.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "acj";

     

       9
        
           repo = "krapslog-rs";

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "sha256-Ab5bY5r0tYx3JxYRRq7i9O7WFvdi6cRMSuru/pK50y8=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         cargoSha256 = "sha256-k7jsWMFU/8XogREic4GB+qYocFtiTvSzvBAcORUFe0o=";

     

       15
        
       

     

       16
        
         buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       17