chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2021-05-22 12:20:19 +02:00
parent 03656bf0a3
commit 46587cc637
No known key found for this signature in database
GPG key ID: 019E764B7184435A
8 changed files with 1596 additions and 1559 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": {
"emacs-overlay": {
"locked": {
"lastModified": 1621504243,
"narHash": "sha256-5hb6GE0+WuY7ZdSp0X1drCS7BekWCrvrNPXly50N/a0=",
"lastModified": 1621652967,
"narHash": "sha256-AvqQEE0xNVnAO4lbROLcnFe/3OPAFTGFEtKxQkOlbr8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "6c7908a841c195d3539072cc5b03f2b18bc7d131",
"rev": "cbc63fe7656be94bf0ebd366740dbc0112cf7069",
"type": "github"
},
"original": {
@ -38,11 +38,11 @@
]
},
"locked": {
"lastModified": 1621417094,
"narHash": "sha256-Csk4p8jFUma7FtMnjEJGTPGxCOnTbb30xr8AXwrUTMM=",
"lastModified": 1621649712,
"narHash": "sha256-SGOWonfYzV/Cdjfv3dlEgbMlg5yRZohTG/Cm0xcuiEA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3d18912f5ae7c98bd5249411d98cdf3b28fe1f09",
"rev": "4f70f49cec34cb22b9be9f42cd0dd68ef816a797",
"type": "github"
},
"original": {
@ -54,11 +54,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1621470282,
"narHash": "sha256-oZmUb1snJn0E2SCK2lpsTfdmQ59DKoR+6RBLH9qwNQ4=",
"lastModified": 1621625051,
"narHash": "sha256-X/DsI3uoDrd8AGVlps+CoTJZzFxTt126S8WyerFnJ10=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "62b840ba3fb462c159bc4226bec4288e1064a853",
"rev": "ea422282d68bfaa81ea0ce0bf546d6c5afc06579",
"type": "github"
},
"original": {

4
modules/accentor.nix
View file

@ -7,7 +7,7 @@ let
owner = "accentor";
repo = "web";
rev = "develop";
sha256 = "00hbyz382rcxyxxn148df2rgczxglhrfyf40xcgy535wvazyj2p0";
sha256 = "06z4qm6sgqpvg3cgb20vgac83zkfm1q120i5xbra6p2srhd0h922";
};
yarnNix = ./accentor/yarn.nix;
buildPhase = ''
@ -24,7 +24,7 @@ let
owner = "accentor";
repo = "api";
rev = "develop";
sha256 = "0dlvn250y96b4857v28bpcahl3p37jpilyky3xqrfaqiy6gvv3k8";
sha256 = "13lkvrn3nw00jwyf4jzp9j9f09sgva2fbnh9i028hr3lcd7yw6my";
};
gems = pkgs.bundlerEnv {
name = "accentor-api-env";

2
modules/accentor/Gemfile
View file

@ -45,7 +45,7 @@ end
group :development, :test do
gem 'factory_bot_rails', '~> 6.2'
gem 'faker', '~> 2.17'
gem 'faker', '~> 2.18'
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: %i[mri mingw x64_mingw]

8
modules/accentor/Gemfile.lock
View file

@ -94,7 +94,7 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (2.17.0)
faker (2.18.0)
i18n (>= 1.6, < 2)
ffi (1.15.0)
globalid (0.4.2)
@ -125,14 +125,14 @@ GEM
mocha (1.12.0)
msgpack (1.4.2)
nio4r (2.5.7)
nokogiri (1.11.3)
nokogiri (1.11.5)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.1.1)
ast (~> 2.4.1)
pg (1.2.3)
puma (5.3.1)
puma (5.3.2)
nio4r (~> 2.0)
pundit (2.1.0)
activesupport (>= 3.0.0)
@ -236,7 +236,7 @@ DEPENDENCIES
delayed_cron_job (~> 0.7)
delayed_job_active_record (~> 4.1)
factory_bot_rails (~> 6.2)
faker (~> 2.17)
faker (~> 2.18)
has_scope (~> 0.8)
image_processing (~> 1.12.1)
listen (>= 3.1.5, < 3.6)

663
modules/accentor/gemset.nix
View file

File diff suppressed because it is too large Load diff

