commit 7507aed4e17fa6dd69626ae477c4f8d0ebe1eada · pyrox.dev/nixpkgs

+6 -6

pkgs/applications/audio/ardour/default.nix

···

       8
       8
        
       , curl

     

       9
       9
        
       , dbus

     

       10
       10
        
       , doxygen

     

       11
       11
       -
       , ffmpeg_3

     

       11
       11
       +
       , ffmpeg

     

       12
       12
        
       , fftw

     

       13
       13
        
       , fftwSinglePrec

     

       14
       14
        
       , flac

     
···

       56
       56
        
       }:

     

       57
       57
        
       stdenv.mkDerivation rec {

     

       58
       58
        
         pname = "ardour";

     

       59
       59
       -
         version = "6.5";

     

       59
       59
       +
         version = "6.7";

     

       60
       60
        
       

     

       61
       61
        
         # don't fetch releases from the GitHub mirror, they are broken

     

       62
       62
        
         src = fetchgit {

     

       63
       63
        
           url = "git://git.ardour.org/ardour/ardour.git";

     

       64
       64
        
           rev = version;

     

       65
       65
       -
           sha256 = "0sd38hchyr16biq9hcxha4ljy3pf0yhcgn90i5zfqcznnc57ildx";

     

       65
       65
       +
           sha256 = "19jc29fjwgvqbg3gnmy50mrz8mh5x4nwddglasvwx83nc87qwllx";

     

       66
       66
        
         };

     

       67
       67
        
       

     

       68
       68
        
         patches = [

     
···

       89
       89
        
           cppunit

     

       90
       90
        
           curl

     

       91
       91
        
           dbus

     

       92
       92
       -
           ffmpeg_3

     

       92
       92
       +
           ffmpeg

     

       93
       93
        
           fftw

     

       94
       94
        
           fftwSinglePrec

     

       95
       95
        
           flac

     
···

       148
       148
        
           sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript

     

       149
       149
        
           patchShebangs ./tools/

     

       150
       150
        
           substituteInPlace libs/ardour/video_tools_paths.cc \

     

       151
       151
       -
             --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg_3}/bin/ffmpeg");' \

     

       152
       152
       -
             --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg_3}/bin/ffprobe");'

     

       151
       151
       +
             --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \

     

       152
       152
       +
             --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'

     

       153
       153
        
         '';

     

       154
       154
        
       

     

       155
       155
        
         postInstall = ''

+2 -2

pkgs/applications/audio/linuxsampler/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "linuxsampler";

     

       6
       6
       -
         version = "2.1.1";

     

       6
       6
       +
         version = "2.2.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";

     

       10
       10
       -
           sha256 = "1gijf50x5xbpya5dj3v2mzj7azx4qk9p012csgddp73f0qi0n190";

     

       10
       10
       +
           sha256 = "sha256-xNFjxrrC0B8Oj10HIQ1AmI7pO34HuYRyyUaoB2MDmYw=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         preConfigure = ''

+2 -2

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

