From 13cf4839b879ba734013149ad073646b83639fe3 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 30 Jun 2023 08:30:45 +0200 Subject: [PATCH 01/13] netbox: 3.5.3 -> 3.5.4 (cherry picked from commit 10cf856dc1dcbb9b7f38042dd8d0fcf9175a136b) --- pkgs/servers/web-apps/netbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 5903c5183335..0e2c4c999cf0 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -23,8 +23,8 @@ in }; netbox = callPackage generic { - version = "3.5.3"; - hash = "sha256-F8rsTOOxARI3ll545AF0+HFaG4wNO+RWwsl5y9kAyE4="; + version = "3.5.4"; + hash = "sha256-CJ7NgKDDEmOFFULaG6wjP5pvGieyU4YRsvmIvqve5qg="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch From a939e1904531bafc37d9e046aa78f1302771eb89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Jun 2023 21:20:26 +0000 Subject: [PATCH 02/13] jamesdsp-pulse: 2.4 -> 2.5.1 (cherry picked from commit 9760c91330b23dc990ff60cc881d514190924893) --- pkgs/applications/audio/jamesdsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index be6f09514387..ef0385d5114e 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -25,13 +25,13 @@ let in mkDerivation rec { pname = "jamesdsp"; - version = "2.4"; + version = "2.5.1"; src = fetchFromGitHub rec { owner = "Audio4Linux"; repo = "JDSP4Linux"; fetchSubmodules = true; rev = version; - hash = "sha256-wD1JZQD8dR24cBN4QJCSrEsS4aoMD+MQmqnOIFKOeoE="; + hash = "sha256-osbRiUa/CKq4l3pV2MZYKcECEfa1ee3SAQ8RsiimbA4="; }; nativeBuildInputs = [ From f27a491008ce3346833e61a1be08bb1197da29dd Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 22 Jul 2023 09:51:07 +0000 Subject: [PATCH 03/13] gitlab-runner: 16.1.0 -> 16.2.0 https://gitlab.com/gitlab-org/gitlab-runner/-/blob/v16.2.0/CHANGELOG.md (cherry picked from commit a467c37c8d3b373640936192586d2f8de87d4166) --- .../tools/continuous-integration/gitlab-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 65cf727997dc..e3685a581a0f 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.1.0"; + version = "16.2.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-tlTmKq1a5hX8G0+7RC1QbWA7YVnoBS5R9QqXljJ4bVg="; + vendorHash = "sha256-sP9lboy1M4+AB1Z0VsX5eNxZ9ckuJBgEPxavAbOSk8g="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-1obA2f/YtOBkgYLJqcHQWbaCezEw7lUXs4OxFiONCm8="; + sha256 = "sha256-gTjGf/WuMoGNvsiWWj3Y7l2MvSzBM12RY/Odolm4fNw="; }; patches = [ From 0877f0e704789fb40e1b7daa5e4da64d69bd6152 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 12 Jul 2023 12:24:51 +0200 Subject: [PATCH 04/13] briar-desktop: 0.4.0-beta -> 0.5.0-beta (cherry picked from commit 9792ad4258cbefadc6411b0ce199d17b9b95a3a3) --- .../networking/instant-messengers/briar-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix index 8613a2585e2c..4bdc8f7f6deb 100644 --- a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "briar-desktop"; - version = "0.4.0-beta"; + version = "0.5.0-beta"; src = fetchurl { url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar"; - hash = "sha256-7zeIWsdPvROHGaf5igodlZss6Gow3kp6PX+QAzmxMnw="; + hash = "sha256-J93ODYAiRbQxG2BF7P3H792ymAcJ3f07l7zRSw8kM+E="; }; dontUnpack = true; From d35fa133f5553985f13fdcf8f28cecdb5792e195 Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Tue, 18 Jul 2023 17:44:27 -0500 Subject: [PATCH 05/13] pc: init at 0.4 (cherry picked from commit 62c8209b53895daebea584241fd04803a7958b24) --- pkgs/tools/misc/pc/default.nix | 35 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/pc/default.nix diff --git a/pkgs/tools/misc/pc/default.nix b/pkgs/tools/misc/pc/default.nix new file mode 100644 index 000000000000..ecf0122f0869 --- /dev/null +++ b/pkgs/tools/misc/pc/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, byacc +, fetchFromSourcehut +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pc"; + version = "0.4"; + + src = fetchFromSourcehut { + owner = "~ft"; + repo = "pc"; + rev = finalAttrs.version; + hash = "sha256-fzEDI20o5ROY9n/QRzCW66iCKYaBbI++Taur6EoA0wA="; + }; + + nativeBuildInputs = [ byacc ]; + makeFlags = [ "PREFIX=$(out)" ]; + + strictDeps = true; + + enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Programmer's calculator"; + homepage = "https://git.sr.ht/~ft/pc"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ moody ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4edc4ce2bcf9..089c41d33def 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5660,6 +5660,8 @@ with pkgs; pbzx = callPackage ../tools/compression/pbzx { }; + pc = callPackage ../tools/misc/pc { }; + pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; pcp = callPackage ../tools/misc/pcp { }; From 609c0178e768e840c08057e694910124fd700778 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 21 Jul 2023 14:11:27 +0800 Subject: [PATCH 06/13] linuxPackages.mba6x_bl: unstable-2016-12-08 -> unstable-2017-12-30 Diff: https://github.com/patjak/mba6x_bl/compare/b96aafd30c18200b4ad1f6eb995bc19200f60c47...639719f516b664051929c2c0c1140ea4bf30ce81 (cherry picked from commit 8c514e6a19ebbe7d3a8b534b32105c23b9d336c1) --- pkgs/os-specific/linux/mba6x_bl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 04a89ad038dd..3add5eb227f5 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "mba6x_bl"; - version = "unstable-2016-12-08"; + version = "unstable-2017-12-30"; src = fetchFromGitHub { owner = "patjak"; repo = "mba6x_bl"; - rev = "b96aafd30c18200b4ad1f6eb995bc19200f60c47"; - sha256 = "10payvfxahazdxisch4wm29fhl8y07ki72q4c78sl4rn73sj6yjq"; + rev = "639719f516b664051929c2c0c1140ea4bf30ce81"; + sha256 = "sha256-QwxBpNa5FitKO+2ne54IIcRgwVYeNSQWI4f2hPPB8ls="; }; enableParallelBuilding = true; From 00c73d158e3d88b1175828d19b462f73ebf059b8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 21 Jul 2023 14:12:34 +0800 Subject: [PATCH 07/13] linuxPackages.rtl8812au: unstable-2023-05-11 -> unstable-2023-07-20 Diff: https://github.com/morrownr/8812au-20210629/compare/765d4e4bd5970f4c1c79e63bbe301667e5e029c9...51338202d21a63202b324afd22bd361141c8c5e5 (cherry picked from commit abdc48a1238f83604e969a14e455857d4e3d5778) --- pkgs/os-specific/linux/rtl8812au/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 786bcab86c2f..343bff9e3f85 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtl8812au"; - version = "${kernel.version}-unstable-2023-05-11"; + version = "${kernel.version}-unstable-2023-07-20"; src = fetchFromGitHub { owner = "morrownr"; repo = "8812au-20210629"; - rev = "765d4e4bd5970f4c1c79e63bbe301667e5e029c9"; - hash = "sha256-FF2LVfOpITMJ5LiwsGAudrWStlkKsZUlHvzZs03gb9g="; + rev = "51338202d21a63202b324afd22bd361141c8c5e5"; + hash = "sha256-NIdKUP5t/dzQ9xIG5Kc6eRudr6vTpCafunXZHZLcoL8="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; From 3d30df7809296c33bdc1d0433124b716c73f3445 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 21 Jul 2023 14:13:52 +0800 Subject: [PATCH 08/13] linuxPackages.rtl8821au: unstable-2023-03-22 -> unstable-2023-07-20 Diff: https://github.com/morrownr/8821au-20210708/compare/a133274b0532c17318e8790b771566f4a6b12b7c...072413261b6966b0c666898e69d7d41fb281094f (cherry picked from commit 067d3fb75ea70a8eeb103f54ccc87066f62d389b) --- pkgs/os-specific/linux/rtl8821au/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 37494d9c37ec..509c2470d8f8 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtl8821au"; - version = "${kernel.version}-unstable-2023-03-22"; + version = "${kernel.version}-unstable-2023-07-20"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821au-20210708"; - rev = "a133274b0532c17318e8790b771566f4a6b12b7c"; - hash = "sha256-xn2cmbtqQhLM9qLCEvVhCuoCa7y8LM4sevPqv3a6pBw="; + rev = "072413261b6966b0c666898e69d7d41fb281094f"; + hash = "sha256-yC9knXR+bZwQ4S22zG188b3p3iTzUAFbvSqOFdne7po="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; From ec29e4f02c63cadeb098ed777788ec328ebf7c9c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 21 Jul 2023 14:14:40 +0800 Subject: [PATCH 09/13] linuxPackages.rtl88x2bu: unstable-2023-03-17 -> unstable-2023-07-20 Diff: https://github.com/morrownr/88x2bu-20210702/compare/f0a2c9c74045cf2c3701084f389e358f9236fc8c...28bcb8b3eb4a531727c7a48001fa91903492fd1a (cherry picked from commit af39a65adbcb9bf07ec3175b537143e00f587778) --- pkgs/os-specific/linux/rtl88x2bu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index eb5a795c933b..5c2aa97048dd 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2023-03-17"; + version = "${kernel.version}-unstable-2023-07-20"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "f0a2c9c74045cf2c3701084f389e358f9236fc8c"; - sha256 = "sha256-hquLmEOzdBQ6rJld5kkzVw+hXBFb/ZwpBI0eL0rUrkM="; + rev = "28bcb8b3eb4a531727c7a48001fa91903492fd1a"; + sha256 = "sha256-LeCPu9ypJUdKV4lwJIy934g+VqD1S6P0fgnczTI3z7c="; }; hardeningDisable = [ "pic" ]; From 0fe133a19e8be8c6c7875e6ce4d618a759e5a90d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 21 Jul 2023 14:17:44 +0800 Subject: [PATCH 10/13] linuxPackages.lttng-modules: 2.13.8 -> 2.13.10 Diff: https://github.com/lttng/lttng-modules/compare/v2.13.8...v2.13.10 (cherry picked from commit a64809bb5f5d64b6cca2f9d7930ba8011125a833) --- pkgs/os-specific/linux/lttng-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index f7b5b3fd1fa1..89b49068d40c 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.13.8"; + version = "2.13.10"; src = fetchFromGitHub { owner = "lttng"; repo = "lttng-modules"; rev = "v${version}"; - hash = "sha256-6ohWsGUGFz7QlHkKWyW5edpSsBTE9DFS3v6EsH9wNZo="; + hash = "sha256-R5qwB1ayw0KueMBSSxm0TwINt78N6w356kY7WGBX0zM="; }; nativeBuildInputs = kernel.moduleBuildDependencies; From afecf89b4b7c5a93cd8e731614fad45c9d05724a Mon Sep 17 00:00:00 2001 From: Ember Keske Date: Thu, 20 Jul 2023 17:20:52 +0200 Subject: [PATCH 11/13] python3Packages.django-tables2: 2.4.1 -> 2.6.0 (cherry picked from commit 16fe763e739f11ada09f9b5e82cb57eb25994560) --- pkgs/development/python-modules/django-tables2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-tables2/default.nix b/pkgs/development/python-modules/django-tables2/default.nix index 41637e7472ca..96811351269d 100644 --- a/pkgs/development/python-modules/django-tables2/default.nix +++ b/pkgs/development/python-modules/django-tables2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-tables2"; - version = "2.4.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jieter"; repo = pname; rev = "v${version}"; - sha256 = "04vvgf18diwp0mgp14b71a0dxhgrcslv1ljybi300gvzvzjnp3qv"; + hash = "sha256-n8qvsm/i+2VclFc00jQGO0Z4l6Ke8qZ03EYuEQcPuVQ="; }; propagatedBuildInputs = [ From f33ee963acad900ae54176161a5ac886a4fff247 Mon Sep 17 00:00:00 2001 From: Ember Keske Date: Thu, 20 Jul 2023 17:22:13 +0200 Subject: [PATCH 12/13] netbox: 3.5.4 -> 3.5.6 (cherry picked from commit 2cbd486c248371e86d5d24201e5f9b2bb0662fd1) --- pkgs/servers/web-apps/netbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 0e2c4c999cf0..f68ec501185c 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -23,8 +23,8 @@ in }; netbox = callPackage generic { - version = "3.5.4"; - hash = "sha256-CJ7NgKDDEmOFFULaG6wjP5pvGieyU4YRsvmIvqve5qg="; + version = "3.5.6"; + hash = "sha256-n5EJQcC5uVoL5KjGzF7bLF8c4Wke/YBJpx2V9KZz5Qo="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch From 1b203fb8430567e5a1504becd8f4eac6eba8044e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jul 2023 04:43:09 +0000 Subject: [PATCH 13/13] standardnotes: 3.166.9 -> 3.167.2 (cherry picked from commit 43ab7e5e485c35232c8af35cfac6e58d2362e0f4) --- pkgs/applications/editors/standardnotes/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 85e361f4813f..ab59232d859e 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.166.9", + "version": "3.167.2", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-amd64.deb", - "hash": "sha512-D85W50K3jRBKhrPz3Wa9aClnHFMRPQ0YgP71uypfcCcuKVnKd3Ol1sFzsyMzl2uhB0aGOkpd2OB+OHceVFqmag==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-amd64.deb", + "hash": "sha512-xW08R1oZm8lw8Iap/TT29WJCagmcQNWXzdSDY8pArG9Fjv8nm+DcV6paVL35Hj35Dk9CJdf1KxeTRB9JW6u3dg==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-arm64.deb", - "hash": "sha512-pbBLqIaDjQoVGCOfpOxwjWRSMoQsefsYOHTRNTNlDDNO7DRUa/WeSbOYOgLJM5yGIBVXQoRmO7ycWfAWVAPIDQ==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-arm64.deb", + "hash": "sha512-ua0lg6aK++RDi4WyCYygHoQasYD4+I21ip5To9ImMN072vJSyAoz9gxs8HBF+uEl4/uUBdlMCQHEioYMeJCwbw==" } } }