From d29570fd37ed95954bfa58f8306dd212f506746a Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 13 Dec 2020 23:34:13 -0500 Subject: [PATCH 01/46] pythonPackages.python-prctl: disabled tests causing build failure Now disables tests using pytestCheckHook + disabledTests instead of patch file. Disables: - test_speculation_ctrl - test_mpx Enables: - test_mce_kill - test_proctitle --- .../python-modules/python-prctl/default.nix | 19 ++++++++++- .../python-prctl/skip_bad_tests.patch | 34 ------------------- 2 files changed, 18 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/python-prctl/skip_bad_tests.patch diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix index 2fd88858de7..dc967b54305 100644 --- a/pkgs/development/python-modules/python-prctl/default.nix +++ b/pkgs/development/python-modules/python-prctl/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , libcap +, pytestCheckHook }: buildPythonPackage rec { @@ -13,9 +14,25 @@ buildPythonPackage rec { sha256 = "b4ca9a25a7d4f1ace4fffd1f3a2e64ef5208fe05f929f3edd5e27081ca7e67ce"; }; - patches = [ ./skip_bad_tests.patch ]; buildInputs = [ libcap ]; + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + # Intel MPX support was removed in GCC 9.1 & Linux kernel 5.6 + "test_mpx" + + # The Nix build sandbox has no_new_privs already enabled + "test_no_new_privs" + + # The Nix build sandbox has seccomp already enabled + "test_seccomp" + + # This will fail if prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_FORCE_DISABLE) + # has been set system-wide, even outside the sandbox + "test_speculation_ctrl" + ]; + meta = { description = "Python(ic) interface to the linux prctl syscall"; homepage = "https://github.com/seveas/python-prctl"; diff --git a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch b/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch deleted file mode 100644 index 19d70f234a9..00000000000 --- a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- ./test_prctl.py 2018-01-26 16:02:52.000000000 -0500 -+++ ./test_prctl.py 2018-06-21 18:26:43.370065009 -0400 -@@ -154,6 +154,7 @@ - prctl.set_keepcaps(False) - self.assertEqual(prctl.get_keepcaps(), False) - -+ @unittest.skip("No access to /proc in the Nix build sandbox") - @require('set_mce_kill') - def test_mce_kill(self): - """Test the MCE_KILL setting""" -@@ -173,6 +174,7 @@ - prctl.set_name(name) - self.assertEqual(prctl.get_name(), name[:15]) - -+ @unittest.skip("The Nix build sandbox has no_new_privs already enabled") - @require('get_no_new_privs') - def test_no_new_privs(self): - """Test the no_new_privs function""" -@@ -189,6 +191,7 @@ - self.assertNotEqual(sp.returncode, 0) - os._exit(0) - -+ @unittest.skip("No access to /proc in the Nix build sandbox") - def test_proctitle(self): - """Test setting the process title, including too long titles""" - title = "This is a test!" -@@ -225,6 +228,7 @@ - os._exit(0) - self.assertRaises(OSError, prctl.set_ptracer, new_pid) - -+ @unittest.skip("The Nix build sandbox has seccomp already enabled") - @require('get_seccomp') - def test_seccomp(self): - """Test manipulation of the seccomp setting""" From b0ff7414c27ae56e9ac1dda08a7388732457eea5 Mon Sep 17 00:00:00 2001 From: jakobrs Date: Sat, 9 Jan 2021 17:02:57 +0100 Subject: [PATCH 02/46] libstrangle: 2017-02-22 -> 0.1.1 --- pkgs/tools/X11/libstrangle/default.nix | 17 ++++++---- pkgs/tools/X11/libstrangle/nixos.patch | 44 +++++++++++++++++--------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix index 1f0a7a8e3a6..d8c220d0fd7 100644 --- a/pkgs/tools/X11/libstrangle/default.nix +++ b/pkgs/tools/X11/libstrangle/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitLab, libGL, libX11 }: stdenv.mkDerivation rec { pname = "libstrangle"; - version = "2017-02-22"; + version = "0.1.1"; - src = fetchFromGitHub { - owner = "milaq"; + buildInputs = [ libGL libX11 ]; + + src = fetchFromGitLab { + owner = "torkel104"; repo = pname; - rev = "6020f9e375ba747c75eb7996b7d5f0214ac3221e"; - sha256 = "04ikacbjcq9phdc8q5y1qjjpa1sxmzfm0idln9ys95prg289zp4h"; + rev = version; + sha256 = "135icr544w5ynlxfnxqgjn794bsm9i703rh9jfnracjb7jgnha4w"; }; makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; @@ -17,10 +19,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteAllInPlace src/strangle.sh + substituteAllInPlace src/stranglevk.sh ''; meta = with lib; { - homepage = "https://github.com/milaq/libstrangle"; + homepage = "https://gitlab.com/torkel104/libstrangle"; description = "Frame rate limiter for Linux/OpenGL"; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/X11/libstrangle/nixos.patch b/pkgs/tools/X11/libstrangle/nixos.patch index 03c8c19b54c..05364028e3e 100644 --- a/pkgs/tools/X11/libstrangle/nixos.patch +++ b/pkgs/tools/X11/libstrangle/nixos.patch @@ -1,29 +1,43 @@ diff --git a/makefile b/makefile -index eb13054..a3a1125 100644 --- a/makefile +++ b/makefile -@@ -27,12 +27,10 @@ $(BUILDDIR)libstrangle32.so: $(BUILDDIR) - $(CC) $(CFLAGS) $(LDFLAGS) -m32 -o $(BUILDDIR)libstrangle32.so $(SOURCES) +@@ -86,10 +86,6 @@ install-common: + install -m 0755 -D -T $(SOURCEDIR)/stranglevk.sh $(DESTDIR)$(bindir)/stranglevk + install -m 0644 -D -T $(SOURCEDIR)/vulkan/libstrangle_vk.json $(DESTDIR)$(datarootdir)/vulkan/implicit_layer.d/libstrangle_vk.json - install: all -- install -m 0644 -D -T $(BUILDDIR)libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf - install -m 0755 -D -T $(BUILDDIR)libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so - install -m 0755 -D -T $(BUILDDIR)libstrangle64.so $(DESTDIR)$(LIB64_PATH)/libstrangle.so - install -m 0755 -D -T $(SOURCEDIR)strangle.sh $(DESTDIR)$(bindir)/strangle - install -m 0644 -D -T COPYING $(DESTDIR)$(DOC_PATH)/LICENSE +-install-ld: ld +- install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf - ldconfig +- + install-32: 32-bit + install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so + install -m 0755 -D -T $(BUILDDIR)/libstrangle32_nodlsym.so $(DESTDIR)$(LIB32_PATH)/libstrangle_nodlsym.so +@@ -109,8 +105,7 @@ install: \ + all \ + install-common \ + install-32 \ +- install-64 \ +- install-ld ++ install-64 clean: - rm -f $(BUILDDIR)libstrangle64.so + rm -f $(BUILDDIR)/libstrangle64.so diff --git a/src/strangle.sh b/src/strangle.sh -index e280e86..b2dd42b 100755 --- a/src/strangle.sh +++ b/src/strangle.sh -@@ -31,6 +31,5 @@ if [ "$#" -eq 0 ]; then - exit 1 +@@ -130,6 +130,5 @@ if [ "$STRANGLE_VKONLY" != "1" ]; then + fi fi -# Execute the strangled program under a clean environment # pass through the FPS and overriden LD_PRELOAD environment variables --exec env FPS="${FPS}" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" "$@" -+FPS="${FPS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" exec "$@" +-exec env ENABLE_VK_LAYER_TORKEL104_libstrangle=1 LD_PRELOAD="${LD_PRELOAD}" "$@" ++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 XDG_DATA_DIRS="${XDG_DATA_DIRS}${XDG_DATA_DIRS:+:}@out@/share" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}" exec "$@" +diff --git a/src/stranglevk.sh b/src/stranglevk.sh +--- a/src/stranglevk.sh ++++ b/src/stranglevk.sh +@@ -1,3 +1,3 @@ + #!/bin/sh + +-ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 strangle "$@" ++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 @out@/bin/strangle "$@" From 39d448a033f7adbb9f018217dfa0d217e34735dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 09:44:04 +0000 Subject: [PATCH 03/46] ocenaudio: 3.9.6 -> 3.10.2 --- pkgs/applications/audio/ocenaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index c3ab0ffcebd..26a3d57b9ef 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.9.6"; + version = "3.10.2"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "07r49133kk99ya4grwby3admy892mkk9cfxz3wh0v81aznhpw4jg"; + sha256 = "sha256-mmo6/zc/3R8ptXfY01RKUOLgmDhWTHiYBMlGqpdMTAo="; }; From 67f00f7ac9ee06e3f248c25fa31aebe38e55fbb8 Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Wed, 27 Jan 2021 11:20:16 +0100 Subject: [PATCH 04/46] xcode-install: init at 2.6.8 --- pkgs/development/tools/xcode-install/Gemfile | 2 + .../tools/xcode-install/Gemfile.lock | 204 +++++ .../tools/xcode-install/default.nix | 17 + .../tools/xcode-install/gemset.nix | 833 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 1058 insertions(+) create mode 100644 pkgs/development/tools/xcode-install/Gemfile create mode 100644 pkgs/development/tools/xcode-install/Gemfile.lock create mode 100644 pkgs/development/tools/xcode-install/default.nix create mode 100644 pkgs/development/tools/xcode-install/gemset.nix diff --git a/pkgs/development/tools/xcode-install/Gemfile b/pkgs/development/tools/xcode-install/Gemfile new file mode 100644 index 00000000000..b9d313ce14f --- /dev/null +++ b/pkgs/development/tools/xcode-install/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'xcode-install' diff --git a/pkgs/development/tools/xcode-install/Gemfile.lock b/pkgs/development/tools/xcode-install/Gemfile.lock new file mode 100644 index 00000000000..589543fe47d --- /dev/null +++ b/pkgs/development/tools/xcode-install/Gemfile.lock @@ -0,0 +1,204 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.3) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.1.0) + aws-partitions (1.419.0) + aws-sdk-core (3.111.2) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.41.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.87.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + claide (1.0.3) + colored (1.2) + colored2 (3.1.2) + commander-fastlane (4.4.6) + highline (~> 1.7.2) + declarative (0.0.20) + declarative-option (0.1.0) + digest-crc (0.6.3) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.6) + emoji_regex (3.2.1) + excon (0.78.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-net_http (1.0.1) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fastimage (2.2.1) + fastlane (2.172.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.3, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander-fastlane (>= 4.4.6, < 5.0.0) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-api-client (>= 0.37.0, < 0.39.0) + google-cloud-storage (>= 1.15.0, < 2.0.0) + highline (>= 1.7.2, < 2.0.0) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (~> 2.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + slack-notifier (>= 2.0.0, < 3.0.0) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-api-client (0.38.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.9) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + signet (~> 0.12) + google-apis-core (0.2.1) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.14) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + rexml + signet (~> 0.14) + webrick + google-apis-iamcredentials_v1 (0.1.0) + google-apis-core (~> 0.1) + google-apis-storage_v1 (0.1.0) + google-apis-core (~> 0.1) + google-cloud-core (1.5.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.4.0) + faraday (>= 0.17.3, < 2.0) + google-cloud-errors (1.0.1) + google-cloud-storage (1.30.0) + addressable (~> 2.5) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.1) + google-cloud-core (~> 1.2) + googleauth (~> 0.9) + mini_mime (~> 1.0) + googleauth (0.15.0) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.14) + highline (1.7.10) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.4.0) + json (2.5.1) + jwt (2.2.2) + memoist (0.16.2) + mini_magick (4.11.0) + mini_mime (1.0.2) + multi_json (1.15.0) + multipart-post (2.0.0) + nanaimo (0.3.0) + naturally (2.2.1) + os (1.1.1) + plist (3.6.0) + public_suffix (4.0.6) + rake (13.0.3) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.4) + rouge (2.0.7) + ruby2_keywords (0.0.4) + rubyzip (2.3.0) + security (0.1.3) + signet (0.14.0) + addressable (~> 2.3) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.8) + CFPropertyList + naturally + slack-notifier (2.3.2) + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + tty-cursor (0.7.1) + tty-screen (0.8.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) + webrick (1.7.0) + word_wrap (1.0.0) + xcode-install (2.6.8) + claide (>= 0.9.1, < 1.1.0) + fastlane (>= 2.1.0, < 3.0.0) + xcodeproj (1.19.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + xcode-install + +BUNDLED WITH + 1.17.2 diff --git a/pkgs/development/tools/xcode-install/default.nix b/pkgs/development/tools/xcode-install/default.nix new file mode 100644 index 00000000000..677217b5c81 --- /dev/null +++ b/pkgs/development/tools/xcode-install/default.nix @@ -0,0 +1,17 @@ +{ lib +, bundlerApp +}: + +bundlerApp { + pname = "xcode-install"; + gemdir = ./.; + exes = [ "xcversion" ]; + + meta = with lib; { + description = "Install and update your Xcodes automatically"; + homepage = "https://github.com/xcpretty/xcode-install"; + platforms = platforms.unix; + maintainers = with maintainers; [ q3k ]; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/development/tools/xcode-install/gemset.nix b/pkgs/development/tools/xcode-install/gemset.nix new file mode 100644 index 00000000000..c6355de34a2 --- /dev/null +++ b/pkgs/development/tools/xcode-install/gemset.nix @@ -0,0 +1,833 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; + }; + artifactory = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls"; + type = "gem"; + }; + version = "3.0.15"; + }; + atomos = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx"; + type = "gem"; + }; + version = "0.1.3"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz0djj8w3ns0sz5gvkla5jml8xzx6skbcfj255m81fyww1x6ws8"; + type = "gem"; + }; + version = "1.419.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; + type = "gem"; + }; + version = "3.111.2"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; + type = "gem"; + }; + version = "1.41.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; + type = "gem"; + }; + version = "1.87.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; + type = "gem"; + }; + version = "1.2.2"; + }; + babosa = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16dwqn33kmxkqkv51cwiikdkbrdjfsymlnc0rgbjwilmym8a9phq"; + type = "gem"; + }; + version = "1.0.4"; + }; + CFPropertyList = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; + type = "gem"; + }; + version = "3.0.3"; + }; + claide = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + type = "gem"; + }; + version = "1.0.3"; + }; + colored = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; + type = "gem"; + }; + version = "1.2"; + }; + colored2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + commander-fastlane = { + dependencies = ["highline"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65"; + type = "gem"; + }; + version = "4.4.6"; + }; + declarative = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; + type = "gem"; + }; + version = "0.0.20"; + }; + declarative-option = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; + type = "gem"; + }; + version = "0.1.0"; + }; + digest-crc = { + dependencies = ["rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a"; + type = "gem"; + }; + version = "0.6.3"; + }; + domain_name = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + type = "gem"; + }; + version = "2.7.6"; + }; + emoji_regex = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s"; + type = "gem"; + }; + version = "3.2.1"; + }; + excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r"; + type = "gem"; + }; + version = "0.78.1"; + }; + faraday = { + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + type = "gem"; + }; + version = "1.3.0"; + }; + faraday-cookie_jar = { + dependencies = ["faraday" "http-cookie"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; + type = "gem"; + }; + version = "0.0.7"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; + type = "gem"; + }; + version = "1.0.0"; + }; + fastimage = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j"; + type = "gem"; + }; + version = "2.2.1"; + }; + fastlane = { + dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0crr42qdgy9l409pffpfs7nq8ha18lp1nxngny2dc9hiq1xx4r5d"; + type = "gem"; + }; + version = "2.172.0"; + }; + gh_inspector = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04"; + type = "gem"; + }; + version = "1.1.3"; + }; + google-api-client = { + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1"; + type = "gem"; + }; + version = "0.38.0"; + }; + google-apis-core = { + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet" "webrick"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "184pqw7z7s8mc1r5gj8f76xvp8z650xq50vdfj5gjwsbmzd99z2f"; + type = "gem"; + }; + version = "0.2.1"; + }; + google-apis-iamcredentials_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xjlzq2fxpwvp9b6ajs8cpyjv8vs2d2npg9v23yj181hj2fnn82c"; + type = "gem"; + }; + version = "0.1.0"; + }; + google-apis-storage_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0axycds5q20fqm6vqxa5r922021p0f8jhwvlgw8r1vq600ljribi"; + type = "gem"; + }; + version = "0.1.0"; + }; + google-cloud-core = { + dependencies = ["google-cloud-env" "google-cloud-errors"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1"; + type = "gem"; + }; + version = "1.5.0"; + }; + google-cloud-env = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i"; + type = "gem"; + }; + version = "1.4.0"; + }; + google-cloud-errors = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67"; + type = "gem"; + }; + version = "1.0.1"; + }; + google-cloud-storage = { + dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17axi5gmy0g04801v11lww5mvqzffqdc3w6k1j7f95v90hy4yn6m"; + type = "gem"; + }; + version = "1.30.0"; + }; + googleauth = { + dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pwm0mzb5zffhk6yw4v3n1yj8qr6jla6f78vsv4g0bxh9z0ikc2z"; + type = "gem"; + }; + version = "0.15.0"; + }; + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + type = "gem"; + }; + version = "1.7.10"; + }; + http-cookie = { + dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + type = "gem"; + }; + version = "1.4.0"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + type = "gem"; + }; + version = "2.5.1"; + }; + jwt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; + type = "gem"; + }; + version = "2.2.2"; + }; + memoist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; + type = "gem"; + }; + version = "0.16.2"; + }; + mini_magick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + type = "gem"; + }; + version = "4.11.0"; + }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + type = "gem"; + }; + version = "1.0.2"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + nanaimo = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; + type = "gem"; + }; + version = "0.3.0"; + }; + naturally = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59"; + type = "gem"; + }; + version = "2.2.1"; + }; + os = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; + type = "gem"; + }; + version = "1.1.1"; + }; + plist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; + type = "gem"; + }; + version = "3.6.0"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + type = "gem"; + }; + version = "13.0.3"; + }; + representable = { + dependencies = ["declarative" "declarative-option" "uber"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + type = "gem"; + }; + version = "3.0.4"; + }; + retriable = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; + type = "gem"; + }; + version = "3.1.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; + rouge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + type = "gem"; + }; + version = "2.0.7"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + type = "gem"; + }; + version = "2.3.0"; + }; + security = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa"; + type = "gem"; + }; + version = "0.1.3"; + }; + signet = { + dependencies = ["addressable" "faraday" "jwt" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp"; + type = "gem"; + }; + version = "0.14.0"; + }; + simctl = { + dependencies = ["CFPropertyList" "naturally"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x"; + type = "gem"; + }; + version = "1.6.8"; + }; + slack-notifier = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv"; + type = "gem"; + }; + version = "2.3.2"; + }; + terminal-notifier = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs"; + type = "gem"; + }; + version = "2.0.0"; + }; + terminal-table = { + dependencies = ["unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-screen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + type = "gem"; + }; + version = "0.8.1"; + }; + tty-spinner = { + dependencies = ["tty-cursor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf"; + type = "gem"; + }; + version = "0.9.3"; + }; + uber = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; + type = "gem"; + }; + version = "0.1.0"; + }; + unf = { + dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + type = "gem"; + }; + version = "0.0.7.7"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + type = "gem"; + }; + version = "1.7.0"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; + }; + word_wrap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iyc5bc7dbgsd8j3yk1i99ral39f23l6wapi0083fbl19hid8mpm"; + type = "gem"; + }; + version = "1.0.0"; + }; + xcode-install = { + dependencies = ["claide" "fastlane"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhslanqw8r0mhls2hira05c8xjzzr7mnz1ab9p5qwg4z45ddjj8"; + type = "gem"; + }; + version = "2.6.8"; + }; + xcodeproj = { + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + type = "gem"; + }; + version = "1.19.0"; + }; + xcpretty = { + dependencies = ["rouge"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; + type = "gem"; + }; + version = "0.3.0"; + }; + xcpretty-travis-formatter = { + dependencies = ["xcpretty"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14rg4f70klrs910n7rsgfa4dn8s2qyny55194ax2qyyb2wpk7k5a"; + type = "gem"; + }; + version = "1.0.1"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 561c8b975ee..7e838cc607d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12873,6 +12873,8 @@ in xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; + xcode-install = callPackage ../development/tools/xcode-install { }; + xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; From efb1662586c7f85dac6a93e2635d5f7898e9e6ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 22:49:53 +0000 Subject: [PATCH 05/46] gwyddion: 2.56 -> 2.57 --- pkgs/applications/science/chemistry/gwyddion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 8d9ea7a3917..74a6b495587 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -35,10 +35,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.56"; + version = "2.57"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "0z83p3ifdkv5dds8s6fqqbycql1zmgppdc7ygqmm12z5zlrl9p12"; + sha256 = "sha256-kx/WqtNDaJQyVehxZ3weddXyaM1knX+fCuv47A9GaH0="; }; nativeBuildInputs = [ pkg-config file ]; From e4f534b8ab129a205ea120ba530f3cdf63ced890 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 00:01:39 +0000 Subject: [PATCH 06/46] simplenote: 2.2.0 -> 2.5.0 --- pkgs/applications/misc/simplenote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 840b37351c7..3fb99d5b3d5 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -17,10 +17,10 @@ let pname = "simplenote"; - version = "2.2.0"; + version = "2.5.0"; sha256 = { - x86_64-linux = "123b0fh14068s2z3k6s5mmh46xwlz02qfnpmj838zlm5hckjmifv"; + x86_64-linux = "sha256-Mn1oie+YHNtYKriIAIHdO+tUQDqaA34dkAJgZvQy76I="; }.${system} or throwSystem; meta = with lib; { From 38c65ecb2c49c03a519ae9f5f378be27cf90fef3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 09:14:25 +0000 Subject: [PATCH 07/46] ocamlPackages.graphics: 5.1.0 -> 5.1.1 --- pkgs/development/ocaml-modules/graphics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/graphics/default.nix b/pkgs/development/ocaml-modules/graphics/default.nix index 6a3217431b4..10d0b4ea6fc 100644 --- a/pkgs/development/ocaml-modules/graphics/default.nix +++ b/pkgs/development/ocaml-modules/graphics/default.nix @@ -3,13 +3,13 @@ buildDunePackage rec { pname = "graphics"; - version = "5.1.0"; + version = "5.1.1"; useDune2 = true; src = fetchurl { url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz"; - sha256 = "16z997mp0ccilaqqvmz3wp7vx0ghaf4ik9qklgd4piklcl1yv5n5"; + sha256 = "sha256-KGyD497ZKHA2xeXHezmh3P1zoSlre1h5N9zjkAFmMo4="; }; buildInputs = [ dune-configurator ]; From 9744abab00769098b7d159a6426647ed78eb6494 Mon Sep 17 00:00:00 2001 From: Damien Diederen Date: Thu, 4 Feb 2021 18:24:09 +0100 Subject: [PATCH 08/46] debBuild: Fix "duplicate formal function argument 'lib'" As discussed here: https://github.com/NixOS/nixpkgs/pull/111672#issuecomment-773484089 --- pkgs/build-support/release/debian-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 2544d5c740c..9ac335d288a 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -4,7 +4,7 @@ { name ? "debian-build" , lib , diskImage -, src, lib, stdenv, vmTools, checkinstall +, src, stdenv, vmTools, checkinstall , fsTranslation ? false , # Features provided by this package. debProvides ? [] From 56124f3e66ea302818e979e5f86f1464f6340270 Mon Sep 17 00:00:00 2001 From: Damien Diederen Date: Thu, 4 Feb 2021 18:24:18 +0100 Subject: [PATCH 09/46] debBuild: Fix for "cannot coerce a set to a string" Nix won't let us turn `lib` into an environment variable. As discussed here: https://github.com/NixOS/nixpkgs/pull/111672#issuecomment-773484089 --- pkgs/build-support/release/debian-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 9ac335d288a..2ab9ebb85f8 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -22,7 +22,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( prePhases = "installExtraDebsPhase sysInfoPhase"; } - // removeAttrs args ["vmTools"] // + // removeAttrs args ["vmTools" "lib"] // { name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); From 353da1085d3451129a7be17d6d4fd3b7e1acadc2 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Thu, 4 Feb 2021 19:37:59 +0100 Subject: [PATCH 10/46] l2md: init at unstable-2020-07-31 l2md is a tool for converting public-inbox archives [1] to maildir messages. [1] https://80x24.org/public-inbox.git/about/ Reviewed-by: William Casarin Message-Id: 53327d3418ac20fa5e8f4c7bb524b6584c52c024.1612463858.git.public@yoctocell.xyz Link: https://lists.sr.ht/~andir/nixpkgs-dev/patches/20022 --- pkgs/tools/text/l2md/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/text/l2md/default.nix diff --git a/pkgs/tools/text/l2md/default.nix b/pkgs/tools/text/l2md/default.nix new file mode 100644 index 00000000000..e443cc42a2e --- /dev/null +++ b/pkgs/tools/text/l2md/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchgit, libgit2 }: + +stdenv.mkDerivation rec { + pname = "l2md"; + version = "unstable-2020-07-31"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git"; + rev = "2b9fae141fc2129940e0337732a35a3fc1c33455"; + sha256 = "PNNoD3a+rJwKH6wbOkvVU1IW4+xF7+zQaLFAlyLlYOI="; + }; + + buildInputs = [ libgit2 ]; + + installPhase = '' + mkdir -p $out/bin + cp l2md $out/bin + ''; + + meta = with lib; { + description = "Convert public-inbox archives to maildir messages"; + longDescription = '' + Quick and dirty hack to import lore.kernel.org list archives via git, + to export them in maildir format or through a pipe, and to keep them + periodically synced. + ''; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ yoctocell ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bf3fd5e4b9..95d90a433ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5561,6 +5561,8 @@ in k6 = callPackage ../development/tools/k6 { }; + l2md = callPackage ../tools/text/l2md { }; + lab = callPackage ../applications/version-management/git-and-tools/lab { }; lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; From 0e7a749052cefd565d251830d5e00f1b5287a215 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 2 Jul 2020 14:26:33 +0200 Subject: [PATCH 11/46] btlejack: init at 2.0.0 --- pkgs/applications/radio/btlejack/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/radio/btlejack/default.nix diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix new file mode 100644 index 00000000000..198c090b0ea --- /dev/null +++ b/pkgs/applications/radio/btlejack/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchFromGitHub, pyserial, halo }: + +buildPythonApplication rec { + pname = "btlejack"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "virtualabs"; + repo = "btlejack"; + rev = "v${version}"; + sha256 = "1r17079kx7dvsrbmw5sgvz3vj5m3pn2543gxj2xmw4s0lcihy378"; + }; + + postPatch = '' + sed -i "s|^.*'argparse',$||" setup.py + ''; + + propagatedBuildInputs = [ pyserial halo ]; + + meta = with lib; { + homepage = "https://github.com/virtualabs/btlejack"; + description = "Bluetooth Low Energy Swiss-army knife"; + license = licenses.mit; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11dfb7c970c..dbfbb10e25c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1737,6 +1737,8 @@ in btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; + btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; + btrbk = callPackage ../tools/backup/btrbk { asciidoc = asciidoc-full; }; From f9558c6b2b3ad7c6e91816b75408e4117bfd07e0 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 9 Feb 2021 22:28:58 +0100 Subject: [PATCH 12/46] littlegptracker: fix unstableGitUpdater call It couldn't get the url from the fetchFromGitHub attrset --- pkgs/applications/audio/littlegptracker/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 638f54da515..4d7d70aebd6 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -43,7 +43,9 @@ stdenv.mkDerivation rec { installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/Mdashdotdashn/littlegptracker.git"; + }; meta = with lib; { description = "A music tracker similar to lsdj optimised to run on portable game consoles"; From faab7ccd57cc17c4488266eb08f00ed4ac516536 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Feb 2021 18:01:49 +0000 Subject: [PATCH 13/46] kpt: 0.37.1 -> 0.38.0 --- pkgs/applications/networking/cluster/kpt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index ae9380c5139..577e52ed49d 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.37.1"; + version = "0.38.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM="; + sha256 = "sha256-MBZa4LdpCZnVVbjzkYpPi9/CYGqVLeYy2N/AS1PSYBE="; }; - vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI="; + vendorSha256 = "sha256-P0cN8aw62nPD1OlUAw1E36YxptxtPqqruZfDDG4Ag2w="; subPackages = [ "." ]; From 8bb00cfb6bb78b3313d57ea4b112062244ab1e41 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 10 Jan 2021 04:50:38 -0300 Subject: [PATCH 14/46] doc/builders/packages/ibus.xml: Convert to markdown Signed-off-by: Bryan A. S --- doc/builders/packages/ibus.section.md | 38 ++++++++++++++++++ doc/builders/packages/ibus.xml | 57 --------------------------- doc/builders/packages/index.xml | 2 +- 3 files changed, 39 insertions(+), 58 deletions(-) create mode 100644 doc/builders/packages/ibus.section.md delete mode 100644 doc/builders/packages/ibus.xml diff --git a/doc/builders/packages/ibus.section.md b/doc/builders/packages/ibus.section.md new file mode 100644 index 00000000000..2ce85467bb8 --- /dev/null +++ b/doc/builders/packages/ibus.section.md @@ -0,0 +1,38 @@ +# ibus-engines.typing-booster {#sec-ibus-typing-booster} + +This package is an ibus-based completion method to speed up typing. + +## Activating the engine {#sec-ibus-typing-booster-activate} + +IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html). + +On NixOS you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module: + +```nix +{ pkgs, ... }: { + i18n.inputMethod = { + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ typing-booster ]; + }; +} +``` + +## Using custom hunspell dictionaries {#sec-ibus-typing-booster-customize-hunspell} + +The IBus engine is based on `hunspell` to support completion in many languages. By default the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this: + +```nix +ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; } +``` + +_Note: each language passed to `langs` must be an attribute name in `pkgs.hunspellDicts`._ + +## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker} + +The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed: + +On NixOS it can be installed using the following expression: + +```nix +{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; } +``` diff --git a/doc/builders/packages/ibus.xml b/doc/builders/packages/ibus.xml deleted file mode 100644 index 2ed37903a27..00000000000 --- a/doc/builders/packages/ibus.xml +++ /dev/null @@ -1,57 +0,0 @@ -
- ibus-engines.typing-booster - - - This package is an ibus-based completion method to speed up typing. - - -
- Activating the engine - - - IBus needs to be configured accordingly to activate typing-booster. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the upstream docs. - - - - On NixOS you need to explicitly enable ibus with given engines before customizing your desktop to use typing-booster. This can be achieved using the ibus module: -{ pkgs, ... }: { - i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ typing-booster ]; - }; -} - -
- -
- Using custom hunspell dictionaries - - - The IBus engine is based on hunspell to support completion in many languages. By default the dictionaries de-de, en-us, fr-moderne es-es, it-it, sv-se and sv-fi are in use. To add another dictionary, the package can be overridden like this: -ibus-engines.typing-booster.override { - langs = [ "de-at" "en-gb" ]; -} - - - - Note: each language passed to langs must be an attribute name in pkgs.hunspellDicts. - -
- -
- Built-in emoji picker - - - The ibus-engines.typing-booster package contains a program named emoji-picker. To display all emojis correctly, a special font such as noto-fonts-emoji is needed: - - - - On NixOS it can be installed using the following expression: -{ pkgs, ... }: { - fonts.fonts = with pkgs; [ noto-fonts-emoji ]; -} - -
-
diff --git a/doc/builders/packages/index.xml b/doc/builders/packages/index.xml index e4f8a1d3120..24952415801 100644 --- a/doc/builders/packages/index.xml +++ b/doc/builders/packages/index.xml @@ -12,7 +12,7 @@ - + From 8f84dab8a12fbb43af107f73a8f921b9de1953c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Gr=C3=BCnblatt?= Date: Fri, 19 Feb 2021 21:26:08 +0100 Subject: [PATCH 15/46] galene: 0.2 -> 0.3 and bugfix of the associated module --- nixos/modules/services/web-apps/galene.nix | 6 ++++-- pkgs/servers/web-apps/galene/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix index 769490e915a..dd63857a55c 100644 --- a/nixos/modules/services/web-apps/galene.nix +++ b/nixos/modules/services/web-apps/galene.nix @@ -133,8 +133,10 @@ in wantedBy = [ "multi-user.target" ]; preStart = '' - install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem - install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem + ${optionalString (cfg.insecure != true) '' + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem + ''} ''; serviceConfig = mkMerge [ diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index 1c2e16f76fc..ae56fed52bd 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "0hpgqqv8mp1d3sk7dk49m3yv0cv4afa0v3vdd4w8mdnx6pcqdgy1"; + sha256 = "1pl3mnkmfqykhq55q36kvvnvn9fgsk72pfa7nii3hywzad0bj0ar"; }; - vendorSha256 = "12b7andpzsgzmd56gg4gc5ilkxvjrpwpmwbdmygfzgkd5jncmcgp"; + vendorSha256 = "0jrc6y5chkj25bnpzn6blvfb0vd09h6fdcz75g54605z8nqd397p"; outputs = [ "out" "static" ]; From 1905c7c0a71e5ca76a23cba1d26959a6a6103fb5 Mon Sep 17 00:00:00 2001 From: lasers Date: Thu, 31 Dec 2020 23:47:53 -0600 Subject: [PATCH 16/46] plasma-applet-virtual-desktop-bar: init at unstable-2021-02-20 --- .../3rdparty/addons/virtual-desktop-bar.nix | 40 +++++++++++++++++++ pkgs/desktops/plasma-5/default.nix | 1 + pkgs/top-level/aliases.nix | 1 + 3 files changed, 42 insertions(+) create mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix new file mode 100644 index 00000000000..e71a0bd0230 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix @@ -0,0 +1,40 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, extra-cmake-modules +, kwindowsystem +, plasma-framework +, qtx11extras +}: + +mkDerivation rec { + pname = "plasma-applet-virtual-desktop-bar"; + version = "unstable-2021-02-20"; + + src = fetchFromGitHub { + owner = "wsdfhjxc"; + repo = "virtual-desktop-bar"; + rev = "3e9bbddb8def8da65071a1c325eaa06598e8a473"; + sha256 = "192ns6c2brzq46pg385n0v1ydbz52aaa8f5dgfw5251hrw9c7bxg"; + }; + + buildInputs = [ + kwindowsystem plasma-framework qtx11extras + ]; + + nativeBuildInputs = [ + extra-cmake-modules + ]; + + cmakeFlags = [ + "-Wno-dev" + ]; + + meta = with lib; { + description = "Manage virtual desktops dynamically in a convenient way"; + homepage = "https://github.com/wsdfhjxc/virtual-desktop-bar"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index c4cbc44b375..71826e730b5 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -143,6 +143,7 @@ let thirdParty = let inherit (libsForQt5) callPackage; in { plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; + plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { }; kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 812f5cf49b4..f5f6ec92705 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -924,6 +924,7 @@ mapAliases ({ ; inherit (plasma5Packages.thirdParty) plasma-applet-caffeine-plus + plasma-applet-virtual-desktop-bar kwin-dynamic-workspaces kwin-tiling krohnkite From ce74bda89fc434314a2638c9bf9562ce6c2558ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 21:22:30 +0000 Subject: [PATCH 17/46] silicon: 0.4.0 -> 0.4.1 --- pkgs/tools/misc/silicon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 1ff73492401..0c338fd91bc 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "0cvzkfyljgxhmn456f2rn0vq2bhm1ishr4jg4dnwjjfgmjg3w908"; + sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s="; }; - cargoSha256 = "1aymhbfzcncrbc5n8rf62bdgi95b4bjhw6p716vhca5p6c7wfxcb"; + cargoSha256 = "sha256-1sekLS+jhMeFJcW7pH/X8t28//xA+L54u81uKOo1kHE="; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] From 215c9860e0015c755720ad635ef5702488afdab4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 06:19:01 +0000 Subject: [PATCH 18/46] coolreader: 3.2.53 -> 3.2.55 --- pkgs/applications/misc/coolreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix index d043823a068..dc32cbf2c2a 100644 --- a/pkgs/applications/misc/coolreader/default.nix +++ b/pkgs/applications/misc/coolreader/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "coolreader"; - version = "3.2.53"; + version = "3.2.55"; src = fetchFromGitHub { owner = "buggins"; repo = pname; rev = "cr${version}"; - sha256 = "sha256-5it70cwRV56OMZI4dny5uwxWgoF42tjcEC4g3MC548s="; + sha256 = "sha256-gYAaYGEjw7p6y4h5j6j/4Ld+b37Nv+kt04Wp+qb8gzY="; }; nativeBuildInputs = [ cmake pkg-config ]; From ab8f6653c3ce854def5f558d1edd89bbc624cb32 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 15:13:00 +0000 Subject: [PATCH 19/46] homebank: 5.5 -> 5.5.1 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 17c72e8a330..a586cea47ab 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.5"; + name = "homebank-5.5.1"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "sha256-3tqmsCxQXNAsDsLdiyuk4MydH0WgHqsNpgqxvCp+bHU="; + sha256 = "sha256-m7OeqtPExo0ry+IeL2xKUnTjo/OFr7Ky/3OuX9mY2gg="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; From 39c0691ac487426d9f86ea506298789a2741a6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Mar 2021 00:52:29 +0100 Subject: [PATCH 20/46] portfolio-filemanager: init at 0.9.10 --- .../misc/portfolio-filemanager/default.nix | 71 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/applications/misc/portfolio-filemanager/default.nix diff --git a/pkgs/applications/misc/portfolio-filemanager/default.nix b/pkgs/applications/misc/portfolio-filemanager/default.nix new file mode 100644 index 00000000000..6b4946976bf --- /dev/null +++ b/pkgs/applications/misc/portfolio-filemanager/default.nix @@ -0,0 +1,71 @@ +{ lib +, python3 +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gtk3 +, libhandy +, librsvg +, meson +, ninja +, pkg-config +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "portfolio"; + version = "0.9.10"; + + format = "other"; + + src = fetchFromGitHub { + owner = "tchx84"; + repo = "Portfolio"; + rev = "v${version}"; + sha256 = "06hk0kx6h8w263qa71bik68rg4r8qs94b6s60pyhzicfc822k0j4"; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + glib + gobject-introspection + gtk3 + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + gobject-introspection + libhandy + librsvg + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + ]; + + postInstall = '' + ln -s dev.tchx84.Portfolio "$out/bin/portfolio" + ''; + + meta = with lib; { + description = "A minimalist file manager for those who want to use Linux mobile devices"; + homepage = "https://github.com/tchx84/Portfolio"; + changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72fdc8cbbc4..4766b24ab1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24711,6 +24711,8 @@ in ponymix = callPackage ../applications/audio/ponymix { }; + portfolio-filemanager = callPackage ../applications/misc/portfolio-filemanager { }; + pothos = libsForQt5.callPackage ../applications/radio/pothos { }; potrace = callPackage ../applications/graphics/potrace {}; From 0d4e75fcea645948aa543e4276bd4785fbca263c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 10:31:56 +0000 Subject: [PATCH 21/46] code-minimap: 0.5.0 -> 0.5.1 --- pkgs/tools/misc/code-minimap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 462fc51b289..6a253a493fc 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8="; + sha256 = "sha256-5YNY0MRlKKX6u32Id6J7bIPSHRi44TISoKqpAS9T8ow="; }; - cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s="; + cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw="; meta = with lib; { description = "A high performance code minimap render"; From c71e02f42a3a66bff84eb18620ecba6236be3a72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 13:58:17 +0000 Subject: [PATCH 22/46] jbang: 0.67.1 -> 0.67.3 --- pkgs/development/tools/jbang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 37763c72609..1e1e3b66101 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.67.1"; + version = "0.67.3"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-ZwjgdOmpLl2kTpQU1mqfwq0nBLmK/Ej5ckDItQWeDKY="; + sha256 = "sha256-/3kQnHshmf3ZnA4xQNJaXeThFvk/SKq0/B6BaTv5Yws="; }; nativeBuildInputs = [ makeWrapper ]; From c04fcbf4e080e872e3afb9d46585b8f36f81fc00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 18:26:18 +0000 Subject: [PATCH 23/46] seaweedfs: 2.31 -> 2.32 --- pkgs/applications/networking/seaweedfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 7242a1a7ff7..b8789c4c417 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.31"; + version = "2.32"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-0s/hcRUuskU4TZqk5h4A51mkEJ6uUZS42mKDQvSx3I4="; + sha256 = "sha256-0VryhH0ELBLVZL2vLuAcjZ0a5otk/etr3riRyc+7YTk="; }; - vendorSha256 = "sha256-QpGRQQbNchj0T9USRnALjvOGd2cV+JUgJeRgfjK8n5o="; + vendorSha256 = "sha256-besXzqlmhFbWfnlacGildBbNATVrtMthf+BA/pL7R5I="; subPackages = [ "weed" ]; From 10644b3ba2708c2a69d6c3343f3b210ea11bacaa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 13:33:04 +0000 Subject: [PATCH 24/46] emplace: 1.3.0 -> 1.4.0 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index c41ef6836a7..1b8aa8fc3f9 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-02Pn5saPrw1PIFZXVSCgsnvo/78CdT17/rCtS9R9bvU="; + sha256 = "sha256-6dmXWqkf8Z+cc4wnOuVCe4+Byfk3VTYXehTN1MCiFLE="; }; - cargoSha256 = "sha256-ety50v0jxm45fzzkR9c/rvpJn3mWQUvAOHcHSJTTSd4="; + cargoSha256 = "sha256-uDoxMHSNoqH/AOixmkV6pwrDu/XSqXBCrAz4L7MMPU8="; meta = with lib; { description = "Mirror installed software on multiple machines"; From cefa27d244b76fa3471e4dc0acf06c3c6621687d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 Mar 2021 04:20:00 +0000 Subject: [PATCH 25/46] gopass: 1.12.2 -> 1.12.4 https://github.com/gopasspw/gopass/releases/tag/v1.12.3 https://github.com/gopasspw/gopass/releases/tag/v1.12.4 --- pkgs/tools/security/gopass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 92845c6cab2..ef4c6736528 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.2"; + version = "1.12.4"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "14ylvb7crx32h7inklvvxjc72jz9xq3dhzr5905i76kgx57h64w9"; + sha256 = "1cwmka6shyycp9gq5js1hnbamdhqzpmzraxdaniz1cdqhxcvdkcb"; }; - vendorSha256 = "0gjzghrykdw1vp873yi7k8piz3gshzndm12jm6dxgl0ph4335a54"; + vendorSha256 = "1qnxdrqpav6ky6gs9w63l0hbhakh23rrc9197br1nmbg0slb8vcj"; subPackages = [ "." ]; From 46318ab4df63b5d68d377ed00c050ad30a06c00f Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Sat, 20 Mar 2021 19:37:03 -0500 Subject: [PATCH 26/46] vivaldi: 3.6.2165.36-1 -> 3.7.2218.45-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 57a4155e179..96355789eb3 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon +{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , alsaLib, dbus, cups, libexif, ffmpeg_3, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.6.2165.36-1"; + version = "3.7.2218.45-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08"; + sha256 = "11q3whw01nbwvzccgn55b4lkr7dzlql961406r6by8xqvf8zgmp4"; }; unpackPhase = '' @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ - stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon + stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd freetype fontconfig libXrender libuuid expat glib nss nspr From b40a3018e7e776321015a2a3508a077a74d10916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 20 Mar 2021 16:02:03 +0100 Subject: [PATCH 27/46] demjson: add top level entry --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3444df35798..45c09f169d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29039,6 +29039,8 @@ in dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; + demjson = with python3Packages; toPythonApplication demjson; + dosbox = callPackage ../misc/emulators/dosbox { }; emu2 = callPackage ../misc/emulators/emu2 { }; From 623eda1ac2cc8f644eacd318f770c77eea786292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 20 Mar 2021 16:02:19 +0100 Subject: [PATCH 28/46] j2cli: add top level entry --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45c09f169d9..d8ff91075fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29199,6 +29199,8 @@ in libjack2 = jack2.override { prefix = "lib"; }; jack2Full = jack2; # TODO: move to aliases.nix + j2cli = with python3Packages; toPythonApplication j2cli; + jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; keynav = callPackage ../tools/X11/keynav { }; From 3cbaf6d73d7eb4582690182e17f54dd4c956f54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 21 Mar 2021 02:15:33 +0100 Subject: [PATCH 29/46] hjson: add top level entry --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8ff91075fa..43e3e5ade18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29172,6 +29172,8 @@ in inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; + hjson = with python3Packages; toPythonApplication hjson; + epkowa = callPackage ../misc/drivers/epkowa { }; utsushi = callPackage ../misc/drivers/utsushi { }; From e020ff5db69b7a4e404f41c50f094e2f914bc66f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Mar 2021 01:29:26 +0000 Subject: [PATCH 30/46] beancount: 2.3.3 -> 2.3.4 --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 2c4f495a7ff..88369f41872 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { - version = "2.3.3"; + version = "2.3.4"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0767ap2n9vk9dz40njndfhaprajr75fvzx7igbd1szc6x8wri8nr"; + sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA="; }; # Tests require files not included in the PyPI archive. From 7cdf18620323b135233c2c1eeee3973f06960f78 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 21 Mar 2021 09:19:55 +0800 Subject: [PATCH 31/46] discover: add missing dependencies --- pkgs/desktops/plasma-5/discover.nix | 62 ++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index 37632ab2f76..cf815b80824 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -1,10 +1,34 @@ -{ - mkDerivation, lib, - extra-cmake-modules, gettext, kdoctools, python, - appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux, - qtbase, qtquickcontrols2, - karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels, - knewstuff, kwindowsystem, kxmlgui, plasma-framework +{ mkDerivation +, lib +, extra-cmake-modules +, gettext +, kdoctools +, python +, appstream-qt +, discount +, flatpak +, fwupd +, ostree +, packagekit-qt +, pcre +, util-linux +, qtbase +, qtquickcontrols2 +, qtx11extras +, karchive +, kcmutils +, kconfig +, kcrash +, kdbusaddons +, kdeclarative +, kidletime +, kio +, kirigami2 +, kitemmodels +, knewstuff +, kwindowsystem +, kxmlgui +, plasma-framework }: mkDerivation { @@ -13,9 +37,29 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ # discount is needed for libmarkdown - appstream-qt discount flatpak fwupd ostree packagekit-qt pcre util-linux + appstream-qt + discount + flatpak + fwupd + ostree + packagekit-qt + pcre + util-linux qtquickcontrols2 - karchive kconfig kcrash kdbusaddons kdeclarative kio kirigami2 kitemmodels knewstuff kwindowsystem kxmlgui + qtx11extras + karchive + kcmutils + kconfig + kcrash + kdbusaddons + kdeclarative + kidletime + kio + kirigami2 + kitemmodels + knewstuff + kwindowsystem + kxmlgui plasma-framework ]; } From 615e63c43235a4c007e8ef7837192ccec0d1fb97 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 21 Mar 2021 09:20:02 +0800 Subject: [PATCH 32/46] sddm-kcm: add missing dependencies --- pkgs/desktops/plasma-5/sddm-kcm.nix | 35 ++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index a9f51e50a26..9e3776e8e29 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -1,8 +1,19 @@ -{ - mkDerivation, lib, extra-cmake-modules, shared-mime-info, - libpthreadstubs, libXcursor, libXdmcp, - qtbase, qtquickcontrols2, qtx11extras, - karchive, ki18n, kio, knewstuff +{ mkDerivation +, lib +, extra-cmake-modules +, shared-mime-info +, libpthreadstubs +, libXcursor +, libXdmcp +, qtbase +, qtquickcontrols2 +, qtx11extras +, karchive +, kcmutils +, kdeclarative +, ki18n +, kio +, knewstuff }: mkDerivation { @@ -10,8 +21,16 @@ mkDerivation { meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - libpthreadstubs libXcursor libXdmcp - qtquickcontrols2 qtx11extras - karchive ki18n kio knewstuff + libpthreadstubs + libXcursor + libXdmcp + qtquickcontrols2 + qtx11extras + karchive + kcmutils + kdeclarative + ki18n + kio + knewstuff ]; } From 3a1268fa04720bcf3dbaf4b1ccc37bdf80c6866e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Mar 2021 01:42:19 +0000 Subject: [PATCH 33/46] python38Packages.casbin: 0.18.4 -> 0.19.1 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 6057a770e0a..ea6e2ed079a 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.18.4"; + version = "0.19.1"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "16yhl1xgrgkyqnmbw9in3y7ypcxvvy21h32v50cd73a3iw4x27d0"; + sha256 = "0fkkz5k3h4pkxacrbacamnh4yfghxgajdzzmdlck7i4v5x06vz8f"; }; propagatedBuildInputs = [ From 2ace9b682dc6eec92728127495958a128090cfd1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Mar 2021 02:57:02 +0000 Subject: [PATCH 34/46] python38Packages.django-simple-captcha: 0.5.13 -> 0.5.14 --- .../python-modules/django-simple-captcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index 0724bf27b31..2a7f1e1da26 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "django-simple-captcha"; - version = "0.5.13"; + version = "0.5.14"; src = fetchPypi { inherit pname version; - sha256 = "5e43ba3b61daf690ac0319157837bb57e31df8bddbdc9a59ef42ef1a99e21fa2"; + sha256 = "84b5c188e6ae50e9ecec5e5d734c5bc4d2a50fbbca7f59d2c12da9a3bbee5051"; extension = "zip"; }; From 27f1e2b7b12f8813cb32919c660cd11319cd8822 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Mar 2021 01:19:04 +0000 Subject: [PATCH 35/46] python38Packages.avro-python3: 1.10.1 -> 1.10.2 --- pkgs/development/python-modules/avro-python3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index e0294246fb2..fb51b698ed8 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro-python3"; - version = "1.10.1"; + version = "1.10.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9027abeab63dd9b66bd3c564fa0670c70f78027ecb1978d96c6af7ed415b626b"; + sha256 = "3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab"; }; buildInputs = [ pycodestyle isort ]; From 9c0b4459a51ae728816d332cfb4c8f9a7a2da55b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Mar 2021 02:01:09 +0000 Subject: [PATCH 36/46] python38Packages.azure-mgmt-marketplaceordering: 1.0.0 -> 1.1.0 --- .../python-modules/azure-mgmt-marketplaceordering/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix index 9538ed2a234..628d0bbcac0 100644 --- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-marketplaceordering"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "85103080f9e59215036bdfb8f806d91ea182d72c46a13f55c3acc479849351e3"; + sha256 = "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; }; propagatedBuildInputs = [ From 434768ad6435a927d92fd40ecae93a7d086c6b67 Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Sun, 21 Mar 2021 01:11:09 -0400 Subject: [PATCH 37/46] gnome-podcasts: don't mark as broken https://github.com/NixOS/nixpkgs/pull/116324 --- pkgs/applications/audio/gnome-podcasts/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index f4099f49ecf..6524700ae15 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -75,7 +75,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; - # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2) - broken = true; }; } From bbecd2a7a1660e28ef98f4b1d73df3013a809871 Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Sun, 21 Mar 2021 01:11:19 -0400 Subject: [PATCH 38/46] fractal: don't mark as broken https://github.com/NixOS/nixpkgs/pull/116324 --- .../networking/instant-messengers/fractal/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index ca6537fdfb5..23a4aebb026 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -88,8 +88,6 @@ stdenv.mkDerivation rec { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; - # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2) - broken = true; maintainers = with maintainers; [ dtzWill worldofpeace ]; }; } From b3172906a7edad73199acddd8e738a2715345c16 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 21 Mar 2021 06:20:18 +0100 Subject: [PATCH 39/46] apfs-fuse: 2019-07-23 -> 2020-09-28 (#112937) --- pkgs/tools/filesystems/apfs-fuse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index adf845f943e..b5d08770ed7 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "apfs-fuse-unstable"; - version = "2019-07-23"; + version = "2020-09-28"; src = fetchFromGitHub { owner = "sgan81"; repo = "apfs-fuse"; - rev = "309ecb030f38edac4c10fa741a004c5eb7a23e15"; - sha256 = "0wq6rlqi00m5dp5gbzy65i1plm40j6nsm7938zvfgx5laal4wzr2"; + rev = "ee71aa5c87c0831c1ae17048951fe9cd7579c3db"; + sha256 = "0wvsx708km1lnhghny5y69k694x0zy8vlbndswkb7sq81j1r6kwx"; fetchSubmodules = true; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/sgan81/apfs-fuse"; description = "FUSE driver for APFS (Apple File System)"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ealasu ]; platforms = platforms.linux; }; From c9699e502db91545d73ad028c22f97449b0fef4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Mar 2021 00:09:36 +0000 Subject: [PATCH 40/46] gallery-dl: 1.17.0 -> 1.17.1 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 438d466ab58..ad0970e0fe2 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.0"; + version = "1.17.1"; src = fetchPypi { inherit pname version; - sha256 = "bf5196b9e18a45d62d7e823894f12def310264a258956882cbac13b5e856bf00"; + sha256 = "1cfaa3a617d5d222d4b9b41634b1bdede2673a8620d6b0e62fb755ae224ca2ac"; }; propagatedBuildInputs = [ requests ]; From e87ec30710345ca9de8b8587b615fee4e68e7875 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 21 Mar 2021 02:05:32 +0000 Subject: [PATCH 41/46] python38Packages.bayespy: 0.5.21 -> 0.5.22 --- pkgs/development/python-modules/bayespy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 5d0f098b8a3..95bb22ce2cb 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.21"; + version = "0.5.22"; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0d86e9ae73e6472c26aeb4de7abd9bf99492fedcbb0485ed7fa23609d2673b42"; + sha256 = "ed0057dc22bd392df4b3bba23536117e1b2866e3201b12c5a37428d23421a5ba"; }; checkInputs = [ pytest nose glibcLocales ]; From 99a25148e8db244ab3e2f7865789c5237a46b29c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 17:50:06 +0000 Subject: [PATCH 42/46] rocksdb: 6.15.5 -> 6.17.3 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index e4ee3c47307..6ab2fe9f6cb 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.15.5"; + version = "6.17.3"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8="; + sha256 = "sha256-mfONfYMxZ3CT7Bk3OYSwg0UChmk4mQ1+cHN94gEDZcM="; }; nativeBuildInputs = [ cmake ninja ]; From 9105a6aab8491bef5e5aab1543061858034d3322 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 13:54:57 +0000 Subject: [PATCH 43/46] jackett: 0.17.668 -> 0.17.699 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index c5d1f6c058f..a89d4f21625 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.17.668"; + version = "0.17.699"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-+cvUpWVpXEkW+d92aIOli+pNi+ZDHEbxDDQ67O6kOVA="; + sha256 = "sha256-dftllucRemUdZjYDLKPJ4XJ031OZpsW4bpJDuWPyses="; }; nativeBuildInputs = [ makeWrapper ]; From 32b5606e9e634bfa13d434ee157439d88f320507 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 17:17:57 +0000 Subject: [PATCH 44/46] pt2-clone: 1.28 -> 1.29 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 6a093c91daf..72e8ba135dd 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.28"; + version = "1.29"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1c2x43f46l7556kl9y9qign0g6ywdkh7ywkzv6c9y63n68ph20x2"; + sha256 = "sha256-xnw4UL30nUv/Ru6x/7d05gC0X9nREMdXO9QWBjVoIvo="; }; nativeBuildInputs = [ cmake ]; From e3307308fa8de6b93055917a7dddb92e6d76df1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 02:40:36 +0000 Subject: [PATCH 45/46] python38Packages.jupyter_console: 6.2.0 -> 6.3.0 --- pkgs/development/python-modules/jupyter_console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 372698744cf..712117d5011 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.2.0"; + version = "6.3.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7f6194f4f4692d292da3f501c7f343ccd5e36c6a1becf7b7515e23e66d6bf1e9"; + sha256 = "947f66bbdeee2221b4fb3a6b78225d337b8f10832f14cecf7932183635abe1d9"; }; propagatedBuildInputs = [ From 9832a6fa5fa815c807a5bc1edfb9ae4963c196a7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 21 Mar 2021 15:01:06 +1000 Subject: [PATCH 46/46] miniserve: 0.11.0 -> 0.12.0 https://github.com/svenstaro/miniserve/releases/tag/v0.12.0 --- pkgs/tools/misc/miniserve/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 81437378c32..7b40e213135 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -4,24 +4,27 @@ , fetchFromGitHub , pkg-config , zlib +, libiconv , Security }: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-/vtiHRHsbF7lfn9tfgfKhm5YwofjSJniNNnKahphHFg="; + sha256 = "sha256-hTNwEspM1qlQkC6lD7N947tvS7O7RCIUYACvj4KYsAY="; }; - cargoSha256 = "sha256-gwy/LeVznZyawliXnkULyyVSXATk0sjSTUZPHO2K+9o="; + cargoSha256 = "sha256-7G+h+g00T/aJ1cQ1SChxy8dq3CWWdHlx5DAH77xM9Oc="; nativeBuildInputs = [ pkg-config zlib ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + + checkFlags = [ "--skip=cant_navigate_up_the_root" ]; meta = with lib; { description = "For when you really just want to serve some files over HTTP right now!";