···

       90
       90
        
       

     

       91
       91
        
       stdenv.mkDerivation rec {

     

       92
       92
        
         pname = "brave";

     

       93
       93
       -
         version = "1.24.85";

     

       93
       93
       +
         version = "1.24.86";

     

       94
       94
        
       

     

       95
       95
        
         src = fetchurl {

     

       96
       96
        
           url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";

     

       97
       97
       -
           sha256 = "jE9INGYz78Vyvps4ESimtH1rL4GdboAUtMx1p31XQGk=";

     

       97
       97
       +
           sha256 = "VKUs8PPyAbuH91Zck0QTiFCEUOMDlLT4Itv4MXi4Ygg=";

     

       98
       98
        
         };

     

       99
       99
        
       

     

       100
       100
        
         dontConfigure = true;

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         pname = "cni";

     

       5
       5
       -
         version = "0.8.0";

     

       5
       5
       +
         version = "0.8.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "containernetworking";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "16i59dhiq7pc7qs32cdk4yv4w9rjx4vvlw7fb6a6jhq6hxxjrgiw";

     

       11
       11
       +
           sha256 = "sha256-vxwNHIc3rFi7HKIEZrBcr7Oxs2iUtFYcfJK7aXDUv3k=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         goPackagePath = "github.com/containernetworking/cni";

+3 -3

pkgs/applications/networking/cluster/kubelogin-oidc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kubelogin";

     

       5
       5
       -
         version = "1.23.1";

     

       5
       5
       +
         version = "1.23.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "int128";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-YK/QGx6QzSeyeZ61KgdYO3POJQFK1F6yJayd2gcRWS4=";

     

       11
       11
       +
           sha256 = "sha256-Vj7qk1x4d94GgthmHhWbQvsfnZE1UL3Bdk5zjAb3vWs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         subPackages = ["."];

     

       15
       15
        
       

     

       16
       16
       -
         vendorSha256 = "sha256-tnjgs8Ziqdo1ciVOWtL0D8puv2SZGqSHgo2SV7N8F0M=";

     

       16
       16
       +
         vendorSha256 = "sha256-JsBseRIbStsX44rLsGAERFUSWUuLcNycRDAcOMconnE=";

     

       17
       17
        
       

     

       18
       18
        
         # Rename the binary instead of symlinking to avoid conflict with the

     

       19
       19
        
         # Azure version of kubelogin

+2 -2

pkgs/development/libraries/grpc/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         version = "1.37.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too

     

       6
       6
       +
         version = "1.38.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too

     

       7
       7
        
         pname = "grpc";

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "grpc";

     

       10
       10
        
           repo = "grpc";

     

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

     

       12
       12
       -
           sha256 = "0mjlz2cax5v37g7xnrbf5px88bm7xzl4a5pds112yk096d7wmxm5";

     

       12
       12
       +
           sha256 = "0an903nh8lz3xlf79zsh2v55nrwnjzzavkjlrsl7j9aysgwmgn4r";

     

       13
       13
        
           fetchSubmodules = true;

     

       14
       14
        
         };

     

       15
       15
        
         patches = [

+2 -2

pkgs/development/python-modules/grpcio-tools/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "grpcio-tools";

     

       5
       5
       -
         version = "1.37.1";

     

       5
       5
       +
         version = "1.38.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "d775fb07cc6561174d6c86d11727a156c4ade969f7bf5edf623ffe2a428bee4e";

     

       9
       9
       +
           sha256 = "c609678cf6faf4b467259757f848de4fbc7baca3c1e3f7b0e55c701c50fd94ae";

     

       10
       10
        
         };

     

       11
       11
        
       

     

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

+3 -3

pkgs/development/tools/bazelisk/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "bazelisk";

     

       5
       5
       -
         version = "1.8.1";

     

       5
       5
       +
         version = "1.9.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "bazelbuild";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-w2YCqFkZLsTddj9OPOIdFPgXcXapCGWkc5RaH7RHg24=";

     

       11
       11
       +
           sha256 = "sha256-APHRNCJNQ4cheY+wBB8q4fcOOL6SFeg5SflvnrxjYhI=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-IkW13y51NhKflAeHLu8k7DxRqYVnfMHSnfFuT6H/flo=";

     

       14
       14
       +
         vendorSha256 = "sha256-+B+5GQTEiCwLCoGB5uIIJEWJRjylgt9txcsJCXcOAQs=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+2 -1

pkgs/development/tools/hobbes/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib, libxml2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "hobbes";

     
···

       20
       20
        
           ncurses

     

       21
       21
        
           readline

     

       22
       22
        
           zlib

     

       23
       23
       +
           libxml2

     

       23
       24
        
         ];

     

       24
       25
        
       

     

       25
       26
        
         doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R.

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-expand";

     

       5
       5
       -
         version = "1.0.6";

     

       5
       5
       +
         version = "1.0.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "dtolnay";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-6FjFG4RYvmsV/W7OMxj1ZWvruwUeP9Nvsdiv8toZmTk=";

     

       11
       11
       +
           sha256 = "sha256-8YppfgYa5Sd/3nPCMCgaM3A93ND0vU5eUoCW02uDkiM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-C9lpA2n7EI7Ga3Nnj80dkvbZmqjuxf0wjoQUEr0N8FE=";

     

       14
       14
       +
         cargoSha256 = "sha256-0lrz8awAtLuLWE6Prmi07iGfYVmNZIETv3QL55CPYHQ=";

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       17
       17

+2 -2

pkgs/games/ckan/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "ckan";

     

       5
       5
       -
         version = "1.30.0";

     

       5
       5
       +
         version = "1.30.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

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

     

       9
       9
       -
           sha256 = "sha256-wih5NRzeOy4WMXQ3yV9W/m2x7B2C5T0F78TbpsngigQ=";

     

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

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         dontUnpack = true;

+27 -15

pkgs/misc/vim-plugins/generated.nix

