commit fd893034cb551b8ac5d5f6cff7383b71af51386f · pyrox.dev/nixpkgs

+1

nixos/tests/all-tests.nix

···

       485
       485
        
         opensmtpd = handleTest ./opensmtpd.nix {};

     

       486
       486
        
         opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {};

     

       487
       487
        
         openssh = handleTest ./openssh.nix {};

     

       488
       488
       +
         octoprint = handleTest ./octoprint.nix {};

     

       488
       489
        
         openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};

     

       489
       490
        
         openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};

     

       490
       491
        
         opentabletdriver = handleTest ./opentabletdriver.nix {};

+61

nixos/tests/octoprint.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         apikey = "testapikey";

     

       5
       5
       +
       in

     

       6
       6
       +
       {

     

       7
       7
       +
         name = "octoprint";

     

       8
       8
       +
         meta.maintainers = with lib.maintainers; [ gador ];

     

       9
       9
       +
       

     

       10
       10
       +
         nodes.machine = { pkgs, ... }: {

     

       11
       11
       +
           environment.systemPackages = with pkgs; [ jq ];

     

       12
       12
       +
           services.octoprint = {

     

       13
       13
       +
             enable = true;

     

       14
       14
       +
             extraConfig = {

     

       15
       15
       +
               server = {

     

       16
       16
       +
                 firstRun = false;

     

       17
       17
       +
               };

     

       18
       18
       +
               api = {

     

       19
       19
       +
                 enabled = true;

     

       20
       20
       +
                 key = apikey;

     

       21
       21
       +
               };

     

       22
       22
       +
               plugins = {

     

       23
       23
       +
                 # these need internet access and pollute the output with connection failed errors

     

       24
       24
       +
                 _disabled = [ "softwareupdate" "announcements" "pluginmanager" ];

     

       25
       25
       +
               };

     

       26
       26
       +
             };

     

       27
       27
       +
           };

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         testScript = ''

     

       31
       31
       +
           import json

     

       32
       32
       +
       

     

       33
       33
       +
           @polling_condition

     

       34
       34
       +
           def octoprint_running():

     

       35
       35
       +
               machine.succeed("pgrep octoprint")

     

       36
       36
       +
       

     

       37
       37
       +
           with subtest("Wait for octoprint service to start"):

     

       38
       38
       +
               machine.wait_for_unit("octoprint.service")

     

       39
       39
       +
               machine.wait_until_succeeds("pgrep octoprint")

     

       40
       40
       +
       

     

       41
       41
       +
           with subtest("Wait for final boot"):

     

       42
       42
       +
               # this appears whe octoprint is almost finished starting

     

       43
       43
       +
               machine.wait_for_file("/var/lib/octoprint/uploads")

     

       44
       44
       +
       

     

       45
       45
       +
           # octoprint takes some time to start. This makes sure we'll retry just in case it takes longer

     

       46
       46
       +
           # retry-all-errors in necessary, since octoprint will report a 404 error when not yet ready

     

       47
       47
       +
           curl_cmd = "curl --retry-all-errors --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 \

     

       48
       48
       +
                       --retry-max-time 40 -X GET --header 'X-API-Key: ${apikey}' "

     

       49
       49
       +
       

     

       50
       50
       +
           # used to fail early, in case octoprint first starts and then crashes

     

       51
       51
       +
           with octoprint_running: # type: ignore[union-attr]

     

       52
       52
       +
               with subtest("Check for web interface"):

     

       53
       53
       +
                   machine.wait_until_succeeds("curl -s localhost:5000")

     

       54
       54
       +
       

     

       55
       55
       +
               with subtest("Check API"):

     

       56
       56
       +
                   version = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/version"))

     

       57
       57
       +
                   server = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/server"))

     

       58
       58
       +
                   assert version["server"] == str("${pkgs.octoprint.version}")

     

       59
       59
       +
                   assert server["safemode"] == None

     

       60
       60
       +
         '';

     

       61
       61
       +
       })

+2 -2

pkgs/applications/misc/crow-translate/default.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "crow-translate";

     

       22
       22
       -
         version = "2.10.1";

     

       22
       22
       +
         version = "2.10.3";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchzip {

     

       25
       25
        
           url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";

     

       26
       26
       -
           hash = "sha256-xRXNT/IybcynS5S71XFFsx3PoLXDBcKuz81ybxoVtV4=";

     

       26
       26
       +
           hash = "sha256-K6mYzR4EIBHd0w/6Dpx4ldX4iDFszmfSLT6jNTfJlDQ=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         patches = [

+19

pkgs/applications/misc/octoprint/default.nix

···

       5
       5
        
       , python3

     

       6
       6
        
       , substituteAll

     

       7
       7
        
       , nix-update-script

     

       8
       8
       +
       , nixosTests

     

       8
       9
        
         # To include additional plugins, pass them here as an overlay.

     

       9
       10
        
       , packageOverrides ? self: super: { }

     

       10
       11
        
       }:

     