2348
modules/accentor/yarn.nix
View file

File diff suppressed because it is too large Load diff

80
patches/122247.patch
View file

@ -1,7 +1,7 @@
From 9865b13d73a1c01b43a039edd58e0eeba90d61e6 Mon Sep 17 00:00:00 2001
From cdc5953d38868ddd51ecc2a912716e59b33e25ba Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 8 May 2021 23:55:56 +0200
Subject: [PATCH 1/2] eid-mw: 4.4.27 -> 5.0.14
Subject: [PATCH 1/5] eid-mw: 4.4.27 -> 5.0.14
---
pkgs/tools/security/eid-mw/default.nix | 65 +++++++++++++++-----------
@ -106,10 +106,10 @@ index cbe56694da1421..d943274a98e9b3 100644
enableParallelBuilding = true;
From c6b73cfad86428d2fca84c2064a03e4dd48b8c46 Mon Sep 17 00:00:00 2001
From 5bdad0ac18f150ac710b2829e3c53781c5a94a89 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 8 May 2021 23:56:10 +0200
Subject: [PATCH 2/2] eid-mw: add chvp as maintainer
Subject: [PATCH 2/5] eid-mw: add chvp as maintainer
---
pkgs/tools/security/eid-mw/default.nix | 2 +-
@ -127,3 +127,75 @@ index d943274a98e9b3..a104112265730f 100644
+ maintainers = with maintainers; [ bfortz chvp ];
};
}
From b9d63bfdec294a3de66ec87e7b9e8e860b9275c5 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 22 May 2021 10:03:10 +0200
Subject: [PATCH 3/5] eid-mw: 5.0.14 -> 5.0.21
---
pkgs/tools/security/eid-mw/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index a104112265730f..45774ea8a5077c 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "eid-mw";
- version = "5.0.14";
+ version = "5.0.21";
src = fetchFromGitHub {
rev = "v${version}";
- sha256 = "1hyxsbxjjn9hh5p7jlcfb5yplf3n8dg49dfgi8fjp95phis3gbd4";
+ sha256 = "1sz7996q6gd6vbdxqgyx1jwjznpki1k9zbgaj1j1a51y6w0g0kdh";
repo = "eid-mw";
owner = "Fedict";
};
From 49acdd355f918efe7b3358cc71a7beb0f2a2a4d5 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 22 May 2021 10:08:13 +0200
Subject: [PATCH 4/5] eid-mw: add note about upstream version management
---
pkgs/tools/security/eid-mw/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 45774ea8a5077c..b84a7a2f22ef39 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -20,6 +20,7 @@
stdenv.mkDerivation rec {
pname = "eid-mw";
+ # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
version = "5.0.21";
src = fetchFromGitHub {
From cabfc153d5a8e22da2de1d9ac7da0b2227a8535d Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 22 May 2021 10:09:34 +0200
Subject: [PATCH 5/5] eid-mw: add note about why --disable-pinentry is used
---
pkgs/tools/security/eid-mw/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index b84a7a2f22ef39..e07ea1a3337998 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
substituteInPlace plugins_tools/eid-viewer/Makefile.in \
--replace "c_rehash" "openssl rehash"
'';
+ # pinentry uses hardcoded `/usr/bin/pinentry`, so use the built-in (uglier) dialogs for pinentry.
configureFlags = [ "--disable-pinentry" ];
postPatch = ''

32
patches/123757.patch
View file

@ -1,32 +0,0 @@
From 3bd0e3b5189ae5d8ed31f14e231c09b38b5f558e Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Thu, 20 May 2021 04:13:35 +0200
Subject: [PATCH] libvdpau-va-gl: drop obsolete ffmpeg_3 dependency
I couldn't find any reference as to why this dependency would be
required for 0.4.2. Digging into the changelog, it looks like 0.4.0
dropped the libswscale dependency, so this seems like it's now unneeded.
---
pkgs/development/libraries/libvdpau-va-gl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 85ebef12fe1fda..7a042a172c821a 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp
-, libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }:
+, libXext, libvdpau, glib, libva, libGLU }:
stdenv.mkDerivation rec {
pname = "libvdpau-va-gl";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ];
+ buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva libGLU ];
doCheck = false; # fails. needs DRI access