commit f0290a5d27b290bf66e72f4e3793251aa9ebdd4d · pyrox.dev/nixpkgs

+1 -1

doc/contributing/submitting-changes.chapter.md

···

       161
        
       

     

       162
        
       ### Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests) {#submitting-changes-nixos-tests}

     

       163
        
       

     

       164
       -
       Packages with automated tests are much more likely to be merged in a timely fashion because it doesn’t require as much manual testing by the maintainer to verify the functionality of the package. If there are existing tests for the package, they should be run to verify your changes do not break the tests. Tests only apply to packages with NixOS modules defined and can only be run on Linux. For more details on writing and running tests, see the [section in the NixOS manual](https://nixos.org/nixos/manual/index.html#sec-nixos-tests).

     

       165
        
       

     

       166
        
       ### Tested compilation of all pkgs that depend on this change using `nixpkgs-review` {#submitting-changes-tested-compilation}

     

       167

···

       161
        
       

     

       162
        
       ### Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests) {#submitting-changes-nixos-tests}

     

       163
        
       

     

       164
       +
       Packages with automated tests are much more likely to be merged in a timely fashion because it doesn’t require as much manual testing by the maintainer to verify the functionality of the package. If there are existing tests for the package, they should be run to verify your changes do not break the tests. Tests can only be run on Linux. For more details on writing and running tests, see the [section in the NixOS manual](https://nixos.org/nixos/manual/index.html#sec-nixos-tests).

     

       165
        
       

     

       166
        
       ### Tested compilation of all pkgs that depend on this change using `nixpkgs-review` {#submitting-changes-tested-compilation}

     

       167

maintainers/maintainer-list.nix

···

       492
        
             fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A";

     

       493
        
           }];

     

       494
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       495
        
         amar1729 = {

     

       496
        
           email = "amar.paul16@gmail.com";

     

       497
        
           github = "amar1729";

···

       492
        
             fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A";

     

       493
        
           }];

     

       494
        
         };

     

       495
       +
         amanjeev = {

     

       496
       +
           email = "aj@amanjeev.com";

     

       497
       +
           github = "amanjeev";

     

       498
       +
           githubId = 160476;

     

       499
       +
           name = "Amanjeev Sethi";

     

       500
       +
         };

     

       501
        
         amar1729 = {

     

       502
        
           email = "amar.paul16@gmail.com";

     

       503
        
           github = "amar1729";

+1 -5

nixos/modules/services/misc/jellyfin.nix

···

       18
        
       

     

       19
        
             package = mkOption {

     

       20
        
               type = types.package;

     

       0
        
       
     

       21
        
               example = literalExample "pkgs.jellyfin";

     

       22
        
               description = ''

     

       23
        
                 Jellyfin package to use.

     
···

       97
        
               ];

     

       98
        
             };

     

       99
        
           };

     

       100
       -
       

     

       101
       -
           services.jellyfin.package = mkDefault (

     

       102
       -
             if versionAtLeast config.system.stateVersion "20.09" then pkgs.jellyfin

     

       103
       -
               else pkgs.jellyfin_10_5

     

       104
       -
           );

     

       105
        
       

     

       106
        
           users.users = mkIf (cfg.user == "jellyfin") {

     

       107
        
             jellyfin = {

···

       18
        
       

     

       19
        
             package = mkOption {

     

       20
        
               type = types.package;

     

       21
       +
               default = pkgs.jellyfin;

     

       22
        
               example = literalExample "pkgs.jellyfin";

     

       23
        
               description = ''

     

       24
        
                 Jellyfin package to use.

     
···

       98
        
               ];

     

       99
        
             };

     

       100
        
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       101
        
       

     

       102
        
           users.users = mkIf (cfg.user == "jellyfin") {

     

       103
        
             jellyfin = {

+100 -24

nixos/tests/hibernate.nix

···

       1
        
       # Test whether hibernation from partition works.

     

       2
        
       

     

       3
       -
       import ./make-test-python.nix (pkgs: {

     

       4
       -
         name = "hibernate";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5
        
       

     

       6
       -
         nodes = {

     

       7
       -
           machine = { config, lib, pkgs, ... }: with lib; {

     

       8
       -
             virtualisation.emptyDiskImages = [ config.virtualisation.memorySize ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
       

     

       10
       -
             systemd.services.backdoor.conflicts = [ "sleep.target" ];

     

       0
        
       
     

       0
        
       
     

       11
        
       

     

       12
       -
             swapDevices = mkOverride 0 [ { device = "/dev/vdb"; } ];

     

       13
        
       

     

       14
       -
             networking.firewall.allowedTCPPorts = [ 4444 ];

     

       15
        
       

     

       16
       -
             systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k";

     

       0
        
       
     

       17
        
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
       

     

       19
       -
           probe = { pkgs, ...}: {

     

       20
       -
             environment.systemPackages = [ pkgs.netcat ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
           };

     

       22
        
         };

     

       23
        
       

     

       24
        
         # 9P doesn't support reconnection to virtio transport after a hibernation.

     

       25
        
         # Therefore, machine just hangs on any Nix store access.

     

       26
       -
         # To work around it we run a daemon which listens to a TCP connection and

     

       27
       -
         # try to connect to it as a test.

     

       28
        
       

     

       29
        
         testScript =

     

       30
        
           ''

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
             machine.start()

     

       32
       -
             machine.wait_for_unit("multi-user.target")

     

       33
       -
             machine.succeed("mkswap /dev/vdb")

     

       34
       -
             machine.succeed("swapon -a")

     

       35
       -
             machine.start_job("listener")

     

       36
       -
             machine.wait_for_open_port(4444)

     

       37
       -
             machine.succeed("systemctl hibernate &")

     

       38
       -
             machine.wait_for_shutdown()

     

       39
       -
             probe.wait_for_unit("multi-user.target")

     

       40
       -
             machine.start()

     

       41
       -
             probe.wait_until_succeeds("echo test | nc machine 4444 -N")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       42
        
           '';

     

       43
        
       

     

       44
       -
       })

···

       1
        
       # Test whether hibernation from partition works.

     

       2
        
       

     

       3
       +
       { system ? builtins.currentSystem

     

       4
       +
       , config ? {}

     

       5
       +
       , pkgs ? import ../.. { inherit system config; }

     

       6
       +
       }:

     

       7
       +
       

     

       8
       +
       with import ../lib/testing-python.nix { inherit system pkgs; };

     

       9
        
       

     

       10
       +
       let

     

       11
       +
         # System configuration of the installed system, which is used for the actual

     

       12
       +
         # hibernate testing.

     

       13
       +
         installedConfig = with pkgs.lib; {

     

       14
       +
           imports = [

     

       15
       +
             ../modules/testing/test-instrumentation.nix

     

       16
       +
             ../modules/profiles/qemu-guest.nix

     

       17
       +
             ../modules/profiles/minimal.nix

     

       18
       +
           ];

     

       19
        
       

     

       20
       +
           hardware.enableAllFirmware = mkForce false;

     

       21
       +
           documentation.nixos.enable = false;

     

       22
       +
           boot.loader.grub.device = "/dev/vda";

     

       23
        
       

     

       24
       +
           systemd.services.backdoor.conflicts = [ "sleep.target" ];

     

       25
        
       

     

       26
       +
           powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service";

     

       27
        
       

     

       28
       +
           fileSystems = {

     

       29
       +
             "/".device = "/dev/vda2";

     

       30
        
           };

     

       31
       +
           swapDevices = mkOverride 0 [ { device = "/dev/vda1"; } ];

     

       32
       +
         };

     

       33
       +
         installedSystem = (import ../lib/eval-config.nix {

     

       34
       +
           inherit system;

     

       35
       +
           modules = [ installedConfig ];

     

       36
       +
         }).config.system.build.toplevel;

     

       37
       +
       in makeTest {

     

       38
       +
         name = "hibernate";

     

       39
       +
       

     

       40
       +
         nodes = {

     

       41
       +
           # System configuration used for installing the installedConfig from above.

     

       42
       +
           machine = { config, lib, pkgs, ... }: with lib; {

     

       43
       +
             imports = [

     

       44
       +
               ../modules/profiles/installation-device.nix

     

       45
       +
               ../modules/profiles/base.nix

     

       46
       +
             ];

     

       47
        
       

     

       48
       +
             nix.binaryCaches = mkForce [ ];

     

       49
       +
             nix.extraOptions = ''

     

       50
       +
               hashed-mirrors =

     

       51
       +
               connect-timeout = 1

     

       52
       +
             '';

     

       53
       +
       

     

       54
       +
             virtualisation.diskSize = 8 * 1024;

     

       55
       +
             virtualisation.emptyDiskImages = [

     

       56
       +
               # Small root disk for installer

     

       57
       +
               512

     

       58
       +
             ];

     

       59
       +
             virtualisation.bootDevice = "/dev/vdb";

     

       60
        
           };

     

       61
        
         };

     

       62
        
       

     

       63
        
         # 9P doesn't support reconnection to virtio transport after a hibernation.

     

       64
        
         # Therefore, machine just hangs on any Nix store access.

     

       65
       +
         # To avoid this, we install NixOS onto a temporary disk with everything we need

     

       66
       +
         # included into the store.

     

       67
        
       

     

       68
        
         testScript =

     

       69
        
           ''

     

       70
       +
             def create_named_machine(name):

     

       71
       +
                 return create_machine(

     

       72
       +
                     {

     

       73
       +
                         "qemuFlags": "-cpu max ${

     

       74
       +
                           if system == "x86_64-linux" then "-m 1024"

     

       75
       +
                           else "-m 768 -enable-kvm -machine virt,gic-version=host"}",

     

       76
       +
                         "hdaInterface": "virtio",

     

       77
       +
                         "hda": "vm-state-machine/machine.qcow2",

     

       78
       +
                         "name": name,

     

       79
       +
                     }

     

       80
       +
                 )

     

       81
       +
       

     

       82
       +
       

     

       83
       +
             # Install NixOS

     

       84
        
             machine.start()

     

       85
       +
             machine.succeed(

     

       86
       +
                 # Partition /dev/vda

     

       87
       +
                 "flock /dev/vda parted --script /dev/vda -- mklabel msdos"

     

       88
       +
                 + " mkpart primary linux-swap 1M 1024M"

     

       89
       +
                 + " mkpart primary ext2 1024M -1s",

     

       90
       +
                 "udevadm settle",

     

       91
       +
                 "mkfs.ext3 -L nixos /dev/vda2",

     

       92
       +
                 "mount LABEL=nixos /mnt",

     

       93
       +
                 "mkswap /dev/vda1 -L swap",

     

       94
       +
                 # Install onto /mnt

     

       95
       +
                 "nix-store --load-db < ${pkgs.closureInfo {rootPaths = [installedSystem];}}/registration",

     

       96
       +
                 "nixos-install --root /mnt --system ${installedSystem} --no-root-passwd",

     

       97
       +
             )

     

       98
       +
             machine.shutdown()

     

       99
       +
       

     

       100
       +
             # Start up

     

       101
       +
             hibernate = create_named_machine("hibernate")

     

       102
       +
       

     

       103
       +
             # Drop in file that checks if we un-hibernated properly (and not booted fresh)

     

       104
       +
             hibernate.succeed(

     

       105
       +
                 "mkdir /run/test",

     

       106
       +
                 "mount -t ramfs -o size=1m ramfs /run/test",

     

       107
       +
                 "echo not persisted to disk > /run/test/suspended",

     

       108
       +
             )

     

       109
       +
       

     

       110
       +
             # Hibernate machine

     

       111
       +
             hibernate.succeed("systemctl hibernate &")

     

       112
       +
             hibernate.wait_for_shutdown()

     

       113
       +
       

     

       114
       +
             # Restore machine from hibernation, validate our ramfs file is there.

     

       115
       +
             resume = create_named_machine("resume")

     

       116
       +
             resume.start()

     

       117
       +
             resume.succeed("grep 'not persisted to disk' /run/test/suspended")

     

       118
        
           '';

     

       119
        
       

     

       120
       +
       }

pkgs/applications/editors/neovim/wrapper.nix

···

       113
        
             hydraPlatforms = [];

     

       114
        
             # prefer wrapper over the package

     

       115
        
             priority = (neovim.meta.priority or 0) - 1;

     

       0
        
       
     

       116
        
           };

     

       117
        
         };

     

       118
        
       in

···

       113
        
             hydraPlatforms = [];

     

       114
        
             # prefer wrapper over the package

     

       115
        
             priority = (neovim.meta.priority or 0) - 1;

     

       116
       +
             mainProgram = "nvim";

     

       117
        
           };

     

       118
        
         };

     

       119
        
       in

+7 -2

pkgs/applications/misc/electrum/default.nix

···

       20
        
       }:

     

       21
        
       

     

       22
        
       let

     

       23
       -
         version = "4.1.1";

     

       24
        
       

     

       25
        
         libsecp256k1_name =

     

       26
        
           if stdenv.isLinux then "libsecp256k1.so.0"

     
