diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/tools/text/gpt2tc | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/text/gpt2tc')
| -rw-r--r-- | nixpkgs/pkgs/tools/text/gpt2tc/0002-fix-download-url.patch | 11 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/text/gpt2tc/default.nix | 13 |
2 files changed, 5 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/tools/text/gpt2tc/0002-fix-download-url.patch b/nixpkgs/pkgs/tools/text/gpt2tc/0002-fix-download-url.patch deleted file mode 100644 index fd8f93834e52..000000000000 --- a/nixpkgs/pkgs/tools/text/gpt2tc/0002-fix-download-url.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/download_model.sh b/download_model.sh -index 9cb401f..ad1dc62 100755 ---- a/download_model.sh -+++ b/download_model.sh -@@ -13,5 +13,5 @@ mkdir -p models/$model - for filename in checkpoint encoder.json hparams.json model.ckpt.data-00000-of-00001 model.ckpt.index model.ckpt.meta vocab.bpe; do - fetch=$model/$filename - echo "Fetching $fetch" -- curl --output models/$fetch https://storage.googleapis.com/gpt-2/models/$fetch -+ curl --output models/$fetch https://openaipublic.blob.core.windows.net/gpt-2/models/$fetch - done diff --git a/nixpkgs/pkgs/tools/text/gpt2tc/default.nix b/nixpkgs/pkgs/tools/text/gpt2tc/default.nix index eb79d9009f34..3714a4185485 100644 --- a/nixpkgs/pkgs/tools/text/gpt2tc/default.nix +++ b/nixpkgs/pkgs/tools/text/gpt2tc/default.nix @@ -2,20 +2,17 @@ stdenv.mkDerivation rec { pname = "gpt2tc"; - version = "2020-12-30"; + version = "2021-04-24"; src = fetchurl { - url = "https://bellard.org/nncp/gpt2tc-${version}.tar.gz"; - hash = "sha256-KFcl7E6iGx50JaJI1jwzKAdkrkbNngPbrEA/ZSyG+uY="; + url = "https://bellard.org/libnc/gpt2tc-${version}.tar.gz"; + hash = "sha256-kHnRziSNRewifM/oKDQwG27rXRvntuUUX8M+PUNHpA4="; }; patches = [ # Add a shebang to the python script so that nix detects it as such and # wraps it properly. Otherwise, it runs in shell and freezes the system. ./0001-add-python-shebang.patch - - # Update the source URL for the models because the old one is down. - ./0002-fix-download-url.patch ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -24,11 +21,11 @@ stdenv.mkDerivation rec { (python3.withPackages (p: with p; [ numpy tensorflow ])) ]; - dontBuild = true; - installPhase = '' runHook preInstall + install -D -m755 -t $out/lib libnc${stdenv.hostPlatform.extensions.sharedLibrary} + addAutoPatchelfSearchPath $out/lib install -D -m755 -t $out/bin gpt2tc install -T -m755 download_model.sh $out/bin/gpt2-download-model install -T -m755 gpt2convert.py $out/bin/gpt2-convert |