···

       327
       327
        
           meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/";

     

       328
       328
        
         };

     

       329
       329
        
       

     

       330
       330
       +
         bracey-vim = buildVimPluginFrom2Nix {

     

       331
       331
       +
           pname = "bracey-vim";

     

       332
       332
       +
           version = "2021-05-11";

     

       333
       333
       +
           src = fetchFromGitHub {

     

       334
       334
       +
             owner = "turbio";

     

       335
       335
       +
             repo = "bracey.vim";

     

       336
       336
       +
             rev = "457933c107db65ff7e2695e07209a9a2934544b7";

     

       337
       337
       +
             sha256 = "1x8c8l9x4i9n2rlh3a8zha0ni85v04p32w7yciwxp7ddlwzf3lwh";

     

       338
       338
       +
           };

     

       339
       339
       +
           meta.homepage = "https://github.com/turbio/bracey.vim/";

     

       340
       340
       +
         };

     

       341
       341
       +
       

     

       330
       342
        
         brainfuck-vim = buildVimPluginFrom2Nix {

     

       331
       343
        
           pname = "brainfuck-vim";

     

       332
       344
        
           version = "2021-01-28";

     
···

       405
       417
        
           src = fetchFromGitHub {

     

       406
       418
        
             owner = "ms-jpq";

     

       407
       419
        
             repo = "chadtree";

     

       408
       408
       -
             rev = "a54a87e651ca985b0d10e293f824f3493778b64e";

     

       409
       409
       -
             sha256 = "1cn1knxldl0qqv8p125fqa1fpn3n7cfq7lw9nfj8giaxpr8bag7f";

     

       420
       420
       +
             rev = "6769987c13e313497e0fe98a59ccee0e70388927";

     

       421
       421
       +
             sha256 = "1xaddhij0f652rx2k5iar8892ly84nslw8j74l7srfxs7l91kpyi";

     

       410
       422
        
           };

     

       411
       423
        
           meta.homepage = "https://github.com/ms-jpq/chadtree/";

     

       412
       424
        
         };

     
···

       1895
       1907
        
       

     

       1896
       1908
        
         hologram-nvim = buildVimPluginFrom2Nix {

     

       1897
       1909
        
           pname = "hologram-nvim";

     

       1898
       1898
       -
           version = "2021-05-20";

     

       1910
       1910
       +
           version = "2021-05-21";

     

       1899
       1911
        
           src = fetchFromGitHub {

     

       1900
       1912
        
             owner = "edluffy";

     

       1901
       1913
        
             repo = "hologram.nvim";

     

       1902
       1902
       -
             rev = "7466e360040f14a828fe07cfa7fb6089d50f618e";

     

       1903
       1903
       -
             sha256 = "1gjns7dkyzl8yj0vq3103r0f6wjk1fjryz7xa8gi67rchbrxrls4";

     

       1914
       1914
       +
             rev = "593a458d04f7457669280373d98e41195c106d13";

     

       1915
       1915
       +
             sha256 = "0diq42zdr9l8qw198c5y4jy5siab3cwh4ncsb5z111m28n6a6i5c";

     

       1904
       1916
        
           };

     

       1905
       1917
        
           meta.homepage = "https://github.com/edluffy/hologram.nvim/";

     

       1906
       1918
        
         };

     
···

       2628
       2640
        
       

     

       2629
       2641
        
         mkdx = buildVimPluginFrom2Nix {

     

       2630
       2642
        
           pname = "mkdx";

     

       2631
       2631
       -
           version = "2021-05-01";

     

       2643
       2643
       +
           version = "2021-05-21";

     

       2632
       2644
        
           src = fetchFromGitHub {

     

       2633
       2645
        
             owner = "SidOfc";

     

       2634
       2646
        
             repo = "mkdx";

     

       2635
       2635
       -
             rev = "84c9a59087e74d6bd7761cd4a920d9390c2a65f9";

     

       2636
       2636
       -
             sha256 = "0qf4q5yh5f9kzxc96aq925ppj304hjnb4xxzjijc38jpvsmchjba";

     

       2647
       2647
       +
             rev = "b45099a18e88cd61c93a073e2b15cc6025e4774e";

     

       2648
       2648
       +
             sha256 = "0yawlfnghbkr3bcqqcf3znsdjjbh13a46dhkn4sj108adc9c4y56";

     

       2637
       2649
        
           };

     

       2638
       2650
        
           meta.homepage = "https://github.com/SidOfc/mkdx/";

     

       2639
       2651
        
         };

     
