From 318e9cfe6bd8f2701cf73c7982a1d30320d60e01 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Tue, 5 Mar 2024 14:38:07 +0100 Subject: [PATCH] Update dependencies, fix broken flake --- composer.json | 29 +++++++++++++++-------------- composer.lock | 50 ++++++++++++++++++++++++-------------------------- flake.lock | 6 +++--- flake.nix | 18 ++++++++++++++++-- 4 files changed, 58 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index cc8ad81..1a16b45 100644 --- a/composer.json +++ b/composer.json @@ -1,16 +1,17 @@ { - "require": { - "simplesamlphp/simplesamlphp": "1.19.8", - "erusev/parsedown": "^1.7", - "gettext/gettext": "4.8.7", - "simplesamlphp/saml2": "4.5" - }, - "require-dev": { - "ext-pdo_sqlite": "*" - }, - "config": { - "allow-plugins": { - "simplesamlphp/composer-module-installer": true - } - } + "name": "programvareverkstedet/nettsiden", + "description": "Programvareverkstedets nettside", + "license": "proprietary", + + "config": { + "allow-plugins": { + "simplesamlphp/composer-module-installer": true + } + }, + "require": { + "simplesamlphp/simplesamlphp": "~1.19.8", + "erusev/parsedown": "^1.7", + "simplesamlphp/saml2": "^4.6", + "gettext/gettext": "^4.8" + } } diff --git a/composer.lock b/composer.lock index 8fa699e..971d591 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "13225e0068a965f7b0b00b5f344af25a", + "content-hash": "b7369600c4be8f1ec097c82c203ba17c", "packages": [ { "name": "erusev/parsedown", @@ -58,16 +58,16 @@ }, { "name": "gettext/gettext", - "version": "v4.8.7", + "version": "v4.8.11", "source": { "type": "git", "url": "https://github.com/php-gettext/Gettext.git", - "reference": "3f7bc5ef23302a9059e64934f3d59e454516bec0" + "reference": "b632aaf5e4579d0b2ae8bc61785e238bff4c5156" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/3f7bc5ef23302a9059e64934f3d59e454516bec0", - "reference": "3f7bc5ef23302a9059e64934f3d59e454516bec0", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/b632aaf5e4579d0b2ae8bc61785e238bff4c5156", + "reference": "b632aaf5e4579d0b2ae8bc61785e238bff4c5156", "shasum": "" }, "require": { @@ -119,7 +119,7 @@ "support": { "email": "oom@oscarotero.com", "issues": "https://github.com/oscarotero/Gettext/issues", - "source": "https://github.com/php-gettext/Gettext/tree/v4.8.7" + "source": "https://github.com/php-gettext/Gettext/tree/v4.8.11" }, "funding": [ { @@ -135,7 +135,7 @@ "type": "patreon" } ], - "time": "2022-08-02T09:42:10+00:00" + "time": "2023-08-14T15:15:05+00:00" }, { "name": "gettext/languages", @@ -517,30 +517,30 @@ }, { "name": "psr/log", - "version": "1.1.4", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -561,9 +561,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2021-07-14T16:41:46+00:00" }, { "name": "robrichards/xmlseclibs", @@ -706,16 +706,16 @@ }, { "name": "simplesamlphp/saml2", - "version": "v4.5.0", + "version": "v4.6.11", "source": { "type": "git", "url": "https://github.com/simplesamlphp/saml2.git", - "reference": "d98020c3d7f7331409959eab286ca3a010e5a868" + "reference": "1b5d48753c78d02e88667068e633531c233141fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/d98020c3d7f7331409959eab286ca3a010e5a868", - "reference": "d98020c3d7f7331409959eab286ca3a010e5a868", + "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/1b5d48753c78d02e88667068e633531c233141fb", + "reference": "1b5d48753c78d02e88667068e633531c233141fb", "shasum": "" }, "require": { @@ -723,7 +723,7 @@ "ext-openssl": "*", "ext-zlib": "*", "php": ">=7.1 || ^8.0", - "psr/log": "~1.1", + "psr/log": "~1.1 || ^2.0 || ^3.0", "robrichards/xmlseclibs": "^3.1.1", "webmozart/assert": "^1.9" }, @@ -758,9 +758,9 @@ "description": "SAML2 PHP library from SimpleSAMLphp", "support": { "issues": "https://github.com/simplesamlphp/saml2/issues", - "source": "https://github.com/simplesamlphp/saml2/tree/v4.5.0" + "source": "https://github.com/simplesamlphp/saml2/tree/v4.6.11" }, - "time": "2022-02-17T15:46:12+00:00" + "time": "2024-01-25T19:39:46+00:00" }, { "name": "simplesamlphp/simplesamlphp", @@ -4976,8 +4976,6 @@ "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": { - "ext-pdo_sqlite": "*" - }, + "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/flake.lock b/flake.lock index 207b320..2926603 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1692463654, - "narHash": "sha256-F8hZmsQINI+S6UROM4jyxAMbQLtzE44pI8Nk6NtMdao=", + "lastModified": 1707939175, + "narHash": "sha256-D1xan0lgxbmXDyzVqXTiSYHLmAMrMRdD+alKzEO/p3w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783", + "rev": "f7e8132daca31b1e3859ac0fb49741754375ac3d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 54534e4..d1a3f4f 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,18 @@ ]; forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system); in { + packages = forAllSystems (system: let + pkgs = nixpkgs.legacyPackages.${system}; + php = pkgs.php83; + in { + default = self.packages.${system}.pvv-nettsiden; + pvv-nettsiden = php.buildComposerProject (finalAttrs: { + src = ./.; + pname = "pvv-nettsiden"; + version = "0.0.1"; + vendorHash = "sha256-DSn0ifj7Hjjia1SF/1wfziD/IdsiOES8XNDVz3F/cTI="; + }); + }); devShells = forAllSystems (system: rec { pkgs = import nixpkgs { inherit system; }; default = pkgs.mkShellNoCC { @@ -50,9 +62,11 @@ ''; # TODO: - # - Integrate with docker config # - Make "trusted.url.domains" dynamic based on the current host:port - # - Do not download composer.phar with curl + # - Do not download composer.phar with curl(!) + # - Relicense the project to GPL or something + # - Move gallery/slideshow images to an external directory (configurable) + # - Write a module for the project }; });