about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-01-10 13:14:56 +0100
committerGitHub <noreply@github.com>2021-01-10 13:14:56 +0100
commitad97cdf81d1889492f71ae421b98d6db9f982a36 (patch)
tree2976d3db6ab86b290ad9aac39c1560e5bccd7bd4
parentbe660e2ae5ecde63fb444a4802ae086e6cec9291 (diff)
parent37d559a2dc6b4c9b1163220a181708346902c52e (diff)
downloadnixlib-ad97cdf81d1889492f71ae421b98d6db9f982a36.tar
nixlib-ad97cdf81d1889492f71ae421b98d6db9f982a36.tar.gz
nixlib-ad97cdf81d1889492f71ae421b98d6db9f982a36.tar.bz2
nixlib-ad97cdf81d1889492f71ae421b98d6db9f982a36.tar.lz
nixlib-ad97cdf81d1889492f71ae421b98d6db9f982a36.tar.xz
nixlib-ad97cdf81d1889492f71ae421b98d6db9f982a36.tar.zst
nixlib-ad97cdf81d1889492f71ae421b98d6db9f982a36.zip
Merge pull request #108928 from SuperSandro2000/opustags
-rw-r--r--pkgs/applications/audio/opustags/default.nix22
-rw-r--r--pkgs/development/python-modules/awkward0/default.nix4
-rw-r--r--pkgs/development/python-modules/graphene/default.nix4
-rw-r--r--pkgs/development/python-modules/uproot3/default.nix4
4 files changed, 11 insertions, 23 deletions
diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix
index 4e26c9b77523..83cf44853a5a 100644
--- a/pkgs/applications/audio/opustags/default.nix
+++ b/pkgs/applications/audio/opustags/default.nix
@@ -1,32 +1,20 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libiconv, libogg
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libiconv, libogg
 , ffmpeg, glibcLocales, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
   pname = "opustags";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "fmang";
     repo = "opustags";
     rev = version;
-    sha256 = "1dicv4s395b9gb4jpr0rnxdq9azr45pid62q3x08lb7cvyq3yxbh";
+    sha256 = "1wsfw713rhi2gg5xc04cx5i31hlw0l3wdflj3r1y8w45bdk6ag1z";
   };
 
-  patches = [
-    # Fix building on darwin
-    (fetchpatch {
-      url = "https://github.com/fmang/opustags/commit/64fc6f8f6d20e034892e89abff0236c85cae98dc.patch";
-      sha256 = "1djifzqhf1w51gbpqbndsh3gnl9iizp6hppxx8x2a92i9ns22zpg";
-    })
-    (fetchpatch {
-      url = "https://github.com/fmang/opustags/commit/f98208c1a1d10c15f98b127bbfdf88a7b15b08dc.patch";
-      sha256 = "1h3v0r336fca0y8zq1vl2wr8gaqs3vvrrckx7pvji4k1jpiqvp38";
-    })
-  ];
-
   buildInputs = [ libogg ];
 
-  nativeBuildInputs = [ cmake pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+  nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   doCheck = true;
 
@@ -38,7 +26,7 @@ stdenv.mkDerivation rec {
     make check
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/fmang/opustags";
     description = "Ogg Opus tags editor";
     platforms = platforms.all;
diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix
index 4441d131e637..c248c81da751 100644
--- a/pkgs/development/python-modules/awkward0/default.nix
+++ b/pkgs/development/python-modules/awkward0/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "awkward0";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "awkward-0.x";
     rev = version;
-    sha256 = "17zrw25h6g5m4ik1c5piqb7q2bxrshfm4hm3lzfz4s8gi0xjm5gz";
+    sha256 = "sha256-C6/byIGcabGjws5QI9sh5BO2M4Lhqkooh4mSjUEKCKU=";
   };
 
   nativeBuildInputs = [ pytestrunner ];
diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix
index 860bb504cf1a..301ffca03477 100644
--- a/pkgs/development/python-modules/graphene/default.nix
+++ b/pkgs/development/python-modules/graphene/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "graphene";
-  version = "3.0.0b6";
+  version = "3.0.0b7";
 
   src = fetchFromGitHub {
     owner = "graphql-python";
     repo = "graphene";
     rev = "v${version}";
-    sha256 = "1q6qmyc4jbi9cws4d98x7bgi7gppd09dmzijkb19fwbh4giy938r";
+    sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix
index 0d0c2365b637..1150c76d2b48 100644
--- a/pkgs/development/python-modules/uproot3/default.nix
+++ b/pkgs/development/python-modules/uproot3/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "uproot3";
-  version = "3.14.1";
+  version = "3.14.2";
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot3";
     rev = version;
-    sha256 = "1npwh4l96wg3m24jhfc8i84nfwfc18flrmymf80fx101wmpi2qz8";
+    sha256 = "sha256-6/e+qMgwyFUo8MRRTAaGp9WLPxE2fqMEK4paq26Epzc=";
   };
 
   nativeBuildInputs = [ pytestrunner ];