···

       3148
       3160
        
           src = fetchFromGitHub {

     

       3149
       3161
        
             owner = "mcchrish";

     

       3150
       3162
        
             repo = "nnn.vim";

     

       3151
       3151
       -
             rev = "cf62f64c8ec1e92fb8e46c23e3b89d8621551e4b";

     

       3152
       3152
       -
             sha256 = "0c49170891ar7439fyp1phki46pyw8iinszpyaj0gf0pwmqhsdhg";

     

       3163
       3163
       +
             rev = "065bf84b0b86266b267adfc2584e67eabef49815";

     

       3164
       3164
       +
             sha256 = "1v2jckl4gaai77rqnv1hwv4bb0d6vyk7hy63nlyy3fcnc1z1ic8v";

     

       3153
       3165
        
           };

     

       3154
       3166
        
           meta.homepage = "https://github.com/mcchrish/nnn.vim/";

     

       3155
       3167
        
         };

     
···

       3396
       3408
        
       

     

       3397
       3409
        
         nvim-lspconfig = buildVimPluginFrom2Nix {

     

       3398
       3410
        
           pname = "nvim-lspconfig";

     

       3399
       3399
       -
           version = "2021-05-19";

     

       3411
       3411
       +
           version = "2021-05-21";

     

       3400
       3412
        
           src = fetchFromGitHub {

     

       3401
       3413
        
             owner = "neovim";

     

       3402
       3414
        
             repo = "nvim-lspconfig";

     

       3403
       3403
       -
             rev = "d23816b7b00028375e53dba2aa30f2b56573cf54";

     

       3404
       3404
       -
             sha256 = "0m5fgjjks15vzqscgvl9m2di8clxizc8ky3lwlw9j8m4zy8jh8kw";

     

       3415
       3415
       +
             rev = "2f26391ccf88cd4adff8f11e96412a3536624bd7";

     

       3416
       3416
       +
             sha256 = "0y8r879lcpwjnk9rcrafkdh59gcxzpvid0rm80db22vpp6a9l9rq";

     

       3405
       3417
        
           };

     

       3406
       3418
        
           meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

     

       3407
       3419
        
         };

     
···

       7559
       7571
        
           src = fetchFromGitHub {

     

       7560
       7572
        
             owner = "ojroques";

     

       7561
       7573
        
             repo = "vim-oscyank";

     

       7562
       7562
       -
             rev = "fc88da94f3cd85e0e44778484b678c4d144275fe";

     

       7563
       7563
       -
             sha256 = "0flc8lxmhv99bisxxip5f6p4196i5215f5fa86mmqs6anff5pfyr";

     

       7574
       7574
       +
             rev = "20fade09069cd35602387c2e7d2a7cd0f6cff8b0";

     

       7575
       7575
       +
             sha256 = "1ym87hd85l67976dxk919mdwab8fi8iq8azqk4mpa75gzl2ia7wl";

     

       7564
       7576
        
           };

     

       7565
       7577
        
           meta.homepage = "https://github.com/ojroques/vim-oscyank/";

     

       7566
       7578
        
         };

+1

pkgs/misc/vim-plugins/vim-plugin-names

···

       684
       684
        
       tremor-rs/tremor-vim@main

     

       685
       685
        
       triglav/vim-visual-increment

     

       686
       686
        
       troydm/zoomwintab.vim

     

       687
       687
       +
       turbio/bracey.vim

     

       687
       688
        
       tversteeg/registers.nvim@main

     

       688
       689
        
       tweekmonster/wstrip.vim

     

       689
       690
        
       twerth/ir_black

+2 -1

pkgs/servers/calibre-web/default.nix

