diff --git a/flake.lock b/flake.lock index 074be56a..b83500b5 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1696067747, - "narHash": "sha256-/9cdd+A8dg9G+Pd/sx3SG61zyrYFp3dANwrHFaJRbbM=", + "lastModified": 1696149716, + "narHash": "sha256-Tyi3g/RjhMCCbHqF6YCCrkO8U+o0k1vPlAbPDOBHwV4=", "owner": "accentor", "repo": "api", - "rev": "934ad47ad40b02cc17938ccb610ae38b1cd01809", + "rev": "7934f33e659867afe0e7ae513b656d596feb7f69", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1696066965, - "narHash": "sha256-lgeW7JtTqqFkKRgAOx5K60Ram+l1Mic1nb8QNfEhjlI=", + "lastModified": 1696149730, + "narHash": "sha256-65ynyQasvMARvupcYVH0RZN05+REaNMxKxkFblvFSu8=", "owner": "accentor", "repo": "web", - "rev": "e63047d53152b0cea3c3bed9f917f13e7b4b8fd7", + "rev": "c6b1d89ecb743fcd859d79c2b28ec2b7288b8659", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1696043078, - "narHash": "sha256-0zPC5BR/6JyX6HponF9rQPhpQBDyMZMpGIBWOIvvX8E=", + "lastModified": 1696155289, + "narHash": "sha256-zu3ezMdLQBOwx9Aq6ZBQWjoOVOEXG5fXMcQMOwuoTPY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "db6c96d74eb0e60e7e344e81a56b33390e33474d", + "rev": "5f14ec7a4977810a06f8eacb0169374fb4e282e9", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1696063111, - "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=", + "lastModified": 1696145345, + "narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01", + "rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1695526222, - "narHash": "sha256-/NwZz3QcVplrfiDKk1thYg1EIHLSNucVHNUi2uwO3RI=", + "lastModified": 1696131323, + "narHash": "sha256-Y47r8Jo+9rs+XUWHcDPZtkQs6wFeZ24L4CQTfVwE+vY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "25d6369c232bbea1ec1f90226fd17982e7a0a647", + "rev": "031d4b22505fdea47bd53bfafad517cd03c26a4f", "type": "github" }, "original": { @@ -431,11 +431,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "nur": { "locked": { - "lastModified": 1696066359, - "narHash": "sha256-yt94loEvHjuzQ+aIVLvN6OzzXtWq7nDgHhxJ11bqZIc=", + "lastModified": 1696149874, + "narHash": "sha256-WpSGs6gfSwm6G7kcVrYOCaCpZw3zffCCOg2RPemvKgk=", "owner": "nix-community", "repo": "NUR", - "rev": "9948d7c2cf064aa08f6df8f925a811d0f0950e5b", + "rev": "af4ee19b5a673024d7fda158cae22402c9ab33c4", "type": "github" }, "original": { @@ -655,11 +655,11 @@ ] }, "locked": { - "lastModified": 1695976572, - "narHash": "sha256-L5FMR0npd2gjYyQRraE9BA9FCs8EgwY3v0ng6oZiNTE=", + "lastModified": 1696149346, + "narHash": "sha256-xISphXTzPSTqp3zSLOXQ8kssJD1wQY6kJtjZHWRkk/s=", "owner": "chvp", "repo": "tetris", - "rev": "aabcbc7bfa3cbeed2a484c4a797f4eadbccbd6ca", + "rev": "a3f5a0a3e64bd7071b5b7ab75758524fd5a42bfb", "type": "github" }, "original": { @@ -681,19 +681,17 @@ ] }, "locked": { - "host": "git.chvp.be", "lastModified": 1678093735, "narHash": "sha256-tA4HfESVtOozPBmHyxNwWcdfLYxaNuMgS+jnKTjr6P4=", "owner": "chvp", "repo": "www.chvp.be", "rev": "364488efc0d31a32fc112e6862efd6a453f5e3ef", - "type": "gitlab" + "type": "github" }, "original": { - "host": "git.chvp.be", "owner": "chvp", "repo": "www.chvp.be", - "type": "gitlab" + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 088cb169..6d2ce0e7 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ }; }; www-chvp-be = { - url = "gitlab:chvp/www.chvp.be?host=git.chvp.be"; + url = "github:chvp/www.chvp.be"; inputs = { devshell.follows = "devshell"; flake-utils.follows = "flake-utils"; diff --git a/patches/257689.patch b/patches/257689.patch deleted file mode 100644 index faba96bb..00000000 --- a/patches/257689.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix -index 0048368b8d4ad0..bf3b8b64f1e7a2 100644 ---- a/pkgs/applications/networking/remote/xrdp/default.nix -+++ b/pkgs/applications/networking/remote/xrdp/default.nix -@@ -1,7 +1,7 @@ - { lib, stdenv, fetchFromGitHub, applyPatches, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: - - let -- version = "0.9.23"; -+ version = "0.9.23.1"; - patchedXrdpSrc = applyPatches { - patches = [ ./dynamic_config.patch ]; - name = "xrdp-patched-${version}"; -@@ -10,7 +10,7 @@ let - repo = "xrdp"; - rev = "v${version}"; - fetchSubmodules = true; -- hash = "sha256-14qsRfLn+26rm+vyMmOtaBEs8mWfSTIsIVseSC2FjXc="; -+ hash = "sha256-fJKSEHB5X5QydKgRPjIMJzNaAy1EVJifHETSGmlJttQ="; - }; - }; -