From d6ad204ca354e36806a3f4b98cd81f95ad07e896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 3 May 2025 22:33:42 +0200 Subject: [PATCH] nix/packages: move why3 pin to sources.json --- nix/packages/default.nix | 25 ++++--------------------- nix/sources.json | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/nix/packages/default.nix b/nix/packages/default.nix index 86b658f2..d02c92e3 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -57,27 +57,10 @@ in rec { logisim-evolution = pkgs.callPackage ./logisim-evolution.nix {}; necrolib = pkgs.callPackage ./necrolib.nix {}; why3-wrapped = let - why3-pinned = - import - (pkgs.fetchFromGitHub { - owner = "nixos"; - repo = "nixpkgs"; - rev = "805a384895c696f802a9bf5bf4720f37385df547"; - hash = "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA="; - }) - {inherit (pkgs) system;}; - alt-ergo-pinned = - import - (pkgs.fetchFromGitHub { - owner = "nixos"; - repo = "nixpkgs"; - rev = "1b95daa381fa4a0963217a5d386433c20008208a"; - hash = "sha256-vwEtkxIEQjymeTk89Ty1MGfRVSWL1/3j1wt5xB5ua88="; - }) - { - inherit (pkgs) system; - config.allowUnfree = true; - }; + why3-pinned = import sources.pin-why3 {}; + alt-ergo-pinned = import sources.pin-alt-ergo { + config.allowUnfree = true; + }; in why3-pinned.callPackage ./why3.nix {inherit (alt-ergo-pinned) alt-ergo;}; diff --git a/nix/sources.json b/nix/sources.json index 70c15591..f67b6834 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -133,6 +133,18 @@ "url": "https://github.com/nix-community/nur/archive/0150847d90961f362980d7dd662868dc6ee0907a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "pin-alt-ergo": { + "branch": "master", + "description": "Nix Packages collection & NixOS", + "homepage": "", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1b95daa381fa4a0963217a5d386433c20008208a", + "sha256": "1kvbdqgc8y8bszizvmwb4max2rrhnlygag1rg6k3qhh42a9js0dz", + "type": "tarball", + "url": "https://github.com/nixos/nixpkgs/archive/1b95daa381fa4a0963217a5d386433c20008208a.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "pin-fourmolu": { "branch": "haskell-updates", "description": "Nix Packages collection & NixOS", @@ -157,6 +169,18 @@ "url": "https://github.com/NixOS/nixpkgs/archive/805a384895c696f802a9bf5bf4720f37385df547.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "pin-why3": { + "branch": "master", + "description": "Nix Packages collection & NixOS", + "homepage": "", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "sha256": "1q7y5ygr805l5axcjhn0rn3wj8zrwbrr0c6a8xd981zh8iccmx0p", + "type": "tarball", + "url": "https://github.com/nixos/nixpkgs/archive/805a384895c696f802a9bf5bf4720f37385df547.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "pin-wireshark": { "branch": "master", "description": "Nix Packages collection & NixOS",