···

       21
       21
        
               --replace "singledispatch>=3.4.0.0,<3.5.0.0" "" \

     

       22
       22
        
               --replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \

     

       23
       23
        
               --replace "unidecode>=0.04.19,<1.2.0" "unidecode>=0.04.19" \

     

       24
       24
       -
               --replace "cps = calibreweb:main" "calibre-web = calibreweb:main"

     

       24
       24
       +
               --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \

     

       25
       25
       +
               --replace "Babel>=1.3, <2.9" "Babel>=1.3, <=2.9"

     

       25
       26
        
         '';

     

       26
       27
        
       

     

       27
       28
        
         patches = [

+3 -3

pkgs/tools/misc/blflash/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "blflash";

     

       5
       5
       -
         version = "0.3.2";

     

       5
       5
       +
         version = "0.3.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "spacemeowx2";

     

       9
       9
        
           repo = "blflash";

     

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

     

       11
       11
       -
           sha256 = "sha256-+2ncK1ibtQwlBREw4Yiqj4vFvAcZqjkoTBtBdAAUoRg=";

     

       11
       11
       +
           sha256 = "sha256-hPScmivtugtZm848Itzg4Tb9rppZny+rKi3IBuUxxQY=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-hgymSNivcNT9aXws20sBrk76ToDnCQh/dqfUHBzK1Ls=";

     

       14
       14
       +
         cargoSha256 = "sha256-/y3R8B2TOf8jeB9tcewoA9EGN6kj/EPMTjU6rfTF5Vc=";

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
        
           description = "An bl602 serial flasher written in Rust";

+2 -2

pkgs/tools/networking/burpsuite/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "burpsuite";

     

       5
       5
       -
         version = "2021.4.2";

     

       5
       5
       +
         version = "2021.5.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           name = "burpsuite.jar";

     
···

       10
       10
        
             "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"

     

       11
       11
        
             "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"

     

       12
       12
        
           ];

     

       13
       13
       -
           sha256 = "034c9d0a7e0b5e7b1b286949c6b31b475ff2a15e75f1230ccc07e236fc61d2aa";

     

       13
       13
       +
           sha256 = "sha256-nPz6IZpXCyg6cg2nuyqK2f5BI4dNb5tA2NriH3ZC198=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         dontUnpack = true;

-11

pkgs/tools/text/gpt2tc/0002-fix-download-url.patch

···

       1
       1
       -
       diff --git a/download_model.sh b/download_model.sh

     

       2
       2
       -
       index 9cb401f..ad1dc62 100755

     

       3
       3
       -
       --- a/download_model.sh

     

       4
       4
       -
       +++ b/download_model.sh

     

       5
       5
       -
       @@ -13,5 +13,5 @@ mkdir -p models/$model

     

       6
       6
       -
        for filename in checkpoint encoder.json hparams.json model.ckpt.data-00000-of-00001 model.ckpt.index model.ckpt.meta vocab.bpe; do

     

       7
       7
       -
          fetch=$model/$filename

     

       8
       8
       -
          echo "Fetching $fetch"

     

       9
       9
       -
       -  curl --output models/$fetch https://storage.googleapis.com/gpt-2/models/$fetch

     

       10
       10
       -
       +  curl --output models/$fetch https://openaipublic.blob.core.windows.net/gpt-2/models/$fetch

     

       11
       11
       -
        done

+5 -8

pkgs/tools/text/gpt2tc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "gpt2tc";

     

       5
       5
       -
         version = "2020-12-30";

     

       5
       5
       +
         version = "2021-04-24";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "https://bellard.org/nncp/gpt2tc-${version}.tar.gz";

     

       9
       9
       -
           hash = "sha256-KFcl7E6iGx50JaJI1jwzKAdkrkbNngPbrEA/ZSyG+uY=";

     

       8
       8
       +
           url = "https://bellard.org/libnc/gpt2tc-${version}.tar.gz";

     

       9
       9
       +
           hash = "sha256-kHnRziSNRewifM/oKDQwG27rXRvntuUUX8M+PUNHpA4=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         patches = [

     

       13
       13
        
           # Add a shebang to the python script so that nix detects it as such and

     

       14
       14
        
           # wraps it properly. Otherwise, it runs in shell and freezes the system.

     

       15
       15
        
           ./0001-add-python-shebang.patch

     

       16
       16
       -
       

     

       17
       17
       -
           # Update the source URL for the models because the old one is down.

     

       18
       18
       -
           ./0002-fix-download-url.patch

     

       19
       16
        
         ];

     

       20
       17
        
       

     

       21
       18
        
         nativeBuildInputs = [ autoPatchelfHook ];

     
···

       24
       21
        
           (python3.withPackages (p: with p; [ numpy tensorflow ]))

     

       25
       22
        
         ];

     

       26
       23
        
       

     

       27
       27
       -
         dontBuild = true;

     

       28
       28
       -
       

     

       29
       24
        
         installPhase = ''

     

       30
       25
        
           runHook preInstall

     

       31
       26
        
       

     

       27
       27
       +
           install -D -m755 -t $out/lib libnc${stdenv.hostPlatform.extensions.sharedLibrary}

     

       28
       28
       +
           addAutoPatchelfSearchPath $out/lib

     

       32
       29
        
           install -D -m755 -t $out/bin gpt2tc

     

       33
       30
        
           install -T -m755 download_model.sh $out/bin/gpt2-download-model

     

       34
       31
        
           install -T -m755 gpt2convert.py $out/bin/gpt2-convert