···

       51
        
       

     

       52
        
         src = fetchurl {

     

       53
        
           url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";

     

       54
       -
           sha256 = "0yg6ld92a4xgn7y8i51hmr3kmgmrbrjwniikkmyq9q141h2drb80";

     

       55
        
         };

     

       56
        
       

     

       57
        
         postUnpack = ''

     

       58
        
           # can't symlink, tests get confused

     

       59
        
           cp -ar ${tests} $sourceRoot/electrum/tests

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       60
        
         '';

     

       61
        
       

     

       62
        
         nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];

···

       20
        
       }:

     

       21
        
       

     

       22
        
       let

     

       23
       +
         version = "4.1.2";

     

       24
        
       

     

       25
        
         libsecp256k1_name =

     

       26
        
           if stdenv.isLinux then "libsecp256k1.so.0"

     
···

       51
        
       

     

       52
        
         src = fetchurl {

     

       53
        
           url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";

     

       54
       +
           sha256 = "05m6vbd4sfjk536kwa5wa3kv21jxxqnglx0ddvnmxfhf98371bhk";

     

       55
        
         };

     

       56
        
       

     

       57
        
         postUnpack = ''

     

       58
        
           # can't symlink, tests get confused

     

       59
        
           cp -ar ${tests} $sourceRoot/electrum/tests

     

       60
       +
         '';

     

       61
       +
       

     

       62
       +
         prePatch = ''

     

       63
       +
           substituteInPlace contrib/requirements/requirements.txt \

     

       64
       +
             --replace "dnspython>=2.0,<2.1" "dnspython>=2.0"

     

       65
        
         '';

     

       66
        
       

     

       67
        
         nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];

