From f3918b4bc39b95915c2dac471f16b11a2b891e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 20 Feb 2021 13:14:54 +0100 Subject: [PATCH 01/16] nixos/pipewire: only enable media-session if pipewire is enabled --- .../services/desktops/pipewire/pipewire-media-session.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 168cf13a88cb..81f4762e1e60 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -37,7 +37,8 @@ in { services.pipewire.media-session = { enable = mkOption { type = types.bool; - default = true; + default = config.services.pipewire.enable; + defaultText = "config.services.pipewire.enable"; description = "Example pipewire session manager"; }; From e85117b024d7576ca2f0d2f6e73ad8b9ee3116f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Feb 2021 00:40:12 +0000 Subject: [PATCH 02/16] minio: 2021-02-14T04-01-33Z -> 2021-02-19T04-38-02Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 677d166a3c2c..10105e3b27b0 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-02-14T04-01-33Z"; + version = "2021-02-19T04-38-02Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Su3BkVZJ4c5T829/1TNQi7b0fZhpG/Ly80ynt5Po+Qs="; + sha256 = "sha256-Swm8gQeSN84SYE0M03Se9n/clYVT/W/v0GAmRRsL674="; }; - vendorSha256 = "sha256-r0QtgpIfDYu2kSy6/wSAExc3Uwd62sDEi1UZ8XzTBoU="; + vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc="; doCheck = false; From ba701c3cc5b6a451ff995a0f018e7368754c6aa2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Feb 2021 00:44:06 +0000 Subject: [PATCH 03/16] minio-client: 2021-02-14T04-28-06Z -> 2021-02-19T05-34-40Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 7335a7a55360..a6c50e46205a 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-02-14T04-28-06Z"; + version = "2021-02-19T05-34-40Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-Wef8HyJVffDb+ZdVPZOxguIFBC0B9s/1u39j7uXWSnw="; + sha256 = "sha256-tkNGWX0QyMlMw+wB8wkYuGfveln6NUoIBLPscRHnQT4="; }; - vendorSha256 = "sha256-V/fsFfc1QbPR/ouW/9AqGeVhLSbDg6NHPqZYa4Fpx6I="; + vendorSha256 = "sha256-6l8VcHTSZBbFe96rzumMCPIVFVxUMIWoqiBGMtrx75U="; doCheck = false; From 8395f80fc4ad8eba6c5d803fabf2c9cb3f85119a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Feb 2021 00:53:29 +0000 Subject: [PATCH 04/16] mockgen: 1.4.4 -> 1.5.0 --- pkgs/development/tools/mockgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mockgen/default.nix b/pkgs/development/tools/mockgen/default.nix index 104988eb213b..06004b9f779a 100644 --- a/pkgs/development/tools/mockgen/default.nix +++ b/pkgs/development/tools/mockgen/default.nix @@ -1,14 +1,14 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "mockgen"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "golang"; repo = "mock"; rev = "v${version}"; - sha256 = "1lj0dvd6div4jaq1s0afpwqaq9ah8cxhkq93wii2ably1xmp2l0a"; + sha256 = "sha256-YSPfe8/Ra72qk12+T78mTppvkag0Hw6O7WNyfhG4h4o="; }; - vendorSha256 = "1md4cg1zzhc276sc7i2v0xvg5pf6gzy0n9ga2g1lx3d572igq1wy"; + vendorSha256 = "sha256-cL4a7iOSeaQiG6YO0im9bXxklCL1oyKhEDmB1BtEmEw="; doCheck = false; From c24258b0006dfa31f20a61de30097bf0e3702a3f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Feb 2021 02:19:05 +0000 Subject: [PATCH 05/16] osu-lazer: 2021.212.0 -> 2021.220.0 --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index c4764fc92876..7bea330e1cc7 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.212.0"; + version = "2021.220.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "JQUQEAZlVdyKhazhr7aI2I0+cHMQ303DZXUVgQiMaNs="; + sha256 = "XGwG/1cWSUNniCrUY1/18KHRtumxIWjfW5x+aYQ6RKU="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 9ba1259154b8..519d7b4179e7 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -366,8 +366,8 @@ }) (fetchNuGet { name = "Microsoft.Build.Locator"; - version = "1.2.6"; - sha256 = "1rnfd7wq2bkynqj767xmq9ha38mz010fmqvvvrgb4v86gd537737"; + version = "1.4.1"; + sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; @@ -556,8 +556,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "5.0.1"; - sha256 = "012klayhnnygncdi9zzq32vballb2wbknk91g2ziz5mhdhg38lr8"; + version = "5.0.2"; + sha256 = "0asbw0l5syfgk2qb26czggvdix43d6043kl25ihdqdlhghcyy806"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -721,13 +721,13 @@ }) (fetchNuGet { name = "NUnit"; - version = "3.12.0"; - sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; + version = "3.13.1"; + sha256 = "07156gr0yl9rqhyj44cp1xz9jpngbl5kb7ci3qfy9fcp01dczmm9"; }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.128.0"; - sha256 = "19c0bj9d0hjcyhaf04aapyzyd4yrzhc61k89z2il7y32841vnzg6"; + version = "2021.220.0"; + sha256 = "0lsv1xl4wav9wv50d1aba56sf6dgqa5qsx4lfn81azy3lzpcbzpp"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; From 514987f46f8d05668083cdfaa92a2d84e842ac46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Feb 2021 04:24:26 +0000 Subject: [PATCH 06/16] shipyard: 0.1.18 -> 0.2.1 --- pkgs/tools/virtualization/shipyard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index 511c61caf578..89ea852334f9 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.1.18"; + version = "0.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-ZrzW1sx0wCuaICONS3SR0VsqDj2ZUM53LaB5Wj1s9uc="; + sha256 = "sha256-eTwl2tMrhLPeHI0C76Rvm/OOt02OtDtejXYr4N6IWcg="; }; - vendorSha256 = "sha256-eeR316CKlAqWxlYcPZVlP260NR7WHfmCVE3PywMay/w="; + vendorSha256 = "sha256-rglpY7A0S56slL+mXFRgaZwS0bF1b9zxxmNYiX6TJzs="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" From c7917e58bdfa8149ae45188e290ffc5cfa0f3f13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Feb 2021 10:36:01 +0000 Subject: [PATCH 07/16] consul-template: 0.25.1 -> 0.25.2 --- pkgs/tools/system/consul-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index a285c720eaaa..c04b69675808 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "1205rhv4mizpb1nbc2sry52n7wljcwb8xp7lpazh1r1cldfayr5b"; + sha256 = "sha256-r9/CxXFaeod48NgOFWhl+axiNqjaU+RIEHI71fmYzP8="; }; - vendorSha256 = "0hv4b6k8k7xkzkjgzcm5y8pqyiwyk790a1qw18gjslkwkyw5hjf2"; + vendorSha256 = "sha256-DLjaDj3fJYl5ICxJuaCLKdd/AfwfUIM8teJLs3a2MHo="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here From 3be4cfb7de112339429c34de50510cdee3cbb722 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 10 Jan 2021 17:13:26 +0700 Subject: [PATCH 08/16] treewide: minor cleanup of packages maintained by siraben --- pkgs/development/python-modules/swspotify/default.nix | 2 +- pkgs/development/tools/knightos/scas/default.nix | 2 +- pkgs/tools/misc/swaglyrics/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index e213e9e265ef..020e4fe1472f 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Library to get the currently playing song and artist from Spotify"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix index eb0ab9621770..ceb8212cf7f9 100644 --- a/pkgs/development/tools/knightos/scas/default.nix +++ b/pkgs/development/tools/knightos/scas/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Assembler and linker for the Z80"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix index 4bc5c28b5599..b3f58c4cdb18 100644 --- a/pkgs/tools/misc/swaglyrics/default.nix +++ b/pkgs/tools/misc/swaglyrics/default.nix @@ -42,6 +42,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } From 4f1e0c7ec06b7c4a0bcacbce38127212ca94ae6b Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Sat, 20 Feb 2021 17:46:39 +0100 Subject: [PATCH 09/16] mysqltuner: add password list to output --- pkgs/tools/misc/mysqltuner/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index 783f93daab45..e4bb43dd509a 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -11,17 +11,29 @@ stdenv.mkDerivation rec { sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0="; }; + postPatch = '' + substituteInPlace mysqltuner.pl \ + --replace '$basic_password_files = "/usr/share/mysqltuner/basic_passwords.txt"' "\$basic_password_files = \"$out/share/basic_passwords.txt\"" \ + --replace '$opt{cvefile} = "/usr/share/mysqltuner/vulnerabilities.csv"' "\$opt{cvefile} = \"$out/share/vulnerabilities.csv\"" + ''; + buildInputs = [ perl ]; installPhase = '' - mkdir -p $out/bin - install -m0755 mysqltuner.pl $out/bin/mysqltuner + runHook preInstall + + mkdir -p "$out/bin" + install -Dm 0755 mysqltuner.pl "$out/bin/mysqltuner" + install -Dm 0644 basic_passwords.txt "$out/share/basic_passwords.txt" + install -Dm 0644 vulnerabilities.csv "$out/share/vulnerabilities.csv" + + runHook postInstall ''; meta = with lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; homepage = "http://mysqltuner.com"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg shamilton ]; }; } From 9d21f1dfabe0d9be680c1b923c42155f482df30d Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 28 Sep 2020 06:29:27 -0700 Subject: [PATCH 10/16] nixos/plymouth: Add label plugin and a font to the initrd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows Plymouth to show the “NixOS 21.03” label under the logo at startup like it already does at shutdown. Fixes #59992. Signed-off-by: Anders Kaseorg --- nixos/modules/system/boot/plymouth.nix | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 55e5b07ed615..d6d3f7a3b44c 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -38,6 +38,14 @@ in enable = mkEnableOption "Plymouth boot splash screen"; + font = mkOption { + default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"; + type = types.path; + description = '' + Font file made available for displaying text on the splash screen. + ''; + }; + themePackages = mkOption { default = [ nixosBreezePlymouth ]; type = types.listOf types.package; @@ -113,7 +121,7 @@ in mkdir -p $out/lib/plymouth/renderers # module might come from a theme - cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth + cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out/lib/plymouth cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers mkdir -p $out/share/plymouth/themes @@ -133,6 +141,17 @@ in cp -r themes/* $out/share/plymouth/themes cp ${cfg.logo} $out/share/plymouth/logo.png + + mkdir -p $out/share/fonts + cp ${cfg.font} $out/share/fonts + mkdir -p $out/etc/fonts + cat > $out/etc/fonts/fonts.conf < + + + $out/share/fonts + + EOF ''; boot.initrd.extraUtilsCommandsTest = '' @@ -154,6 +173,7 @@ in ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png ln -s $extraUtils/share/plymouth/themes /etc/plymouth/themes ln -s $extraUtils/lib/plymouth /etc/plymouth/plugins + ln -s $extraUtils/etc/fonts /etc/fonts plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session plymouth show-splash From b59301034873f132dd6971099446f2ceb3b060ae Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 16 Feb 2021 15:55:00 -0500 Subject: [PATCH 11/16] pythonPackages.protobuf3-to-dict: Init at 0.1.5 --- .../protobuf3-to-dict/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/protobuf3-to-dict/default.nix diff --git a/pkgs/development/python-modules/protobuf3-to-dict/default.nix b/pkgs/development/python-modules/protobuf3-to-dict/default.nix new file mode 100644 index 000000000000..008d9a600247 --- /dev/null +++ b/pkgs/development/python-modules/protobuf3-to-dict/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, protobuf, six }: + +buildPythonPackage rec { + pname = "protobuf3-to-dict"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nibblvj3n20zvq6d73zalbjqjby0w8ji5mim7inhn7vb9dw4hhy"; + }; + + doCheck = false; + + pythonImportsCheck = [ "protobuf_to_dict" ]; + + propagatedBuildInputs = [ protobuf six ]; + + meta = with lib; { + description = + "A teeny Python library for creating Python dicts from protocol buffers and the reverse"; + homepage = "https://github.com/kaporzhu/protobuf-to-dict"; + license = licenses.publicDomain; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88b66b1420e9..fc1969aa8dcd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5137,6 +5137,8 @@ in { protobuf = pkgs.protobuf; }; + protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; + prov = callPackage ../development/python-modules/prov { }; prox-tv = callPackage ../development/python-modules/prox-tv { }; From c10da052fc764b534d6d0b9ef28abe2f84b239b3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 16 Feb 2021 15:55:32 -0500 Subject: [PATCH 12/16] pythonPackages.smdebug-rulesconfig: Init at 1.0.1 --- .../smdebug-rulesconfig/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/smdebug-rulesconfig/default.nix diff --git a/pkgs/development/python-modules/smdebug-rulesconfig/default.nix b/pkgs/development/python-modules/smdebug-rulesconfig/default.nix new file mode 100644 index 000000000000..864a395cc88c --- /dev/null +++ b/pkgs/development/python-modules/smdebug-rulesconfig/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "smdebug-rulesconfig"; + version = "1.0.1"; + + src = fetchPypi { + inherit version; + pname = "smdebug_rulesconfig"; + sha256 = "1mpwjfvpmryqqwlbyf500584jclgm3vnxa740yyfzkvb5vmyc6bs"; + }; + + doCheck = false; + + pythonImportsCheck = [ "smdebug_rulesconfig" ]; + + meta = with lib; { + description = "These builtin rules are available in Amazon SageMaker"; + homepage = "https://github.com/awslabs/sagemaker-debugger-rulesconfig"; + license = licenses.asl20; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc1969aa8dcd..6b6861db3b0c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7332,6 +7332,8 @@ in { smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; + smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { }; + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smmap = callPackage ../development/python-modules/smmap { }; From 6d408889f092213fcb1a460cf2b31be1c134a3e4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 16 Feb 2021 15:55:57 -0500 Subject: [PATCH 13/16] pythonPackages.sagemaker: Init at 2.24.5 --- .../python-modules/sagemaker/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/sagemaker/default.nix diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix new file mode 100644 index 000000000000..048e7e1808c6 --- /dev/null +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi, attrs, boto3, google-pasta +, importlib-metadata, numpy, protobuf, protobuf3-to-dict, smdebug-rulesconfig }: + +buildPythonPackage rec { + pname = "sagemaker"; + version = "2.24.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1j1a058ic00yxnf0cc364fzn82pacih5ffrh5s4dw1q4s3by4cvd"; + }; + + doCheck = false; + + pythonImportsCheck = [ "sagemaker" ]; + + propagatedBuildInputs = [ + attrs + boto3 + google-pasta + importlib-metadata + numpy + protobuf + protobuf3-to-dict + smdebug-rulesconfig + ]; + + meta = with lib; { + description = + "Library for training and deploying machine learning models on Amazon SageMaker"; + homepage = "https://github.com/aws/sagemaker-python-sdk/"; + license = licenses.asl20; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b6861db3b0c..cd687874f79c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7020,6 +7020,8 @@ in { safety = callPackage ../development/python-modules/safety { }; + sagemaker = callPackage ../development/python-modules/sagemaker { }; + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; sane = callPackage ../development/python-modules/sane { From 340eff8b0dc08a8d40d6ab7060b75f4cc75e689d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 21 Feb 2021 16:01:50 -0500 Subject: [PATCH 14/16] Update pkgs/development/python-modules/protobuf3-to-dict/default.nix Co-authored-by: Sandro --- pkgs/development/python-modules/protobuf3-to-dict/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protobuf3-to-dict/default.nix b/pkgs/development/python-modules/protobuf3-to-dict/default.nix index 008d9a600247..ffc21c1428fe 100644 --- a/pkgs/development/python-modules/protobuf3-to-dict/default.nix +++ b/pkgs/development/python-modules/protobuf3-to-dict/default.nix @@ -16,8 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ protobuf six ]; meta = with lib; { - description = - "A teeny Python library for creating Python dicts from protocol buffers and the reverse"; + description = "A teeny Python library for creating Python dicts from protocol buffers and the reverse"; homepage = "https://github.com/kaporzhu/protobuf-to-dict"; license = licenses.publicDomain; maintainers = with maintainers; [ nequissimus ]; From 6b81e73c4b5dc2a13bd82700149fcdcef79d2976 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 21 Feb 2021 16:01:57 -0500 Subject: [PATCH 15/16] Update pkgs/development/python-modules/sagemaker/default.nix Co-authored-by: Sandro --- pkgs/development/python-modules/sagemaker/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 048e7e1808c6..15264df96ecd 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -26,8 +26,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = - "Library for training and deploying machine learning models on Amazon SageMaker"; + description = "Library for training and deploying machine learning models on Amazon SageMaker"; homepage = "https://github.com/aws/sagemaker-python-sdk/"; license = licenses.asl20; maintainers = with maintainers; [ nequissimus ]; From 90120d702ccb3b76bf56dbf375894c810b8feb9f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 22 Feb 2021 05:59:57 +1000 Subject: [PATCH 16/16] youtube-dl: 2021.02.10 -> 2021.02.22 https://github.com/ytdl-org/youtube-dl/releases/tag/2021.02.22 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1fc8a3916bf9..497d928516ab 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.02.10"; + version = "2021.02.22"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "08liybkivqb32nbrzvvlv56yw6418zwmml7p6dbqcivhdgvas1yn"; + sha256 = "19j4kfqln1yk47dpid9j4z3zvgxy6xar1mpfsadifikfdgbmsq7x"; }; nativeBuildInputs = [ installShellFiles makeWrapper ];