···

       14
       15
        
           self = py;

     

       15
       16
        
           packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (

     

       16
       17
        
             [

     

       18
       18
       +
               (

     

       19
       19
       +
                 # with version 3 of flask-limiter octoprint 1.8.6 fails to start with

     

       20
       20
       +
                 #  TypeError: Limiter.__init__() got multiple values for argument 'key_func'

     

       21
       21
       +
                 self: super: {

     

       22
       22
       +
                   flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec {

     

       23
       23
       +
                     version = "2.6.2";

     

       24
       24
       +
                     src = fetchFromGitHub {

     

       25
       25
       +
                       owner = "alisaifee";

     

       26
       26
       +
                       repo = "flask-limiter";

     

       27
       27
       +
                       rev = version;

     

       28
       28
       +
                       sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew=";

     

       29
       29
       +
                     };

     

       30
       30
       +
                   });

     

       31
       31
       +
                 }

     

       32
       32
       +
               )

     

       17
       33
        
               # Built-in dependency

     

       18
       34
        
               (

     

       19
       35
        
                 self: super: {

     
···

       202
       218
        
                     passthru = {

     

       203
       219
        
                       python = self.python;

     

       204
       220
        
                       updateScript = nix-update-script { };

     

       221
       221
       +
                       tests = {

     

       222
       222
       +
                         inherit (nixosTests) octoprint;

     

       223
       223
       +
                       };

     

       205
       224
        
                     };

     

       206
       225
        
       

     

       207
       226
        
                     meta = with lib; {

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "talosctl";

     

       5
       5
       -
         version = "1.3.2";

     

       5
       5
       +
         version = "1.3.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "siderolabs";

     

       9
       9
        
           repo = "talos";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           hash = "sha256-o037LemAZhsHVIfAU0yVoNNbJ6g8ehlA4lFLN78Q8dY=";

     

       11
       11
       +
           hash = "sha256-tkgWrNew0dLBPQ2G96RdFoFDyPm4nOwgkkH/3DpBnRg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-HPuVDfVxbHbNaCRg/D4VeW0finbFB4eageiAzoax1wk=";

     

       14
       14
       +
         vendorHash = "sha256-mFuXRMIzEf4bx9jnQlFwFBpBDVXQ99jz2OGojp1EEh0=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [ "-s" "-w" ];

     

       17
       17

+2 -2

pkgs/applications/version-management/lefthook/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "lefthook";

     

       5
       5
       -
         version = "1.2.7";

     

       5
       5
       +
         version = "1.2.8";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           rev = "v${version}";

     

       9
       9
        
           owner = "evilmartians";

     

       10
       10
        
           repo = "lefthook";

     

       11
       11
       -
           sha256 = "sha256-bsPTOv1s/kU6UUxmmPpYC5Y9/YeR6LnuL09j1x5e3Es=";

     

       11
       11
       +
           sha256 = "sha256-hW3zKco0c90eIwWefHLABAZGUc2fGHsGnyPaSa/zGuQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI=";

+6 -5

pkgs/applications/video/mpv/default.nix

···

       80
       80
        
       let

     

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

     

       82
       82
        
         luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);

     

       83
       83
       -
       in stdenv.mkDerivation rec {

     

       83
       83
       +
       in stdenv.mkDerivation (self: {

     

       84
       84
        
         pname = "mpv";

     

       85
       85
       -
         version = "0.35.0";

     

       85
       85
       +
         version = "0.35.1";

     

       86
       86
        
       

     

       87
       87
        
         outputs = [ "out" "dev" "man" ];

     

       88
       88
        
       

     

       89
       89
        
         src = fetchFromGitHub {

     

       90
       90
        
           owner = "mpv-player";

     

       91
       91
        
           repo = "mpv";

     

       92
       92
       -
           rev = "v${version}";

     

       93
       93
       -
           sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o=";

     

       92
       92
       +
           rev = "v${self.version}";

     

       93
       93
       +
           sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM=";

     

       94
       94
        
         };

     

       95
       95
        
       

     

       96
       96
        
         postPatch = ''

     
···

       216
       216
        
             mpv is a free and open-source general-purpose video player, based on the

     

       217
       217
        
             MPlayer and mplayer2 projects, with great improvements above both.

     

       218
       218
        
           '';

     

       219
       219
       +
           changelog = "https://github.com/mpv-player/mpv/releases/tag/v${self.version}";

     

       219
       220
        
           license = licenses.gpl2Plus;

     

       220
       221
        
           maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ];

     

       221
       222
        
           platforms = platforms.unix;

     

       222
       223
        
         };

     

       223
       223
       -
       }

     

       224
       224
       +
       })

-1

pkgs/data/fonts/cozette/default.nix

···

       12
       12
        
         installPhase = ''

     

       13
       13
        
           runHook preInstall

     

       14
       14
        
       

     

       15
       15
       -
           mkdir -p $out/share/fonts

     

       16
       15
        
           install -Dm644 *.ttf -t $out/share/fonts/truetype

     

       17
       16
        
           install -Dm644 *.otf -t $out/share/fonts/opentype

     

       18
       17
        
           install -Dm644 *.bdf -t $out/share/fonts/misc

-1

pkgs/data/fonts/d2coding/default.nix

···

       13
       13
        
         installPhase = ''

     

       14
       14
        
           runHook preInstall

     

       15
       15
        
       

     

       16
       16
       -
           mkdir -p $out/share/fonts

     

       17
       16
        
           install -Dm644 */*-all.ttc -t $out/share/fonts/truetype/

     

       18
       17
        
       

     

       19
       18
        
           runHook postInstall

-1

pkgs/data/fonts/eb-garamond/default.nix

···

       12
       12
        
         installPhase = ''

     

       13
       13
        
           runHook preInstall

     

       14
       14
        
       

     

       15
       15
       -
           mkdir -p $out/share/{doc,fonts}

     

       16
       15
        
           install -Dm644 otf/*.otf                                 -t $out/share/fonts/opentype

     

       17
       16
        
           install -Dm644 Changes README.markdown README.xelualatex -t $out/share/doc/${pname}-${version}

     

       18
       17

+1 -2

pkgs/data/fonts/fira-code/default.nix

···

       14
       14
        
         installPhase = ''

     

       15
       15
        
           runHook preInstall

     

       16
       16
        
       

     

       17
       17
       -
           mkdir -p $out/share/fonts

     

       18
       18
       -
           cp variable_ttf/*-VF.ttf $out/share/fonts/truetype

     

       17
       17
       +
           install -Dm644 variable_ttf/*-VF.ttf -t $out/share/fonts/truetype

     

       19
       18
        
       

     

       20
       19
        
           runHook postInstall

     

       21
       20
        
         '';

-1

pkgs/data/fonts/gentium-book-basic/default.nix

···

       12
       12
        
         installPhase = ''

     

       13
       13
        
           runHook preInstall

     

       14
       14
        
       

     

       15
       15
       -
           mkdir -p $out/share/{doc,fonts}

     

       16
       15
        
           install -Dm644 *.ttf                       -t $out/share/fonts/truetype

     

       17
       16
        
           install -Dm644 FONTLOG.txt GENTIUM-FAQ.txt -t $out/share/doc/${pname}-${version}

     

       18
       17

-1

pkgs/data/fonts/hanazono/default.nix

···

       13
       13
        
         installPhase = ''

     

       14
       14
        
           runHook preInstall

     

       15
       15
        
       

     

       16
       16
       -
           mkdir -p $out/share/{doc,fonts}

     

       17
       16
        
           install -Dm644 *.ttf -t $out/share/fonts/truetype

     

       18
       17
        
           install -Dm644 *.txt -t $out/share/doc/hanazono

     

       19
       18

+1 -2

pkgs/data/fonts/wqy-zenhei/default.nix

···

       12
       12
        
         installPhase = ''

     

       13
       13
        
           runHook preInstall

     

       14
       14
        
       

     

       15
       15
       -
           mkdir -p $out/share/fonts

     

       16
       16
       -
           install -m644 *.ttc $out/share/fonts/

     

       15
       15
       +
           install -Dm644 *.ttc -t $out/share/fonts/

     

       17
       16
        
       

     

       18
       17
        
           runHook postInstall

     

       19
       18
        
         '';

+2 -4

pkgs/data/misc/colemak-dh/default.nix

···

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "ColemakMods";

     

       12
       12
       -
           repo  = "mod-dh";

     

       12
       12
       +
           repo = "mod-dh";

     

       13
       13
        
           rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09";

     

       14
       14
       -
           sha256  = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks=";

     

       14
       14
       +
           sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks=";

     

       15
       15
        
           sparseCheckout = [ "console" ];

     

       16
       16
        
         };

     

       17
       17
       -
       

     

       18
       18
       -
         phases = [ "unpackPhase" "installPhase" ];

     

       19
       17
        
       

     

       20
       18
        
         installPhase = ''

     

       21
       19
        
           runHook preInstall

+2 -2

pkgs/development/libraries/belle-sip/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "belle-sip";

     

       14
       14
       -
         version = "5.1.55";

     

       14
       14
       +
         version = "5.2.16";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitLab {

     

       17
       17
        
           domain = "gitlab.linphone.org";

     
···

       19
       19
        
           group = "BC";

     

       20
       20
        
           repo = pname;

     

       21
       21
        
           rev = version;

     

       22
       22
       -
           sha256 = "sha256-wMf570/RP2Q4yluedECs+AKoH92PQQ8yVY+eBGGSAP4=";

     

       22
       22
       +
           sha256 = "sha256-LMbQz22ENTT27jr9tGakzNjidC5nfCuLDMZ6sFwtRKI=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/libraries/igraph/default.nix

···

       26
       26
        
       

     

       27
       27
        
       stdenv.mkDerivation rec {

     

       28
       28
        
         pname = "igraph";

     

       29
       29
       -
         version = "0.10.3";

     

       29
       29
       +
         version = "0.10.4";

     

       30
       30
        
       

     

       31
       31
        
         src = fetchFromGitHub {

     

       32
       32
        
           owner = "igraph";

     

       33
       33
        
           repo = pname;

     

       34
       34
        
           rev = version;

     

       35
       35
       -
           hash = "sha256-+U8bo68Q6XX3p2sZiIChjidcRwA10gv9eWccRt4MoYM=";

     

       35
       35
       +
           hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/google-cloud-resource-manager/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "google-cloud-resource-manager";

     

       16
       16
       -
         version = "1.8.0";

     

       16
       16
       +
         version = "1.8.1";

     

       17
       17
        
         format = "setuptools";

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.6";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           inherit pname version;

     

       23
       23
       -
           hash = "sha256-O1g8NcpvQn+3eyD1yqZ43aM6+eubVQGzLAt9DuI2Aqc=";

     

       23
       23
       +
           hash = "sha256-npTv+f533JK/J2ceJ6Na7mS90HfKaHORmGnFz1LBzLQ=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+5 -3

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "igraph";

     

       13
       13
       -
         version = "0.10.3";

     

       13
       13
       +
         version = "0.10.4";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.7";

     

       16
       16
       +
       

     

       17
       17
       +
         format = "setuptools";

     

       16
       18
        
       

     

       17
       19
        
         src = fetchFromGitHub {

     

       18
       20
        
           owner = "igraph";

     

       19
       21
        
           repo = "python-igraph";

     

       20
       20
       -
           rev = version;

     

       21
       21
       -
           hash = "sha256-j7c1CtZ796EYMsS11kd8YED7pPolskgT+611uvePTsA=";

     

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

     

       23
       23
       +
           hash = "sha256-DR4D12J/BKFpF4hMHfitNmwDZ7UEo+pI0tvEa1T5GTY=";

     

       22
       24
        
         };

     

       23
       25
        
       

     

       24
       26
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/pytest-subprocess/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "pytest-subprocess";

     

       16
       16
       -
         version = "1.4.2";

     

       16
       16
       +
         version = "1.5.0";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.6";

     

       19
       19
        
       

     
···

       21
       21
        
           owner = "aklajnert";

     

       22
       22
        
           repo = "pytest-subprocess";

     

       23
       23
        
           rev = "refs/tags/${version}";

     

       24
       24
       -
           hash = "sha256-8Of3/RltijfF5MXtVazGzIqpmRIhreT26kLNjzXLF1k=";

     

       24
       24
       +
           hash = "sha256-u9d9RhbikOyknMWs18j2efYJb9YdHsQrp31LfcbudoA=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         buildInputs = [

+2

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

···

       25
       25
        
               hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4=";

     

       26
       26
        
             })

     

       27
       27
        
           ];

     

       28
       28
       +
           # valgrind_unittest failed

     

       29
       29
       +
           cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ];

     

       28
       30
        
         });

     

       29
       31
        
       in buildPythonPackage rec {

     

       30
       32
        
         version = "1.9";

+3 -3

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "servefile";

     

       12
       12
       -
         version = "0.5.3";

     

       12
       12
       +
         version = "0.5.4";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "sebageek";

     

       16
       16
        
           repo = pname;

     

       17
       17
       -
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "sha256-/ZEMZIH/ImuZ2gh5bwB0FlaWnG/ELxfBGEJ2SuNSEb8=";

     

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

     

       18
       18
       +
           sha256 = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ pyopenssl ];

+2 -2

pkgs/development/python-modules/tensorflow/bin.nix

···

       18
       18
        
       , wheel

     

       19
       19
        
       , opt-einsum

     

       20
       20
        
       , backports_weakref

     

       21
       21
       -
       , tensorflow-estimator

     

       21
       21
       +
       , tensorflow-estimator-bin

     

       22
       22
        
       , tensorboard

     

       23
       23
        
       , cudaSupport ? false

     

       24
       24
        
       , cudaPackages ? {}

     
···

       76
       76
        
           opt-einsum

     

       77
       77
        
           google-pasta

     

       78
       78
        
           wrapt

     

       79
       79
       -
           tensorflow-estimator

     

       79
       79
       +
           tensorflow-estimator-bin

     

       80
       80
        
           tensorboard

     

       81
       81
        
           keras-applications

     

       82
       82
        
           keras-preprocessing

+3 -3

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

···

       6
       6
        
       , numpy, tensorboard, absl-py

     

       7
       7
        
       , packaging, setuptools, wheel, keras, keras-preprocessing, google-pasta

     

       8
       8
        
       , opt-einsum, astunparse, h5py

     

       9
       9
       -
       , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator

     

       9
       9
       +
       , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator-bin

     

       10
       10
        
       , dill, flatbuffers-python, portpicker, tblib, typing-extensions

     

       11
       11
        
       # Common deps

     

       12
       12
        
       , git, pybind11, which, binutils, glibcLocales, cython, perl, coreutils

     
···

       98
       98
        
             six

     

       99
       99
        
             tblib

     

       100
       100
        
             tensorboard

     

       101
       101
       -
             tensorflow-estimator

     

       101
       101
       +
             tensorflow-estimator-bin

     

       102
       102
        
             termcolor

     

       103
       103
        
             typing-extensions

     

       104
       104
        
             wheel

     
···

       479
       479
        
           packaging

     

       480
       480
        
           protobuf-python

     

       481
       481
        
           six

     

       482
       482
       -
           tensorflow-estimator

     

       482
       482
       +
           tensorflow-estimator-bin

     

       483
       483
        
           termcolor

     

       484
       484
        
           typing-extensions

     

       485
       485
        
           wrapt

+2 -2

pkgs/development/python-modules/types-docutils/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "types-docutils";

     

       8
       8
       -
         version = "0.19.1.1";

     

       8
       8
       +
         version = "0.19.1.2";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           hash = "sha256-vgpRuhx90hXZ0t9m1oReY8EAm0u/TFvrh6DZdFzbqWI=";

     

       13
       13
       +
           hash = "sha256-yj0hNUhK21LdBCu929bt3LvajGCLo/Xl+Qi9VI/8s5k=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # Module doesn't have tests

+2 -2

pkgs/development/python-modules/types-python-dateutil/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "types-python-dateutil";

     

       8
       8
       -
         version = "2.8.19.5";

     

       8
       8
       +
         version = "2.8.19.6";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0=";

     

       13
       13
       +
           hash = "sha256-Sm9MwZzkuhoIZwhx4pe/OAL1XU8SnmqiRD9UC2z4A9I=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # Modules doesn't have tests

+5 -1

pkgs/development/ruby-modules/gem-config/default.nix

···

       26
       26
        
       , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz

     

       27
       27
        
       , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk

     

       28
       28
        
       , bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie

     

       29
       29
       -
       , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb

     

       29
       29
       +
       , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml

     

       30
       30
        
       }@args:

     

       31
       31
        
       

     

       32
       32
        
       let

     
···

       542
       542
        
           buildFlags = [

     

       543
       543
        
             "--with-pg-config=${postgresql}/bin/pg_config"

     

       544
       544
        
           ];

     

       545
       545
       +
         };

     

       546
       546
       +
       

     

       547
       547
       +
         psych = attrs: {

     

       548
       548
       +
           buildInputs = [ libyaml ];

     

       545
       549
        
         };

     

       546
       550
        
       

     

       547
       551
        
         puma = attrs: {

+2 -2

pkgs/development/tools/ddosify/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "ddosify";

     

       5
       5
       -
         version = "0.12.0";

     

       5
       5
       +
         version = "0.13.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-peqLeZ8RxkvaqUER2FBQeTdy1AQ/+Bcz9gGOGz1CACc=";

     

       11
       11
       +
           sha256 = "sha256-tw6rrhFhuIsVAj5IqSHGHSYheDqGENLDxiJr+PQno1U=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY=";

+3 -3

pkgs/development/tools/devbox/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "devbox";

     

       8
       8
       -
         version = "0.2.2";

     

       8
       8
       +
         version = "0.2.3";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "jetpack-io";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = version;

     

       14
       14
       -
           hash = "sha256-n2zFfa+UlrAOvBtqF+FkF+oSF1t/7Hg79um7Rl8yTCc=";

     

       14
       14
       +
           hash = "sha256-AvLTDuODn0tcG13lJ9MiN8DgnKzdIzZL1eLnFuEleRw=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         ldflags = [

     
···

       23
       23
        
         # integration tests want file system access

     

       24
       24
        
         doCheck = false;

     

       25
       25
        
       

     

       26
       26
       -
         vendorHash = "sha256-pZ9s2i62uMebGLpWerOkSJLxShD06vY4MybqM9ZcdGc=";

     

       26
       26
       +
         vendorHash = "sha256-IJay/CDWq9/6P4+qbNleUp4rzTas0LW9zbsV9QN+ufI=";

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ installShellFiles ];

     

       29
       29

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "go-swag";

     

       5
       5
       -
         version = "1.8.9";

     

       5
       5
       +
         version = "1.8.10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "swaggo";

     

       9
       9
        
           repo = "swag";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-8UnDrWZ0gQlhPQLDqA5DLBBeHqQFlNxK7+y4qlUk/fI=";

     

       11
       11
       +
           sha256 = "sha256-PDK1TI99/8hAuyK4NOb357WZG0JBno8er8HMfus5V7Q=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ=";

     

       14
       14
       +
         vendorHash = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [ "cmd/swag" ];

     

       17
       17

+2 -2

pkgs/development/tools/misc/circleci-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "circleci-cli";

     

       5
       5
       -
         version = "0.1.23117";

     

       5
       5
       +
         version = "0.1.23241";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "CircleCI-Public";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-w7vBDJnkfpdOaNJWlo0fCRvdqEzImCn9y22Xflg/aH0=";

     

       11
       11
       +
           sha256 = "sha256-GpW7mSmUSp1lLgPJmSGmAzYTn2vPsJKorTNQVAHKwU0=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY=";

+1 -1

pkgs/development/tools/ofono-phonesim/default.nix

···

       11
       11
        
         version = "unstable-2019-11-18";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchgit {

     

       14
       14
       -
           url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git";

     

       14
       14
       +
           url = "https://git.kernel.org/pub/scm/network/ofono/phonesim.git";

     

       15
       15
        
           rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541";

     

       16
       16
        
           sha256 = "1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp";

     

       17
       17
        
         };

+3 -3

pkgs/development/tools/rust/cargo-tauri/default.nix

···

       16
       16
        
       in

     

       17
       17
        
       rustPlatform.buildRustPackage rec {

     

       18
       18
        
         pname = "tauri";

     

       19
       19
       -
         version = "1.2.3";

     

       19
       19
       +
         version = "1.2.4";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "tauri-apps";

     

       23
       23
        
           repo = pname;

     

       24
       24
        
           rev = "tauri-v${version}";

     

       25
       25
       -
           sha256 = "sha256-4v0ZlFBVBB+0xWbTRncVwELaZWLKyCmIceTfseXvS8s=";

     

       25
       25
       +
           sha256 = "sha256-BzstYoRZuZTNAkVGqPGYrd/AiWEhoH6t/XezDaFdmVo=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at

     

       29
       29
        
         # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202

     

       30
       30
        
         sourceRoot = "source/tooling/cli";

     

       31
       31
        
       

     

       32
       32
       -
         cargoSha256 = "sha256-Hp6+T2CN0CsXaGnCVqAYaOjZNDkmI+MXDfHIgbU1S0g=";

     

       32
       32
       +
         cargoHash = "sha256-t5MlJpQOA5T/EwbPoSD95kATGReiZTmq+JkbDVbRj+0=";

     

       33
       33
        
       

     

       34
       34
        
         buildInputs = lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ]

     

       35
       35
        
           ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];

+26

pkgs/development/tools/rust/rustfilt/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , rustPlatform

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       rustPlatform.buildRustPackage rec {

     

       7
       7
       +
         pname = "rustfilt";

     

       8
       8
       +
         version = "0.2.1";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "luser";

     

       12
       12
       +
           repo = pname;

     

       13
       13
       +
           rev = version;

     

       14
       14
       +
           hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         cargoSha256 = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE=";

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "Demangle Rust symbol names using rustc-demangle";

     

       21
       21
       +
           homepage = "https://github.com/luser/rustfilt";

     

       22
       22
       +
           license = with licenses; [ asl20 ];

     

       23
       23
       +
           maintainers = with maintainers; [ wykurz ];

     

       24
       24
       +
           mainProgram = "rustfilt";

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+38 -5

pkgs/games/teeworlds/default.nix

···

       1
       1
        
       { fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib

     

       2
       2
        
       , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils

     

       3
       3
        
       , nixosTests

     

       4
       4
       +
       , Carbon

     

       5
       5
       +
       , Cocoa

     

       4
       6
        
       }:

     

       5
       7
        
       

     

       6
       8
        
       stdenv.mkDerivation rec {

     
···

       15
       17
        
           fetchSubmodules = true;

     

       16
       18
        
         };

     

       17
       19
        
       

     

       20
       20
       +
         patches = [

     

       21
       21
       +
           # Can't use fetchpatch or fetchpatch2 because of https://github.com/NixOS/nixpkgs/issues/32084

     

       22
       22
       +
           # Using fetchurl instead is also not a good idea, see https://github.com/NixOS/nixpkgs/issues/32084#issuecomment-727223713

     

       23
       23
       +
           ./rename-VERSION-to-VERSION.txt.patch

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       18
       26
        
         postPatch = ''

     

       19
       27
        
           # set compiled-in DATA_DIR so resources can be found

     

       20
       28
        
           substituteInPlace src/engine/shared/storage.cpp \

     

       21
       29
        
             --replace '#define DATA_DIR "data"' \

     

       22
       30
        
                       '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"'

     

       31
       31
       +
       

     

       32
       32
       +
           # Quote nonsense is a workaround for https://github.com/NixOS/nix/issues/661

     

       33
       33
       +
           substituteInPlace 'other/bundle/client/Info.plist.in' \

     

       34
       34
       +
             --replace ${"'"}''${TARGET_CLIENT}' 'teeworlds' \

     

       35
       35
       +
             --replace ${"'"}''${PROJECT_VERSION}' '${version}'

     

       23
       36
        
         '';

     

       24
       37
        
       

     

       25
       25
       -
         nativeBuildInputs = [ cmake pkg-config icoutils ];

     

       38
       38
       +
         nativeBuildInputs = [

     

       39
       39
       +
           cmake

     

       40
       40
       +
           pkg-config

     

       41
       41
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       42
       42
       +
           icoutils

     

       43
       43
       +
         ];

     

       26
       44
        
       

     

       27
       45
        
         buildInputs = [

     

       28
       28
       -
           python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack

     

       46
       46
       +
           python3 libGLU SDL2 lua5_3 zlib freetype wavpack

     

       47
       47
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       48
       48
       +
           alsa-lib

     

       49
       49
       +
           libX11

     

       50
       50
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       51
       51
       +
           Carbon

     

       52
       52
       +
           Cocoa

     

       29
       53
        
         ];

     

       30
       54
        
       

     

       31
       31
       -
         postInstall = ''

     

       55
       55
       +
         postInstall = lib.optionalString stdenv.isLinux ''

     

       32
       56
        
           # Convert and install desktop icon

     

       33
       57
        
           mkdir -p $out/share/pixmaps

     

       34
       58
        
           icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico

     

       35
       59
        
       

     

       36
       60
        
           # Install menu item

     

       37
       61
        
           install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop

     

       62
       62
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       63
       63
       +
           mkdir -p "$out/Applications/teeworlds.app/Contents/MacOS"

     

       64
       64
       +
           mkdir -p "$out/Applications/teeworlds.app/Contents/Resources"

     

       65
       65
       +
       

     

       66
       66
       +
           cp '../other/icons/teeworlds.icns' "$out/Applications/teeworlds.app/Contents/Resources/"

     

       67
       67
       +
           cp '../other/bundle/client/Info.plist.in' "$out/Applications/teeworlds.app/Contents/Info.plist"

     

       68
       68
       +
           cp '../other/bundle/client/PkgInfo' "$out/Applications/teeworlds.app/Contents/"

     

       69
       69
       +
           ln -s "$out/bin/teeworlds" "$out/Applications/teeworlds.app/Contents/MacOS/"

     

       70
       70
       +
           ln -s "$out/share/teeworlds/data" "$out/Applications/teeworlds.app/Contents/Resources/data"

     

       38
       71
        
         '';

     

       39
       72
        
       

     

       40
       73
        
         passthru.tests.teeworlds = nixosTests.teeworlds;

     
···

       51
       84
        
       

     

       52
       85
        
           homepage = "https://teeworlds.com/";

     

       53
       86
        
           license = "BSD-style, see `license.txt'";

     

       54
       54
       -
           maintainers = with lib.maintainers; [ astsmtl ];

     

       55
       55
       -
           platforms = lib.platforms.linux;

     

       87
       87
       +
           maintainers = with lib.maintainers; [ astsmtl Luflosi ];

     

       88
       88
       +
           platforms = lib.platforms.unix;

     

       56
       89
        
         };

     

       57
       90
        
       }

+33

pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch

···

       1
       1
       +
       From 86d6687ef07f7f05457a7f67537b650656b13820 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: =?UTF-8?q?Robert=20M=C3=BCller?= <robert.mueller@uni-siegen.de>

     

       3
       3
       +
       Date: Fri, 15 Oct 2021 23:45:50 +0200

     

       4
       4
       +
       Subject: [PATCH] rename VERSION to VERSION.txt:

     

       5
       5
       +
       

     

       6
       6
       +
       Fixes compilation on systems with case insensitive file names where the standard library includes the version file source code.

     

       7
       7
       +
       ---

     

       8
       8
       +
        src/engine/external/json-parser/{VERSION => VERSION.txt} | 0

     

       9
       9
       +
        src/engine/external/pnglite/{VERSION => VERSION.txt}     | 0

     

       10
       10
       +
        src/engine/external/wavpack/{VERSION => VERSION.txt}     | 0

     

       11
       11
       +
        src/engine/external/zlib/{VERSION => VERSION.txt}        | 0

     

       12
       12
       +
        4 files changed, 0 insertions(+), 0 deletions(-)

     

       13
       13
       +
        rename src/engine/external/json-parser/{VERSION => VERSION.txt} (100%)

     

       14
       14
       +
        rename src/engine/external/pnglite/{VERSION => VERSION.txt} (100%)

     

       15
       15
       +
        rename src/engine/external/wavpack/{VERSION => VERSION.txt} (100%)

     

       16
       16
       +
        rename src/engine/external/zlib/{VERSION => VERSION.txt} (100%)

     

       17
       17
       +
       

     

       18
       18
       +
       diff --git a/src/engine/external/json-parser/VERSION b/src/engine/external/json-parser/VERSION.txt

     

       19
       19
       +
       similarity index 100%

     

       20
       20
       +
       rename from src/engine/external/json-parser/VERSION

     

       21
       21
       +
       rename to src/engine/external/json-parser/VERSION.txt

     

       22
       22
       +
       diff --git a/src/engine/external/pnglite/VERSION b/src/engine/external/pnglite/VERSION.txt

     

       23
       23
       +
       similarity index 100%

     

       24
       24
       +
       rename from src/engine/external/pnglite/VERSION

     

       25
       25
       +
       rename to src/engine/external/pnglite/VERSION.txt

     

       26
       26
       +
       diff --git a/src/engine/external/wavpack/VERSION b/src/engine/external/wavpack/VERSION.txt

     

       27
       27
       +
       similarity index 100%

     

       28
       28
       +
       rename from src/engine/external/wavpack/VERSION

     

       29
       29
       +
       rename to src/engine/external/wavpack/VERSION.txt

     

       30
       30
       +
       diff --git a/src/engine/external/zlib/VERSION b/src/engine/external/zlib/VERSION.txt

     

       31
       31
       +
       similarity index 100%

     

       32
       32
       +
       rename from src/engine/external/zlib/VERSION

     

       33
       33
       +
       rename to src/engine/external/zlib/VERSION.txt

+1 -1

pkgs/os-specific/linux/blktrace/default.nix

···

       5
       5
        
         version = "1.3.0";

     

       6
       6
        
       

     

       7
       7
        
         # Official source

     

       8
       8
       -
         # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git"

     

       8
       8
       +
         # "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git"

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://brick.kernel.dk/snaps/blktrace-${version}.tar.bz2";

     

       11
       11
        
           sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY=";

+2 -2

pkgs/os-specific/linux/error-inject/default.nix

···

       10
       10
        
           version = "4cbe46321b4a81365ff3aafafe63967264dbfec5";

     

       11
       11
        
       

     

       12
       12
        
           src = fetchgit {

     

       13
       13
       -
             url = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git";

     

       13
       13
       +
             url = "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git";

     

       14
       14
        
             rev = version;

     

       15
       15
        
             sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z";

     

       16
       16
        
           };

     
···

       40
       40
        
           version = "9bd5e2c7886fca72f139cd8402488a2235957d41";

     

       41
       41
        
       

     

       42
       42
        
           src = fetchgit {

     

       43
       43
       -
             url = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git";

     

       43
       43
       +
             url = "https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git";

     

       44
       44
        
             rev = version;

     

       45
       45
        
             sha256 = "0bh6mzpk2mr4xidkammmkfk21b4dbq793qjg25ryyxd1qv0c6cg4";

     

       46
       46
        
           };

+1 -1

pkgs/os-specific/linux/libtraceevent/default.nix

···

       5
       5
        
         version = "1.6.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchgit {

     

       8
       8
       -
           url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";

     

       8
       8
       +
           url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";

     

       9
       9
        
           rev = "libtraceevent-${version}";

     

       10
       10
        
           sha256 = "sha256-iLy2rEKn0UJguRcY/W8RvUq7uX+snQojb/cXOmMsjwc=";

     

       11
       11
        
         };

+1 -1

pkgs/os-specific/linux/libtracefs/default.nix

···

       18
       18
        
         version = "1.6.4";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchgit {

     

       21
       21
       -
           url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";

     

       21
       21
       +
           url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";

     

       22
       22
        
           rev = "libtracefs-${version}";

     

       23
       23
        
           sha256 = "sha256-fWop0EMkoVulLBzU7q8x1IhMtdnEJ89wMz0cz964F6s=";

     

       24
       24
        
         };

+1 -1

pkgs/os-specific/linux/trace-cmd/default.nix

···

       4
       4
        
         version = "3.1.6";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchgit {

     

       7
       7
       -
           url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";

     

       7
       7
       +
           url    = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";

     

       8
       8
        
           rev    = "trace-cmd-v${version}";

     

       9
       9
        
           sha256 = "sha256-qjfeomeExjsx/6XrUaGm5szbL7XVlekGd4Hsuncv8NY=";

     

       10
       10
        
         };

+3 -3

pkgs/servers/kapowbang/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kapowbang";

     

       5
       5
       -
         version = "0.7.0";

     

       5
       5
       +
         version = "0.7.1";

     

       6
       6
        
       

     

       7
       7
        
         subPackages = [ "." ];

     

       8
       8
        
       

     
···

       10
       10
        
           owner = "BBVA";

     

       11
       11
        
           repo = "kapow";

     

       12
       12
        
           rev = "v${version}";

     

       13
       13
       -
           sha256 = "sha256-0ftdc3ol1g0WnZgicXl46Xpph4cUYk/G/eeu+9JnPyA=";

     

       13
       13
       +
           sha256 = "sha256-HUZ1Uf8Z2YbYvqKEUHckKAZ5q+C83zafi3UjemqHFM4=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         vendorSha256 = "sha256-41Jk3aTe4EA5dwkriEo48QNJg2k3T/R/8i8XWcURcG8=";

     

       16
       16
       +
         vendorHash = "sha256-vvC9l/6b7AIEmCMVdeKMyi9ThIcAzjtV+uaQ4oSJZuU=";

     

       17
       17
        
       

     

       18
       18
        
         doCheck = false;

     

       19
       19

+2 -2

pkgs/servers/snappymail/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "snappymail";

     

       10
       10
       -
         version = "2.24.6";

     

       10
       10
       +
         version = "2.25.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";

     

       14
       14
       -
           sha256 = "sha256-CGpPmarY990084/Whkk3YjzupPqU4FqAfpTXNFXIAH4=";

     

       14
       14
       +
           sha256 = "sha256-obPWI6tvZx8HEWvNUw9euJav1ncbBYtXwY7SgEurkdQ=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         sourceRoot = "snappymail";

+3 -3

pkgs/tools/graphics/gifski/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "gifski";

     

       5
       5
       -
         version = "1.9.0";

     

       5
       5
       +
         version = "1.10.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "ImageOptim";

     

       9
       9
        
           repo = "gifski";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-iG7XaPBNTmt/yNMeSY8UKwesFJFUECAsOYQ0idegk1w=";

     

       11
       11
       +
           sha256 = "sha256-JJSAU9z3JOlvfW6AW/P/KrjhOcD0ax8TmqgqM48rlAo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoHash = "sha256-7bjsxbUsHjsVER0HaQ+x0dkaAI2sb7if8mS6JwQIbzc=";

     

       14
       14
       +
         cargoHash = "sha256-UV2iQFbeGvJs8kEowYRNv8DxEGwaIWL1/3A2oUCcauw=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];

     

       17
       17

+3 -3

pkgs/tools/misc/opentelemetry-collector/default.nix

···

       12
       12
        
       in

     

       13
       13
        
       buildGoModule rec {

     

       14
       14
        
         pname = "opentelemetry-collector";

     

       15
       15
       -
         version = "0.69.1";

     

       15
       15
       +
         version = "0.70.0";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "open-telemetry";

     

       19
       19
        
           repo = "opentelemetry-collector";

     

       20
       20
        
           rev = "v${version}";

     

       21
       21
       -
           sha256 = "sha256-p/epsqaDQNPS2gd3fN/Ny0XtGIeoKI7hdZVI1bqvg4s=";

     

       21
       21
       +
           sha256 = "sha256-r7Pw2zBRwaDMXZ7j8hNT1+a9sSWZpl0+8Y4rtIveoPY=";

     

       22
       22
        
         };

     

       23
       23
        
         # there is a nested go.mod

     

       24
       24
        
         sourceRoot = "source/cmd/otelcorecol";

     

       25
       25
       -
         vendorHash = "sha256-AIn38bjnYX9gAaKXTyIA7Lv5/oRzy3BMK5Q+9JvapFI=";

     

       25
       25
       +
         vendorHash = "sha256-HyI3ETQQJE6bAhC2W7UfO9yqfoxu8aITcmIJmrOZpbM=";

     

       26
       26
        
       

     

       27
       27
        
         preBuild = ''

     

       28
       28
        
           # set the build version, can't be done via ldflags

+1 -1

pkgs/tools/misc/xfstests/default.nix

···

       8
       8
        
         version = "2022.09.04";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchgit {

     

       11
       11
       -
           url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";

     

       11
       11
       +
           url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";

     

       12
       12
        
           rev = "v${version}";

     

       13
       13
        
           sha256 = "sha256-hPFoqNmB8pewvBN1nzVMkTrMHCo0xc8tmmIODaiDeRw=";

     

       14
       14
        
         };

+1 -1

pkgs/tools/networking/mmsd/default.nix

···

       11
       11
        
         version = "unstable-2019-07-15";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchgit {

     

       14
       14
       -
           url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git";

     

       14
       14
       +
           url = "https://git.kernel.org/pub/scm/network/ofono/mmsd.git";

     

       15
       15
        
           rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c";

     

       16
       16
        
           sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b";

     

       17
       17
        
         };

+1 -1

pkgs/tools/networking/ofono/default.nix

···

       17
       17
        
         outputs = [ "out" "dev" ];

     

       18
       18
        
       

     

       19
       19
        
         src = fetchgit {

     

       20
       20
       -
           url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git";

     

       20
       20
       +
           url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git";

     

       21
       21
        
           rev = version;

     

       22
       22
        
           sha256 = "sha256-T8rfReruvHGQCN9IDGIrFCoNjFKKMnUGPKzxo2HTZFQ=";

     

       23
       23
        
         };

-7

pkgs/tools/networking/openvpn/default.nix

···

       5
       5
        
       , iproute2

     

       6
       6
        
       , lzo

     

       7
       7
        
       , openssl

     

       8
       8
       -
       , openssl_1_1

     

       9
       8
        
       , pam

     

       10
       9
        
       , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd

     

       11
       10
        
       , systemd

     
···

       74
       73
        
       

     

       75
       74
        
       in

     

       76
       75
        
       {

     

       77
       77
       -
         openvpn_24 = generic {

     

       78
       78
       -
           version = "2.4.12";

     

       79
       79
       -
           sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6";

     

       80
       80
       -
           extraBuildInputs = [ openssl_1_1 ];

     

       81
       81
       -
         };

     

       82
       82
       -
       

     

       83
       76
        
         openvpn = generic {

     

       84
       77
        
           version = "2.5.8";

     

       85
       78
        
           sha256 = "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6";

+60

pkgs/tools/nix/nix-init/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , rustPlatform

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , installShellFiles

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , zstd

     

       8
       8
       +
       , stdenv

     

       9
       9
       +
       , darwin

     

       10
       10
       +
       , nix

     

       11
       11
       +
       , nurl

     

       12
       12
       +
       , callPackage

     

       13
       13
       +
       , spdx-license-list-data

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       rustPlatform.buildRustPackage rec {

     

       17
       17
       +
         pname = "nix-init";

     

       18
       18
       +
         version = "0.1.0";

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "nix-community";

     

       22
       22
       +
           repo = "nix-init";

     

       23
       23
       +
           rev = "v${version}";

     

       24
       24
       +
           hash = "sha256-97aAlH03H8xTVhp45FwecNb7i/ZUtJG9OOYBx8Sf+YI=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         cargoHash = "sha256-uvn1cP6aIxfPKG/QLtHBd6fHjl7JNRtkZ4gIG2tpHVg=";

     

       28
       28
       +
       

     

       29
       29
       +
         nativeBuildInputs = [

     

       30
       30
       +
           installShellFiles

     

       31
       31
       +
           makeWrapper

     

       32
       32
       +
           pkg-config

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         buildInputs = [

     

       36
       36
       +
           zstd

     

       37
       37
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       38
       38
       +
           darwin.apple_sdk.frameworks.Security

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         postInstall = ''

     

       42
       42
       +
           wrapProgram $out/bin/nix-init \

     

       43
       43
       +
             --prefix PATH : ${lib.makeBinPath [ nix nurl ]}

     

       44
       44
       +
           installManPage artifacts/nix-init.1

     

       45
       45
       +
           installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init

     

       46
       46
       +
         '';

     

       47
       47
       +
       

     

       48
       48
       +
         GEN_ARTIFACTS = "artifacts";

     

       49
       49
       +
         NIX_LICENSES = callPackage ./license.nix { };

     

       50
       50
       +
         SPDX_LICENSE_LIST_DATA = "${spdx-license-list-data.json}/json/details";

     

       51
       51
       +
         ZSTD_SYS_USE_PKG_CONFIG = true;

     

       52
       52
       +
       

     

       53
       53
       +
         meta = with lib; {

     

       54
       54
       +
           description = "Command line tool to generate Nix packages from URLs";

     

       55
       55
       +
           homepage = "https://github.com/nix-community/nix-init";

     

       56
       56
       +
           changelog = "https://github.com/nix-community/nix-init/blob/${src.rev}/CHANGELOG.md";

     

       57
       57
       +
           license = licenses.mpl20;

     

       58
       58
       +
           maintainers = with maintainers; [ figsoda ];

     

       59
       59
       +
         };

     

       60
       60
       +
       }

+23

pkgs/tools/nix/nix-init/license.nix

···

       1
       1
       +
       # vendored from src/licenses.nix

     

       2
       2
       +
       

     

       3
       3
       +
       { lib, writeText }:

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         inherit (builtins) concatLists concatStringsSep length;

     

       7
       7
       +
         inherit (lib) flip licenses mapAttrsToList optional;

     

       8
       8
       +
       

     

       9
       9
       +
         inserts = concatLists

     

       10
       10
       +
           (flip mapAttrsToList licenses

     

       11
       11
       +
             (k: v: optional (v ? spdxId) ''  xs.insert("${v.spdxId}", "${k}");''));

     

       12
       12
       +
       in

     

       13
       13
       +
       

     

       14
       14
       +
       writeText "license.rs" ''

     

       15
       15
       +
         fn get_nix_licenses() -> rustc_hash::FxHashMap<&'static str, &'static str> {

     

       16
       16
       +
             let mut xs = std::collections::HashMap::with_capacity_and_hasher(

     

       17
       17
       +
                 ${toString (length inserts)},

     

       18
       18
       +
                 Default::default(),

     

       19
       19
       +
             );

     

       20
       20
       +
             ${concatStringsSep "\n    " inserts}

     

       21
       21
       +
             xs

     

       22
       22
       +
         }

     

       23
       23
       +
       ''

+2 -2

pkgs/tools/package-management/nix-update/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonApplication rec {

     

       10
       10
        
         pname = "nix-update";

     

       11
       11
       -
         version = "0.14.0";

     

       11
       11
       +
         version = "0.15.0";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Mic92";

     

       16
       16
        
           repo = pname;

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "sha256-7HZ5LEQAhA1TXQZVfeUGOruwgqJBkSFtmDLR8PLSiOw=";

     

       18
       18
       +
           sha256 = "sha256-Q3yExefODBrrziRnCYETrJgSn42BOR7ZsL8pu3q5D/w=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         makeWrapperArgs = [

+1 -1

pkgs/tools/security/efitools/default.nix

···

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
        
         src = fetchgit {

     

       20
       20
       -
           url = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git";

     

       20
       20
       +
           url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git";

     

       21
       21
        
           rev = "v${version}";

     

       22
       22
        
           sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i";

     

       23
       23
        
         };

+3 -3

pkgs/tools/text/mdbook-katex/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "mdbook-katex";

     

       5
       5
       -
         version = "0.3.3";

     

       5
       5
       +
         version = "0.3.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchCrate {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           hash = "sha256-PmNoux12A6MBlviyCy9kjGUHigBDxCiiqXlwf6Sc76I=";

     

       9
       9
       +
           hash = "sha256-Bc9nUY2XyNlgOI436omg885Qm0BtqcrFsJz6qr2Zhys=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         cargoHash = "sha256-YSLJsiIkoeSAh3oUMkbk5jSW0NMdJLB6YsOt1YlGyfs=";

     

       12
       12
       +
         cargoHash = "sha256-pH5ZN6bTjstrSTv0hdOoyWAdRLRjALarML3ZVoYvGRI=";

     

       13
       13
        
       

     

       14
       14
        
         OPENSSL_DIR = "${lib.getDev openssl}";

     

       15
       15
        
         OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";

+1

pkgs/top-level/aliases.nix

···

       1087
       1087
        
         opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22

     

       1088
       1088
        
         openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22

     

       1089
       1089
        
         openssl_3_0 = openssl_3; # Added 2022-06-27

     

       1090
       1090
       +
         openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23

     

       1090
       1091
        
         orchis = orchis-theme; # Added 2021-06-09

     

       1091
       1092
        
         osxfuse = macfuse-stubs; # Added 2021-03-20

     

       1092
       1093
        
         otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02

+7 -2

pkgs/top-level/all-packages.nix

···

       10428
       10428
        
         opentsdb = callPackage ../tools/misc/opentsdb {};

     

       10429
       10429
        
       

     

       10430
       10430
        
         inherit (callPackages ../tools/networking/openvpn {})

     

       10431
       10431
       -
           openvpn_24

     

       10432
       10431
        
           openvpn;

     

       10433
       10432
        
       

     

       10434
       10433
        
         openvpn3 = callPackage ../tools/networking/openvpn3 { };

     
···

       11545
       11544
        
         };

     

       11546
       11545
        
       

     

       11547
       11546
        
         rustdesk = callPackage ../applications/networking/remote/rustdesk { };

     

       11547
       11547
       +
       

     

       11548
       11548
       +
         rustfilt = callPackage ../development/tools/rust/rustfilt { };

     

       11548
       11549
        
       

     

       11549
       11550
        
         rustscan = callPackage ../tools/security/rustscan {

     

       11550
       11551
        
           inherit (darwin.apple_sdk.frameworks) Security;

     
···

       35535
       35536
        
       

     

       35536
       35537
        
         teetertorture = callPackage ../games/teetertorture { };

     

       35537
       35538
        
       

     

       35538
       35538
       -
         teeworlds = callPackage ../games/teeworlds { };

     

       35539
       35539
       +
         teeworlds = callPackage ../games/teeworlds {

     

       35540
       35540
       +
           inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

     

       35541
       35541
       +
         };

     

       35539
       35542
        
       

     

       35540
       35543
        
         tengine = callPackage ../servers/http/tengine {

     

       35541
       35544
        
           openssl = openssl_1_1;

     
···

       37666
       37669
        
       

     

       37667
       37670
        
         nix-info = callPackage ../tools/nix/info { };

     

       37668
       37671
        
         nix-info-tested = nix-info.override { doCheck = true; };

     

       37672
       37672
       +
       

     

       37673
       37673
       +
         nix-init = callPackage ../tools/nix/nix-init { };

     

       37669
       37674
        
       

     

       37670
       37675
        
         nix-index-unwrapped = callPackage ../tools/package-management/nix-index {

     

       37671
       37676
        
           inherit (darwin.apple_sdk.frameworks) Security;