+3 -3

pkgs/applications/misc/xplr/default.nix

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         name = "xplr";

     

       5
       -
         version = "0.5.6";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "sayanarijit";

     

       9
        
           repo = name;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "070jyii2p7qk6gij47n5i9a8bal5iijgn8cv79mrija3pgddniaz";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         cargoSha256 = "113f0hbgy8c9gxl70b6frr0klfc8rm5klgwls7fgbb643rdh03b9";

     

       15
        
       

     

       16
        
         meta = with lib; {

     

       17
        
           description = "A hackable, minimal, fast TUI file explorer";

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         name = "xplr";

     

       5
       +
         version = "0.5.7";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "sayanarijit";

     

       9
        
           repo = name;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "1j417g0isy3cpxdb2wrvrvypnx99qffi83s4a98791wyi8yqiw6b";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         cargoSha256 = "0kpwhk2f4czhilcnfqkw5hw2vxvldxqg491xkkgxjkph3w4qv3ji";

     

       15
        
       

     

       16
        
         meta = with lib; {

     

       17
        
           description = "A hackable, minimal, fast TUI file explorer";

+2 -2

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

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "fluxctl";

     

       5
       -
         version = "1.22.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "weaveworks";

     

       9
        
           repo = "flux";

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "sha256-SaDO3a50CLhgLafCdgKEfHpuHdIweSy5L/TUgEUv5CM=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-4uSw/9lI/rdDqy78jNC9eHYW/v/sMFb+sQvwYG6GZks=";

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "fluxctl";

     

       5
       +
         version = "1.22.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "weaveworks";

     

       9
        
           repo = "flux";

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "sha256-qYdVplNHyD31m4IbIeL3x3nauZLl1XquslS3WrtUXBk=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         vendorSha256 = "sha256-4uSw/9lI/rdDqy78jNC9eHYW/v/sMFb+sQvwYG6GZks=";

+3 -3

pkgs/applications/networking/remote/remmina/default.nix

···

       13
        
       

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "remmina";

     

       16
       -
         version = "1.4.12";

     

       17
        
       

     

       18
        
         src = fetchFromGitLab {

     

       19
        
           owner  = "Remmina";

     

       20
        
           repo   = "Remmina";

     

       21
        
           rev    = "v${version}";

     

       22
       -
           sha256 = "sha256-CjlNEmca4Kob5rdpZa+YfvdOIDDDYfhNsGYqGDxSGKY=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];

     
···

       51
        
         '';

     

       52
        
       

     

       53
        
         meta = {

     

       54
       -
           license = licenses.gpl2;

     

       55
        
           homepage = "https://gitlab.com/Remmina/Remmina";

     

       56
        
           description = "Remote desktop client written in GTK";

     

       57
        
           maintainers = with maintainers; [ melsigl ryantm ];

···

       13
        
       

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "remmina";

     

       16
       +
         version = "1.4.13";

     

       17
        
       

     

       18
        
         src = fetchFromGitLab {

     

       19
        
           owner  = "Remmina";

     

       20
        
           repo   = "Remmina";

     

       21
        
           rev    = "v${version}";

     

       22
       +
           sha256 = "sha256-R+RfczAnt5R0YmXt5SmH8gOuWOH0LZ/70pOMDAXJgsE=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];

     
···

       51
        
         '';

     

       52
        
       

     

       53
        
         meta = {

     

       54
       +
           license = licenses.gpl2Plus;

     

       55
        
           homepage = "https://gitlab.com/Remmina/Remmina";

     

       56
        
           description = "Remote desktop client written in GTK";

     

       57
        
           maintainers = with maintainers; [ melsigl ryantm ];

+12 -3

pkgs/development/coq-modules/coqhammer/default.nix

···

       5
        
         pname = "coqhammer";

     

       6
        
         owner = "lukaszcz";

     

       7
        
         defaultVersion = with versions; switch coq.coq-version [

     

       8
       -
           { case = "8.12"; out = "1.3-coq8.12"; }

     

       9
       -
           { case = "8.11"; out = "1.3-coq8.11"; }

     

       10
       -
           { case = "8.10"; out = "1.3-coq8.10"; }

     

       0
        
       
     

       11
        
           { case = "8.9";  out = "1.1.1-coq8.9"; }

     

       12
        
           { case = "8.8";  out = "1.1-coq8.8"; }

     

       13
        
         ] null;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
         release."1.3-coq8.12".sha256   = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8";

     

       15
        
         release."1.3-coq8.11".sha256   = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b";

     

       16
        
         release."1.3-coq8.10".sha256   = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd";

     

       17
        
         release."1.1.1-coq8.9".sha256  = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";

     

       18
        
         release."1.1-coq8.8".sha256    = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";

     

       19
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
         release."1.3-coq8.12".version  = "1.3";

     

       21
        
         release."1.3-coq8.11".version  = "1.3";

     

       22
        
         release."1.3-coq8.10".version  = "1.3";

···

       5
        
         pname = "coqhammer";

     

       6
        
         owner = "lukaszcz";

     

       7
        
         defaultVersion = with versions; switch coq.coq-version [

     

       8
       +
           { case = "8.13"; out = "1.3.1-coq8.13"; }

     

       9
       +
           { case = "8.12"; out = "1.3.1-coq8.12"; }

     

       10
       +
           { case = "8.11"; out = "1.3.1-coq8.11"; }

     

       11
       +
           { case = "8.10"; out = "1.3.1-coq8.10"; }

     

       12
        
           { case = "8.9";  out = "1.1.1-coq8.9"; }

     

       13
        
           { case = "8.8";  out = "1.1-coq8.8"; }

     

       14
        
         ] null;

     

       15
       +
         release."1.3.1-coq8.13".sha256 = "033j6saw24anb1lqbgsg1zynxi2rnxq7pgqwh11k8r8y3xisz78w";

     

       16
       +
         release."1.3.1-coq8.12".sha256 = "0xy3vy4rv8w5ydwb9nq8y4dcimd91yr0hak2j4kn02svssg1kv1y";

     

       17
       +
         release."1.3.1-coq8.11".sha256 = "0i9nlcayq0ac95vc09d1w8sd221gdjs0g215n086qscqjwimnz8j";

     

       18
       +
         release."1.3.1-coq8.10".sha256 = "0aq9qwqx680lkidhb77fmyq403rvfcdxch849x1pzy6a48rz5yra";

     

       19
        
         release."1.3-coq8.12".sha256   = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8";

     

       20
        
         release."1.3-coq8.11".sha256   = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b";

     

       21
        
         release."1.3-coq8.10".sha256   = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd";

     

       22
        
         release."1.1.1-coq8.9".sha256  = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";

     

       23
        
         release."1.1-coq8.8".sha256    = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";

     

       24
        
       

     

       25
       +
         release."1.3.1-coq8.13".version  = "1.3.1";

     

       26
       +
         release."1.3.1-coq8.12".version  = "1.3.1";

     

       27
       +
         release."1.3.1-coq8.11".version  = "1.3.1";

     

       28
       +
         release."1.3.1-coq8.10".version  = "1.3.1";

     

       29
        
         release."1.3-coq8.12".version  = "1.3";

     

       30
        
         release."1.3-coq8.11".version  = "1.3";

     

       31
        
         release."1.3-coq8.10".version  = "1.3";

+2 -2

pkgs/development/libraries/intel-media-driver/default.nix

···

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "intel-media-driver";

     

       9
       -
         version = "21.1.3";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner  = "intel";

     

       13
        
           repo   = "media-driver";

     

       14
        
           rev    = "intel-media-${version}";

     

       15
       -
           sha256 = "1y6y6dia2y3b798f668q26pzwb1xai5d5jpmllpcxs9qikhkkx8p";

     

       16
        
         };

     

       17
        
       

     

       18
        
         cmakeFlags = [

···

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     

       8
        
         pname = "intel-media-driver";

     

       9
       +
         version = "21.2.0";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner  = "intel";

     

       13
        
           repo   = "media-driver";

     

       14
        
           rev    = "intel-media-${version}";

     

       15
       +
           sha256 = "101wbg5j00amdbfz4p6mpg90wi549dl78jd34mac5g6zhcpwqbh9";

     

       16
        
         };

     

       17
        
       

     

       18
        
         cmakeFlags = [

+1 -1

pkgs/development/ocaml-modules/dtoa/default.nix

···

       13
        
           sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn";

     

       14
        
         };

     

       15
        
       

     

       16
       -
         hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow";

     

       17
        
       

     

       18
        
         meta = with lib; {

     

       19
        
           homepage = "https://github.com/flowtype/ocaml-dtoa";

···

       13
        
           sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn";

     

       14
        
         };

     

       15
        
       

     

       16
       +
         hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";

     

       17
        
       

     

       18
        
         meta = with lib; {

     

       19
        
           homepage = "https://github.com/flowtype/ocaml-dtoa";

+84

pkgs/development/ocaml-modules/letsencrypt/default.nix

···

       1
       +
       { buildDunePackage

     

       2
       +
       , lib

     

       3
       +
       , fetchurl

     

       4
       +
       , astring

     

       5
       +
       , asn1-combinators

     

       6
       +
       , uri

     

       7
       +
       , rresult

     

       8
       +
       , base64

     

       9
       +
       , cmdliner

     

       10
       +
       , cohttp

     

       11
       +
       , cohttp-lwt

     

       12
       +
       , cohttp-lwt-unix

     

       13
       +
       , zarith

     

       14
       +
       , logs

     

       15
       +
       , fmt

     

       16
       +
       , lwt

     

       17
       +
       , mirage-crypto

     

       18
       +
       , mirage-crypto-pk

     

       19
       +
       , mirage-crypto-rng

     

       20
       +
       , x509

     

       21
       +
       , yojson

     

       22
       +
       , ounit

     

       23
       +
       , dns

     

       24
       +
       , dns-tsig

     

       25
       +
       , ptime

     

       26
       +
       , bos

     

       27
       +
       , fpath

     

       28
       +
       , randomconv

     

       29
       +
       , domain-name

     

       30
       +
       }:

     

       31
       +
       

     

       32
       +
       buildDunePackage rec {

     

       33
       +
         pname = "letsencrypt";

     

       34
       +
         version = "0.2.4";

     

       35
       +
       

     

       36
       +
         src = fetchurl {

     

       37
       +
           url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz";

     

       38
       +
           sha256 = "91c79828a50243804da29c17563c54d2d528a79207e5b874dce6a3e7fedf7567";

     

       39
       +
         };

     

       40
       +
       

     

       41
       +
         minimumOCamlVersion = "4.08";

     

       42
       +
         useDune2 = true;

     

       43
       +
       

     

       44
       +
         buildInputs = [

     

       45
       +
           cmdliner

     

       46
       +
           cohttp

     

       47
       +
           cohttp-lwt-unix

     

       48
       +
           zarith

     

       49
       +
           fmt

     

       50
       +
           mirage-crypto-rng

     

       51
       +
           ptime

     

       52
       +
           bos

     

       53
       +
           fpath

     

       54
       +
           randomconv

     

       55
       +
           domain-name

     

       56
       +
         ];

     

       57
       +
       

     

       58
       +
         propagatedBuildInputs = [

     

       59
       +
           logs

     

       60
       +
           yojson

     

       61
       +
           lwt

     

       62
       +
           base64

     

       63
       +
           mirage-crypto

     

       64
       +
           mirage-crypto-pk

     

       65
       +
           asn1-combinators

     

       66
       +
           x509

     

       67
       +
           uri

     

       68
       +
           dns

     

       69
       +
           dns-tsig

     

       70
       +
           rresult

     

       71
       +
           astring

     

       72
       +
           cohttp-lwt

     

       73
       +
         ];

     

       74
       +
       

     

       75
       +
         doCheck = true;

     

       76
       +
         checkInputs = [ ounit ];

     

       77
       +
       

     

       78
       +
         meta = {

     

       79
       +
           description = "ACME implementation in OCaml";

     

       80
       +
           license = lib.licenses.bsd2;

     

       81
       +
           maintainers = [ lib.maintainers.sternenseemann ];

     

       82
       +
           homepage = "https://github.com/mmaker/ocaml-letsencrypt";

     

       83
       +
         };

     

       84
       +
       }

+2 -2

pkgs/development/ocaml-modules/mirage-crypto/default.nix

···

       7
        
         minimumOCamlVersion = "4.08";

     

       8
        
       

     

       9
        
         pname = "mirage-crypto";

     

       10
       -
         version = "0.10.0";

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";

     

       14
       -
           sha256 = "20915c53ddb658c53f588c414f13676bc8ad3cd734d9ed909225ea080dd8144d";

     

       15
        
         };

     

       16
        
       

     

       17
        
         useDune2 = true;

···

       7
        
         minimumOCamlVersion = "4.08";

     

       8
        
       

     

       9
        
         pname = "mirage-crypto";

     

       10
       +
         version = "0.10.1";

     

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";

     

       14
       +
           sha256 = "028e2fc1f0a3e9b06603c6a253ecd043100099bc1c12c0567d8bc46d3781499c";

     

       15
        
         };

     

       16
        
       

     

       17
        
         useDune2 = true;

+82

pkgs/development/ocaml-modules/paf/default.nix

···

       1
       +
       { buildDunePackage

     

       2
       +
       , lib

     

       3
       +
       , fetchurl

     

       4
       +
       , fetchpatch

     

       5
       +
       , mirage-stack

     

       6
       +
       , mirage-time

     

       7
       +
       , httpaf

     

       8
       +
       , tls-mirage

     

       9
       +
       , mimic

     

       10
       +
       , cohttp-lwt

     

       11
       +
       , letsencrypt

     

       12
       +
       , emile

     

       13
       +
       , ke

     

       14
       +
       , bigstringaf

     

       15
       +
       , domain-name

     

       16
       +
       , duration

     

       17
       +
       , faraday

     

       18
       +
       , ipaddr

     

       19
       +
       , tls

     

       20
       +
       , x509

     

       21
       +
       , lwt

     

       22
       +
       , logs

     

       23
       +
       , fmt

     

       24
       +
       , mirage-crypto-rng

     

       25
       +
       , tcpip

     

       26
       +
       , mirage-time-unix

     

       27
       +
       , ptime

     

       28
       +
       , uri

     

       29
       +
       , alcotest-lwt

     

       30
       +
       }:

     

       31
       +
       

     

       32
       +
       buildDunePackage rec {

     

       33
       +
         pname = "paf";

     

       34
       +
         version = "0.0.1";

     

       35
       +
       

     

       36
       +
         src = fetchurl {

     

       37
       +
           url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";

     

       38
       +
           sha256 = "7a794c21ce458bda302553b0f5ac128c067579fbb3b7b8fba9b410446c43e790";

     

       39
       +
         };

     

       40
       +
       

     

       41
       +
         useDune2 = true;

     

       42
       +
         minimumOCamlVersion = "4.08";

     

       43
       +
       

     

       44
       +
         propagatedBuildInputs = [

     

       45
       +
           mirage-stack

     

       46
       +
           mirage-time

     

       47
       +
           httpaf

     

       48
       +
           tls-mirage

     

       49
       +
           mimic

     

       50
       +
           cohttp-lwt

     

       51
       +
           letsencrypt

     

       52
       +
           emile

     

       53
       +
           ke

     

       54
       +
           bigstringaf

     

       55
       +
           domain-name

     

       56
       +
           ipaddr

     

       57
       +
           duration

     

       58
       +
           faraday

     

       59
       +
           tls

     

       60
       +
           x509

     

       61
       +
         ];

     

       62
       +
       

     

       63
       +
         doCheck = true;

     

       64
       +
         checkInputs = [

     

       65
       +
           lwt

     

       66
       +
           logs

     

       67
       +
           fmt

     

       68
       +
           mirage-crypto-rng

     

       69
       +
           tcpip

     

       70
       +
           mirage-time-unix

     

       71
       +
           ptime

     

       72
       +
           uri

     

       73
       +
           alcotest-lwt

     

       74
       +
         ];

     

       75
       +
       

     

       76
       +
         meta = {

     

       77
       +
           description = "HTTP/AF and MirageOS";

     

       78
       +
           license = lib.licenses.mit;

     

       79
       +
           maintainers = [ lib.maintainers.sternenseemann ];

     

       80
       +
           homepage = "https://github.com/dinosaure/paf-le-chien";

     

       81
       +
         };

     

       82
       +
       }

-2

pkgs/development/python-modules/karton-mwdb-reporter/default.nix

···

       1
        
       { lib

     

       2
        
       , buildPythonPackage

     

       3
       -
       , chardet

     

       4
        
       , fetchFromGitHub

     

       5
        
       , karton-core

     

       6
        
       , mwdblib

     

       7
       -
       , python

     

       8
        
       }:

     

       9
        
       

     

       10
        
       buildPythonPackage rec {

···

       1
        
       { lib

     

       2
        
       , buildPythonPackage

     

       0
        
       
     

       3
        
       , fetchFromGitHub

     

       4
        
       , karton-core

     

       5
        
       , mwdblib

     

       0
        
       
     

       6
        
       }:

     

       7
        
       

     

       8
        
       buildPythonPackage rec {

+4 -2

pkgs/development/python-modules/sagemaker/default.nix

···

       10
        
       , protobuf3-to-dict

     

       11
        
       , smdebug-rulesconfig

     

       12
        
       , pandas

     

       0
        
       
     

       13
        
       , packaging

     

       14
        
       }:

     

       15
        
       

     

       16
        
       buildPythonPackage rec {

     

       17
        
         pname = "sagemaker";

     

       18
       -
         version = "2.37.0";

     

       19
        
       

     

       20
        
         src = fetchPypi {

     

       21
        
           inherit pname version;

     

       22
       -
           sha256 = "sha256-96RDi32NHfhFvPeVRhG32EDQJTiwOXEwtSmFZGVBVk0=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         pythonImportsCheck = [

     
···

       34
        
           importlib-metadata

     

       35
        
           numpy

     

       36
        
           packaging

     

       0
        
       
     

       37
        
           protobuf

     

       38
        
           protobuf3-to-dict

     

       39
        
           smdebug-rulesconfig

···

       10
        
       , protobuf3-to-dict

     

       11
        
       , smdebug-rulesconfig

     

       12
        
       , pandas

     

       13
       +
       , pathos

     

       14
        
       , packaging

     

       15
        
       }:

     

       16
        
       

     

       17
        
       buildPythonPackage rec {

     

       18
        
         pname = "sagemaker";

     

       19
       +
         version = "2.38.0";

     

       20
        
       

     

       21
        
         src = fetchPypi {

     

       22
        
           inherit pname version;

     

       23
       +
           sha256 = "sha256-7cIGr49fKI0zQmX4/9v/gW5yB4kfeQJ3H/Vvgl9CKuY=";

     

       24
        
         };

     

       25
        
       

     

       26
        
         pythonImportsCheck = [

     
···

       35
        
           importlib-metadata

     

       36
        
           numpy

     

       37
        
           packaging

     

       38
       +
           pathos

     

       39
        
           protobuf

     

       40
        
           protobuf3-to-dict

     

       41
        
           smdebug-rulesconfig

+2 -2

pkgs/development/tools/build-managers/sbt/default.nix

···

       8
        
       

     

       9
        
       stdenv.mkDerivation rec {

     

       10
        
         pname = "sbt";

     

       11
       -
         version = "1.5.0";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";

     

       15
       -
           sha256 = "1dj241cj3v8kzqnz5s499rijpl7wv4rw171swqnc0xza90513pxa";

     

       16
        
         };

     

       17
        
       

     

       18
        
         postPatch = ''

···

       8
        
       

     

       9
        
       stdenv.mkDerivation rec {

     

       10
        
         pname = "sbt";

     

       11
       +
         version = "1.5.1";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";

     

       15
       +
           sha256 = "0dsbqipr549awv584fyl227s1gknlpsf5krp990w7w3bbxl3avb7";

     

       16
        
         };

     

       17
        
       

     

       18
        
         postPatch = ''

-61

pkgs/servers/jellyfin/10.5.x.nix

···

       1
       -
       { stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg,

     

       2
       -
         fontconfig, freetype, nixosTests }:

     

       3
       -
       

     

       4
       -
       let

     

       5
       -
         os = if stdenv.isDarwin then "osx" else "linux";

     

       6
       -
         arch =

     

       7
       -
           with stdenv.hostPlatform;

     

       8
       -
           if isx86_32 then "x86"

     

       9
       -
           else if isx86_64 then "x64"

     

       10
       -
           else if isAarch32 then "arm"

     

       11
       -
           else if isAarch64 then "arm64"

     

       12
       -
           else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown";

     

       13
       -
         musl = lib.optionalString stdenv.hostPlatform.isMusl

     

       14
       -
           (if (arch != "x64")

     

       15
       -
             then lib.warn "Some image processing features might be unavailable for non x86-64 with Musl" "musl-"

     

       16
       -
             else "musl-");

     

       17
       -
         runtimeDir = "${os}-${musl}${arch}";

     

       18
       -
       

     

       19
       -
       in stdenv.mkDerivation rec {

     

       20
       -
         pname = "jellyfin";

     

       21
       -
         version = "10.5.5";

     

       22
       -
       

     

       23
       -
         # Impossible to build anything offline with dotnet

     

       24
       -
         src = fetchurl {

     

       25
       -
           url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";

     

       26
       -
           sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27";

     

       27
       -
         };

     

       28
       -
       

     

       29
       -
         nativeBuildInputs = [ unzip ];

     

       30
       -
         buildInputs = [

     

       31
       -
           makeWrapper

     

       32
       -
         ];

     

       33
       -
       

     

       34
       -
         propagatedBuildInputs = [

     

       35
       -
           dotnetCorePackages.aspnetcore_3_1

     

       36
       -
           sqlite

     

       37
       -
         ];

     

       38
       -
       

     

       39
       -
         preferLocalBuild = true;

     

       40
       -
       

     

       41
       -
         installPhase = ''

     

       42
       -
           install -dm 755 "$out/opt/jellyfin"

     

       43
       -
           cp -r * "$out/opt/jellyfin"

     

       44
       -
           makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \

     

       45
       -
             --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [

     

       46
       -
               sqlite fontconfig freetype stdenv.cc.cc.lib

     

       47
       -
             ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \

     

       48
       -
             --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg"

     

       49
       -
         '';

     

       50
       -
       

     

       51
       -
         passthru.tests = {

     

       52
       -
           smoke-test = nixosTests.jellyfin;

     

       53
       -
         };

     

       54
       -
       

     

       55
       -
         meta =  with lib; {

     

       56
       -
           description = "The Free Software Media System";

     

       57
       -
           homepage = "https://jellyfin.org/";

     

       58
       -
           license = licenses.gpl2;

     

       59
       -
           maintainers = with maintainers; [ nyanloutre minijackson ];

     

       60
       -
         };

     

       61
       -
       }

pkgs/stdenv/generic/check-meta.nix

···

       203
        
         metaTypes = with lib.types; rec {

     

       204
        
           # These keys are documented

     

       205
        
           description = str;

     

       0
        
       
     

       206
        
           longDescription = str;

     

       207
        
           branch = str;

     

       208
        
           homepage = either (listOf str) str;

···

       203
        
         metaTypes = with lib.types; rec {

     

       204
        
           # These keys are documented

     

       205
        
           description = str;

     

       206
       +
           mainProgram = str;

     

       207
        
           longDescription = str;

     

       208
        
           branch = str;

     

       209
        
           homepage = either (listOf str) str;

+10

pkgs/stdenv/generic/make-derivation.nix

···

       89
        
       

     

       90
        
           , patches ? []

     

       91
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       92
        
           , ... } @ attrs:

     

       93
        
       

     

       94
        
           let

     
···

       253
        
                 inherit doCheck doInstallCheck;

     

       254
        
       

     

       255
        
                 inherit outputs;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       256
        
               } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {

     

       257
        
                 cmakeFlags =

     

       258
        
                   (/**/ if lib.isString cmakeFlags then [cmakeFlags]

···

       89
        
       

     

       90
        
           , patches ? []

     

       91
        
       

     

       92
       +
           , __contentAddressed ?

     

       93
       +
             (! attrs ? outputHash) # Fixed-output drvs can't be content addressed too

     

       94
       +
             && (config.contentAddressedByDefault or false)

     

       95
       +
       

     

       96
        
           , ... } @ attrs:

     

       97
        
       

     

       98
        
           let

     
···

       257
        
                 inherit doCheck doInstallCheck;

     

       258
        
       

     

       259
        
                 inherit outputs;

     

       260
       +
               } // lib.optionalAttrs (__contentAddressed) {

     

       261
       +
                 inherit __contentAddressed;

     

       262
       +
                 # Provide default values for outputHashMode and outputHashAlgo because

     

       263
       +
                 # most people won't care about these anyways

     

       264
       +
                 outputHashAlgo = attrs.outputHashAlgo or "sha256";

     

       265
       +
                 outputHashMode = attrs.outputHashMode or "recursive";

     

       266
        
               } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {

     

       267
        
                 cmakeFlags =

     

       268
        
                   (/**/ if lib.isString cmakeFlags then [cmakeFlags]

+26

pkgs/tools/misc/semiphemeral/default.nix

···

       1
       +
       { lib

     

       2
       +
       , python3

     

       3
       +
       }:

     

       4
       +
       

     

       5
       +
       python3.pkgs.buildPythonApplication rec {

     

       6
       +
         pname = "semiphemeral";

     

       7
       +
         version = "0.6";

     

       8
       +
       

     

       9
       +
         src = python3.pkgs.fetchPypi {

     

       10
       +
           inherit pname version;

     

       11
       +
           sha256 = "c90d73b14c826f262b1339d1f5926c5abc6431181090ea87177af821c0866fb7";

     

       12
       +
         };

     

       13
       +
       

     

       14
       +
         doCheck = false; # upstream has no tests

     

       15
       +
       

     

       16
       +
         pythonImportsCheck = [ "semiphemeral" ];

     

       17
       +
       

     

       18
       +
         propagatedBuildInputs = with python3.pkgs; [ click sqlalchemy flask tweepy colorama ];

     

       19
       +
       

     

       20
       +
         meta = with lib; {

     

       21
       +
           description = "Automatically delete your old tweets, except for the ones you want to keep";

     

       22
       +
           homepage = "https://github.com/micahflee/semiphemeral";

     

       23
       +
           license = licenses.mit;

     

       24
       +
           maintainers = with maintainers; [ amanjeev ];

     

       25
       +
         };

     

       26
       +
       }

+3 -3

pkgs/tools/networking/innernet/default.nix

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "innernet";

     

       5
       -
         version = "1.1.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "tonarino";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-OomCSA02ypFVzkYMcmkFREWB6x7oxgpt7x2zRANIDMw=";

     

       12
        
         };

     

       13
        
         LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

     

       14
        
       

     

       15
        
         nativeBuildInputs = with llvmPackages; [ llvm clang ];

     

       16
        
         buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ];

     

       17
       -
         cargoSha256 = "sha256-GYNk3j8fjKSo3Qk6Qy0l6kNINK3FxlSYoEkJSx7kVpk=";

     

       18
        
       

     

       19
        
         meta = with lib; {

     

       20
        
           description = "A private network system that uses WireGuard under the hood";

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "innernet";

     

       5
       +
         version = "1.2.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "tonarino";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-Z4F5RYPVgFiiDBg6lxILjAh/a/rL7IJBqHIJ/tQyLnE=";

     

       12
        
         };

     

       13
        
         LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

     

       14
        
       

     

       15
        
         nativeBuildInputs = with llvmPackages; [ llvm clang ];

     

       16
        
         buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ];

     

       17
       +
         cargoSha256 = "sha256-WSkN5aXMgfqZJAV1b3elF7kwf2f5OpcntKSf8620YcY=";

     

       18
        
       

     

       19
        
         meta = with lib; {

     

       20
        
           description = "A private network system that uses WireGuard under the hood";

+7 -7

pkgs/tools/networking/zerotierone/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "zerotierone";

     

       5
       -
         version = "1.6.4";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "zerotier";

     

       9
        
           repo = "ZeroTierOne";

     

       10
        
           rev = version;

     

       11
       -
           sha256 = "06b6k1rzqkd7cdl7n0gz5ky48fs2nhn0q2qxx1rww38vbfc7lpmf";

     

       12
        
         };

     

       13
        
       

     

       14
        
         preConfigure = ''

     

       15
       -
             patchShebangs ./doc/build.sh

     

       16
       -
             substituteInPlace ./doc/build.sh \

     

       17
       -
               --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \

     

       18
        
       

     

       19
       -
             substituteInPlace ./make-linux.mk \

     

       20
       -
               --replace 'armv5' 'armv6'

     

       21
        
         '';

     

       22
        
       

     

       23

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "zerotierone";

     

       5
       +
         version = "1.6.5";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "zerotier";

     

       9
        
           repo = "ZeroTierOne";

     

       10
        
           rev = version;

     

       11
       +
           sha256 = "0dlnrb59vnxa3pjkgfqd5jil9kl6axh23v0bffi4kx8jwzpdwas8";

     

       12
        
         };

     

       13
        
       

     

       14
        
         preConfigure = ''

     

       15
       +
           patchShebangs ./doc/build.sh

     

       16
       +
           substituteInPlace ./doc/build.sh \

     

       17
       +
             --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \

     

       18
        
       

     

       19
       +
           substituteInPlace ./make-linux.mk \

     

       20
       +
             --replace 'armv5' 'armv6'

     

       21
        
         '';

     

       22
        
       

     

       23

+2 -2

pkgs/tools/virtualization/govc/default.nix

···

       2
        
       

     

       3
        
       buildGoPackage rec {

     

       4
        
         pname = "govc";

     

       5
       -
         version = "0.24.1";

     

       6
        
       

     

       7
        
         goPackagePath = "github.com/vmware/govmomi";

     

       8
        
       

     
···

       12
        
           rev = "v${version}";

     

       13
        
           owner = "vmware";

     

       14
        
           repo = "govmomi";

     

       15
       -
           sha256 = "sha256-D2UrYdjstOxx9EAdBtAC44khp8hRf6W3+6kzytUVnOo=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         meta = {

···

       2
        
       

     

       3
        
       buildGoPackage rec {

     

       4
        
         pname = "govc";

     

       5
       +
         version = "0.25.0";

     

       6
        
       

     

       7
        
         goPackagePath = "github.com/vmware/govmomi";

     

       8
        
       

     
···

       12
        
           rev = "v${version}";

     

       13
        
           owner = "vmware";

     

       14
        
           repo = "govmomi";

     

       15
       +
           sha256 = "sha256-Ri8snbmgcAZmdumKzBl3P6gf/eZgwdgg7V+ijyeZjks=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         meta = {

pkgs/top-level/aliases.nix

···

       337
        
         kodiGBM = kodi-gbm;

     

       338
        
         kodiPlain = kodi;

     

       339
        
         kodiPlainWayland = kodi-wayland;

     

       0
        
       
     

       340
        
         julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15

     

       341
        
         julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15

     

       342
        
         kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11

···

       337
        
         kodiGBM = kodi-gbm;

     

       338
        
         kodiPlain = kodi;

     

       339
        
         kodiPlainWayland = kodi-wayland;

     

       340
       +
         jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26

     

       341
        
         julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15

     

       342
        
         julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15

     

       343
        
         kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11

+2 -2

pkgs/top-level/all-packages.nix

···

       2697
        
       

     

       2698
        
         jellyfin = callPackage ../servers/jellyfin { };

     

       2699
        
       

     

       2700
       -
         jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { };

     

       2701
       -
       

     

       2702
        
         jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player {

     

       2703
        
           inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;

     

       2704
        
         };

     
···

       25814
        
         seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };

     

       25815
        
       

     

       25816
        
         secretscanner = callPackage ../tools/security/secretscanner { };

     

       0
        
       
     

       0
        
       
     

       25817
        
       

     

       25818
        
         sent = callPackage ../applications/misc/sent { };

     

       25819

···

       2697
        
       

     

       2698
        
         jellyfin = callPackage ../servers/jellyfin { };

     

       2699
        
       

     

       0
        
       
     

       0
        
       
     

       2700
        
         jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player {

     

       2701
        
           inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;

     

       2702
        
         };

     
···

       25812
        
         seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };

     

       25813
        
       

     

       25814
        
         secretscanner = callPackage ../tools/security/secretscanner { };

     

       25815
       +
       

     

       25816
       +
         semiphemeral = callPackage ../tools/misc/semiphemeral { };

     

       25817
        
       

     

       25818
        
         sent = callPackage ../applications/misc/sent { };

     

       25819

pkgs/top-level/ocaml-packages.nix

···

       579
        
       

     

       580
        
           lens = callPackage ../development/ocaml-modules/lens { };

     

       581
        
       

     

       0
        
       
     

       0
        
       
     

       582
        
           linenoise = callPackage ../development/ocaml-modules/linenoise { };

     

       583
        
       

     

       584
        
           llvm = callPackage ../development/ocaml-modules/llvm {

     
···

       940
        
           ounit = callPackage ../development/ocaml-modules/ounit { };

     

       941
        
       

     

       942
        
           ounit2 = callPackage ../development/ocaml-modules/ounit2 { };

     

       0
        
       
     

       0
        
       
     

       943
        
       

     

       944
        
           parse-argv = callPackage ../development/ocaml-modules/parse-argv { };

     

       945

···

       579
        
       

     

       580
        
           lens = callPackage ../development/ocaml-modules/lens { };

     

       581
        
       

     

       582
       +
           letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { };

     

       583
       +
       

     

       584
        
           linenoise = callPackage ../development/ocaml-modules/linenoise { };

     

       585
        
       

     

       586
        
           llvm = callPackage ../development/ocaml-modules/llvm {

     
···

       942
        
           ounit = callPackage ../development/ocaml-modules/ounit { };

     

       943
        
       

     

       944
        
           ounit2 = callPackage ../development/ocaml-modules/ounit2 { };

     

       945
       +
       

     

       946
       +
           paf = callPackage ../development/ocaml-modules/paf { };

     

       947
        
       

     

       948
        
           parse-argv = callPackage ../development/ocaml-modules/parse-argv { };

     

       949